Make CUB NVRTC commandline arguments come from a cmake template (#3292)

NVIDIA · Jan 9, 2025 · 31e49d4 · 31e49d4
1 parent b9c21e4
commit 31e49d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/cub/test/CMakeLists.txt b/cub/test/CMakeLists.txt
@@ -227,10 +227,8 @@ function(cub_add_test target_name_var test_name test_src cub_target launcher_id)
     endif() # CUB_SEPARATE_CATCH2
 
     if ("${test_target}" MATCHES "nvrtc")
-      target_compile_definitions(${test_target} PRIVATE NVRTC_CUB_PATH="-I${CMAKE_SOURCE_DIR}/cub")
-      target_compile_definitions(${test_target} PRIVATE NVRTC_THRUST_PATH="-I${CMAKE_SOURCE_DIR}/thrust")
-      target_compile_definitions(${test_target} PRIVATE NVRTC_LIBCUDACXX_PATH="-I${CMAKE_SOURCE_DIR}/libcudacxx/include")
-      target_compile_definitions(${test_target} PRIVATE NVRTC_CTK_PATH="-I${CUDAToolkit_INCLUDE_DIRS}")
+      configure_file("cmake/nvrtc_args.h.in" ${CMAKE_CURRENT_BINARY_DIR}/nvrtc_args.h)
+      target_include_directories(${test_target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
     if ("${test_target}" MATCHES "test.iterator")

diff --git a/cub/test/catch2_test_nvrtc.cu b/cub/test/catch2_test_nvrtc.cu
@@ -31,6 +31,7 @@
 
 #include <c2h/catch2_test_helper.h>
 #include <nvrtc.h>
+#include <nvrtc_args.h>
 
 TEST_CASE("Test nvrtc", "[test][nvrtc]")
 {

diff --git a/cub/test/cmake/nvrtc_args.h.in b/cub/test/cmake/nvrtc_args.h.in
@@ -0,0 +1,6 @@
+#pragma once
+
+const char* NVRTC_CUB_PATH        = "-I@CMAKE_SOURCE_DIR@/cub";
+const char* NVRTC_THRUST_PATH     = "-I@CMAKE_SOURCE_DIR@/thrust";
+const char* NVRTC_LIBCUDACXX_PATH = "-I@CMAKE_SOURCE_DIR@/libcudacxx/include";
+const char* NVRTC_CTK_PATH        = "-I@CUDAToolkit_INCLUDE_DIRS@";