From f984efdc26f4fcc797a537919662b27bb4fe57a7 Mon Sep 17 00:00:00 2001 From: Allison Vacanti Date: Wed, 27 Oct 2021 11:46:51 -0400 Subject: [PATCH] Don't explicitly link with cudart. This is implicitly added by nvcc, and the explicit setting was breaking environments where cudart_static is unavailable, e.g. conda. --- cmake/NVBenchDependencies.cmake | 7 ++----- cmake/NVBenchRapidsCMake.cmake | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/NVBenchDependencies.cmake b/cmake/NVBenchDependencies.cmake index a13bae7..e486bb3 100644 --- a/cmake/NVBenchDependencies.cmake +++ b/cmake/NVBenchDependencies.cmake @@ -51,8 +51,5 @@ rapids_find_package(CUDAToolkit REQUIRED INSTALL_EXPORT_SET nvbench-targets ) -if (CMAKE_CUDA_RUNTIME_LIBRARY STREQUAL "Shared") - set(ctk_libraries CUDA::cudart) -elseif(CMAKE_CUDA_RUNTIME_LIBRARY STREQUAL "Static") - set(ctk_libraries CUDA::cudart_static) -endif() +# Append CTK targets to this as we add optional deps (NMVL, CUPTI, ...) +set(ctk_libraries CUDA::toolkit) diff --git a/cmake/NVBenchRapidsCMake.cmake b/cmake/NVBenchRapidsCMake.cmake index 250ef9e..5c09d30 100644 --- a/cmake/NVBenchRapidsCMake.cmake +++ b/cmake/NVBenchRapidsCMake.cmake @@ -13,8 +13,6 @@ macro(nvbench_load_rapids_cmake) include(rapids-find) rapids_cuda_init_architectures(NVBench) - # Only sets CMAKE_CUDA_RUNTIME_LIBRARY if it is currently unset: - rapids_cuda_init_runtime(USE_STATIC TRUE) endmacro() # Called after project(...)