diff --git a/rapids-cmake/cpm/nvbench.cmake b/rapids-cmake/cpm/nvbench.cmake index c0b7f638..aa3d7559 100644 --- a/rapids-cmake/cpm/nvbench.cmake +++ b/rapids-cmake/cpm/nvbench.cmake @@ -43,6 +43,10 @@ across all RAPIDS projects. Will build nvbench statically. No local searching for a previously built version will occur. +.. versionchanged:: v24.02.00 + +NVBench_ENABLE_CUPTI is set to OFF by default. + Result Targets ^^^^^^^^^^^^^^ nvbench::nvbench target will be created @@ -93,8 +97,11 @@ function(rapids_cpm_nvbench) GIT_SHALLOW ${shallow} PATCH_COMMAND ${patch_command} EXCLUDE_FROM_ALL ${exclude} - OPTIONS "NVBench_ENABLE_NVML ${nvbench_with_nvml}" "NVBench_ENABLE_EXAMPLES OFF" - "NVBench_ENABLE_TESTING OFF" "NVBench_ENABLE_INSTALL_RULES ${to_install}" + OPTIONS "NVBench_ENABLE_NVML ${nvbench_with_nvml}" + "NVBench_ENABLE_CUPTI OFF" + "NVBench_ENABLE_EXAMPLES OFF" + "NVBench_ENABLE_TESTING OFF" + "NVBench_ENABLE_INSTALL_RULES ${to_install}" "BUILD_SHARED_LIBS ${build_shared}") include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake") diff --git a/testing/cpm/cpm_nvbench-conda-fmt.cmake b/testing/cpm/cpm_nvbench-conda-fmt.cmake index eb4dbd69..92bb0b91 100644 --- a/testing/cpm/cpm_nvbench-conda-fmt.cmake +++ b/testing/cpm/cpm_nvbench-conda-fmt.cmake @@ -25,7 +25,6 @@ rapids_cuda_set_architectures(RAPIDS) # Force shared libs so that nvbench doesn't have a chance to use a static fmt set(BUILD_SHARED_LIBS ON) -set(NVBench_ENABLE_CUPTI OFF) rapids_cpm_init() rapids_cpm_rmm() rapids_cpm_nvbench() diff --git a/testing/cpm/cpm_nvbench-conda.cmake b/testing/cpm/cpm_nvbench-conda.cmake index b1604ff0..494f84d2 100644 --- a/testing/cpm/cpm_nvbench-conda.cmake +++ b/testing/cpm/cpm_nvbench-conda.cmake @@ -29,7 +29,6 @@ set(ENV{CONDA_BUILD} "1") set(ENV{BUILD_PREFIX} "/usr/local/build_prefix") set(ENV{PREFIX} "/opt/local/prefix") set(ENV{CONDA_PREFIX} "/opt/conda/prefix") -set(NVBench_ENABLE_CUPTI OFF) rapids_cpm_init() rapids_cpm_nvbench()