Merge branch 'branch-24.02' into test-cuda-12.2

rapidsai · Jan 5, 2024 · b43571a · b43571a
2 parents aabaf9f + e2dc727
commit b43571a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 54 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
           - id: trailing-whitespace
           - id: end-of-file-fixer
     - repo: https://github.com/rapidsai/dependency-file-generator
-      rev: v1.5.1
+      rev: v1.8.0
       hooks:
           - id: rapids-dependency-file-generator
             args: ["--clean"]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,8 +70,7 @@ rapids_cpm_init()
 
 include(cmake/thirdparty/get_fmt.cmake)
 include(cmake/thirdparty/get_spdlog.cmake)
-include(cmake/thirdparty/get_libcudacxx.cmake)
-include(cmake/thirdparty/get_thrust.cmake)
+include(cmake/thirdparty/get_cccl.cmake)
 
 # ##################################################################################################
 # * library targets --------------------------------------------------------------------------------
@@ -90,8 +89,7 @@ else()
   target_link_libraries(rmm INTERFACE CUDA::cudart)
 endif()
 
-target_link_libraries(rmm INTERFACE libcudacxx::libcudacxx)
-target_link_libraries(rmm INTERFACE rmm::Thrust)
+target_link_libraries(rmm INTERFACE CCCL::CCCL)
 target_link_libraries(rmm INTERFACE fmt::fmt-header-only)
 target_link_libraries(rmm INTERFACE spdlog::spdlog_header_only)
 target_link_libraries(rmm INTERFACE dl)
@@ -152,20 +150,12 @@ The goal of the [RMM](https://github.com/rapidsai/rmm) is to provide:
   A collection of data structures that use the interface for memory allocation
 ]=])
 
-set(code_string
-    [=[
-if(NOT TARGET rmm::Thrust)
-  thrust_create_target(rmm::Thrust FROM_OPTIONS)
-endif()
-]=])
-
 rapids_export(
   INSTALL rmm
   EXPORT_SET rmm-exports
   GLOBAL_TARGETS rmm
   NAMESPACE rmm::
-  DOCUMENTATION doc_string
-  FINAL_CODE_BLOCK code_string)
+  DOCUMENTATION doc_string)
 
 # ##################################################################################################
 # * build export -----------------------------------------------------------------------------------
@@ -175,8 +165,7 @@ rapids_export(
   EXPORT_SET rmm-exports
   GLOBAL_TARGETS rmm
   NAMESPACE rmm::
-  DOCUMENTATION doc_string
-  FINAL_CODE_BLOCK code_string)
+  DOCUMENTATION doc_string)
 
 # ##################################################################################################
 # * make documentation -----------------------------------------------------------------------------
@@ -197,6 +186,6 @@ add_custom_target(
 # * make gdb helper scripts ------------------------------------------------------------------------
 
 # optionally assemble Thrust pretty-printers
-if(Thrust_SOURCE_DIR)
+if(CCCL_SOURCE_DIR)
   configure_file(scripts/load-pretty-printers.in load-pretty-printers @ONLY)
 endif()
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -31,8 +31,6 @@ export RAPIDS_DOCS_DIR="$(mktemp -d)"
 rapids-logger "Build CPP docs"
 pushd doxygen
 doxygen Doxyfile
-mkdir -p "${RAPIDS_DOCS_DIR}/librmm/html"
-mv html/* "${RAPIDS_DOCS_DIR}/librmm/html"
 popd
 
 rapids-logger "Build Python docs"

diff --git a/cmake/thirdparty/get_libcudacxx.cmake → cmake/thirdparty/get_cccl.cmake b/cmake/thirdparty/get_libcudacxx.cmake → cmake/thirdparty/get_cccl.cmake
@@ -12,12 +12,12 @@
 # the License.
 # =============================================================================
 
-# Use CPM to find or clone libcudacxx
-function(find_and_configure_libcudacxx)
+# Use CPM to find or clone CCCL
+function(find_and_configure_cccl)
 
-  include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
-  rapids_cpm_libcudacxx(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports)
+  include(${rapids-cmake-dir}/cpm/cccl.cmake)
+  rapids_cpm_cccl(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports)
 
 endfunction()
 
-find_and_configure_libcudacxx()
+find_and_configure_cccl()
diff --git a/cmake/thirdparty/get_thrust.cmake b/cmake/thirdparty/get_thrust.cmake
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -109,7 +109,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         matrices:
           - matrix:
-              cuda: "12.0"
+              cuda: "12.*"
             packages:
               - &cuda_python12 cuda-python>=12.0,<13.0a0
           - matrix: # All CUDA 11 versions
@@ -208,7 +208,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         matrices:
           - matrix:
-              cuda: "12.0"
+              cuda: "12.*"
             packages:
               - *cuda_python12
           - matrix: # All CUDA 11 versions

diff --git a/doxygen/Doxyfile b/doxygen/Doxyfile
@@ -1135,7 +1135,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
-GENERATE_HTML          = YES
+GENERATE_HTML          = NO
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of

diff --git a/scripts/load-pretty-printers.in b/scripts/load-pretty-printers.in
@@ -1,2 +1,2 @@
-source @Thrust_SOURCE_DIR@/scripts/gdb-pretty-printers.py
+source @CCCL_SOURCE_DIR@/thrust/scripts/gdb-pretty-printers.py
 source @PROJECT_SOURCE_DIR@/scripts/gdb-pretty-printers.py