Use rapids_cpm_cccl.

rapidsai · Dec 18, 2023 · 81f5bf7 · 81f5bf7
1 parent 5aab380
commit 81f5bf7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 45 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -220,9 +220,8 @@ if(BUILD_CUML_TESTS OR BUILD_PRIMS_TESTS)
   find_package(Threads)
 endif()
 
-# thrust before rmm, rmm before raft so we get the right version of thrust/rmm
-include(cmake/thirdparty/get_thrust.cmake)
-include(cmake/thirdparty/get_libcudacxx.cmake)
+# CCCL before RMM, and RMM before RAFT
+include(cmake/thirdparty/get_cccl.cmake)
 include(cmake/thirdparty/get_rmm.cmake)
 include(cmake/thirdparty/get_raft.cmake)
 

diff --git a/cpp/cmake/thirdparty/get_thrust.cmake → cpp/cmake/thirdparty/get_cccl.cmake b/cpp/cmake/thirdparty/get_thrust.cmake → cpp/cmake/thirdparty/get_cccl.cmake
@@ -12,12 +12,11 @@
 # the License.
 # =============================================================================
 
-# Use CPM to find or clone thrust
-function(find_and_configure_thrust)
-    include(${rapids-cmake-dir}/cpm/thrust.cmake)
-    rapids_cpm_thrust(NAMESPACE cuml
-                      BUILD_EXPORT_SET cuml-exports
-                      INSTALL_EXPORT_SET cuml-exports)
+# Use CPM to find or clone CCCL
+function(find_and_configure_cccl)
+        include(${rapids-cmake-dir}/cpm/cccl.cmake)
+        rapids_cpm_cccl(BUILD_EXPORT_SET cuml-exports
+                        INSTALL_EXPORT_SET cuml-exports)
 endfunction()
 
-find_and_configure_thrust()
+find_and_configure_cccl()
diff --git a/cpp/cmake/thirdparty/get_libcudacxx.cmake b/cpp/cmake/thirdparty/get_libcudacxx.cmake