Skip to content

Commit

Permalink
Merge branch 'jdaw/fix-copying-of-cuda-libs' into 'release-v0.7'
Browse files Browse the repository at this point in the history
Fix CUDAToolkit path to search for libnvrtc

See merge request machine-learning/dorado!1023
  • Loading branch information
tijyojwad committed May 29, 2024
2 parents 33578e7 + 7c7de94 commit 45b8acc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
# CUDA toolkit DLLs we depend on:
set(VERSIONED_CUDA_LIBS
libcublas*.so.*
libcudart*.so.*
libnvrtc*.so.*
libnvToolsExt*.so.*
libcublas*.so*
libcudart*.so*
libnvrtc*.so*
libnvToolsExt*.so*
)

if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
Expand Down Expand Up @@ -430,7 +430,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
endforeach()
else()
# bundle the libraries from the cuda toolkit
file(GLOB NATIVE_CUDA_LIBS "${CUDAToolkit_ROOT}/targets/${CMAKE_SYSTEM_PROCESSOR}-linux/lib/${LIB}")
file(GLOB NATIVE_CUDA_LIBS "${CUDAToolkit_TARGET_DIR}/targets/${CMAKE_SYSTEM_PROCESSOR}-linux/lib/${LIB}")
install(FILES ${NATIVE_CUDA_LIBS} DESTINATION lib COMPONENT redist_libs)
endif()
endforeach()
Expand Down
4 changes: 1 addition & 3 deletions dorado/cli/correct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ int correct(int argc, char* argv[]) {
utils::make_torch_deterministic();
argparse::ArgumentParser parser("dorado", DORADO_VERSION, argparse::default_arguments::help);
parser.add_description("Dorado read correction tool.");
parser.add_argument("reads")
.help("Path to a file with reads to correct in FASTQ format.")
.nargs(argparse::nargs_pattern::any);
parser.add_argument("reads").help("Path to a file with reads to correct in FASTQ format.");
parser.add_argument("-t", "--threads")
.help("Combined number of threads for adapter/primer detection and output generation. "
"Default uses "
Expand Down

0 comments on commit 45b8acc

Please sign in to comment.