Merge branch 'branch-24.10' into test-nvcomp-4.0

rapidsai · Aug 27, 2024 · 2999a7a · 2999a7a
2 parents 0e85690 + cb258cb
commit 2999a7a
Show file tree

Hide file tree

Showing 32 changed files with 414 additions and 196 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -65,7 +65,7 @@ repos:
             ^rapids-cmake/.*$
           )
   - repo: https://github.com/rapidsai/pre-commit-hooks
-    rev: v0.0.3
+    rev: v0.4.0
     hooks:
       - id: verify-copyright
         files: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,49 @@
+# rapids-cmake 24.08.00 (7 Aug 2024)
+
+## 🚨 Breaking Changes
+
+- Move required CMake version to 3.26.4 ([#627](https://github.com/rapidsai/rapids-cmake/pull/627)) [@robertmaynard](https://github.com/robertmaynard)
+- Removes legacy rapids-cmake cython implementations as it is deprecated in 24.08 ([#614](https://github.com/rapidsai/rapids-cmake/pull/614)) [@robertmaynard](https://github.com/robertmaynard)
+- Update CCCL to v2.5.0 ([#607](https://github.com/rapidsai/rapids-cmake/pull/607)) [@trxcllnt](https://github.com/trxcllnt)
+
+## 🐛 Bug Fixes
+
+- bs_thread_pool uses C++ 17 ([#662](https://github.com/rapidsai/rapids-cmake/pull/662)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Use `CMAKE_CUDA_ARCHITECTURES` value when ENV{CUDAARCHS} is set ([#659](https://github.com/rapidsai/rapids-cmake/pull/659)) [@robertmaynard](https://github.com/robertmaynard)
+- Pass `GLOBAL_TARGETS` to `rapids_cpm_find()` in `rapids_cpm_bs_thread_pool()` ([#655](https://github.com/rapidsai/rapids-cmake/pull/655)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Add rapids_cpm_nvtx3 to cmake-format-rapids-cmake.json ([#652](https://github.com/rapidsai/rapids-cmake/pull/652)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- generate_resource_spec uses the enabled languages to determine compiler ([#645](https://github.com/rapidsai/rapids-cmake/pull/645)) [@robertmaynard](https://github.com/robertmaynard)
+- Set CUDA_RUNTIME_LIBRARY to documented case style ([#641](https://github.com/rapidsai/rapids-cmake/pull/641)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- rapids_test_install_relocatable now handles SOVERSION target properties ([#636](https://github.com/rapidsai/rapids-cmake/pull/636)) [@robertmaynard](https://github.com/robertmaynard)
+- Eval CMAKE_CUDA_ARCHITECTURES before ENV{CUDAARCHS} ([#624](https://github.com/rapidsai/rapids-cmake/pull/624)) [@robertmaynard](https://github.com/robertmaynard)
+
+## 📖 Documentation
+
+- Fix CPM package docs. ([#637](https://github.com/rapidsai/rapids-cmake/pull/637)) [@bdice](https://github.com/bdice)
+- expand rapids-cmake cpm docs ([#613](https://github.com/rapidsai/rapids-cmake/pull/613)) [@robertmaynard](https://github.com/robertmaynard)
+
+## 🚀 New Features
+
+- Add rapids_cpm_bs_thread_pool() ([#651](https://github.com/rapidsai/rapids-cmake/pull/651)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- proprietary_binary_cuda_version_mapping allows for better CUDA version mapping ([#648](https://github.com/rapidsai/rapids-cmake/pull/648)) [@robertmaynard](https://github.com/robertmaynard)
+- use latest cuco with insert_or_apply CAS fix ([#646](https://github.com/rapidsai/rapids-cmake/pull/646)) [@srinivasyadav18](https://github.com/srinivasyadav18)
+- Fetch the latest cuco with CAS fixes ([#644](https://github.com/rapidsai/rapids-cmake/pull/644)) [@PointKernel](https://github.com/PointKernel)
+- Update to CPM v0.40.0 ([#642](https://github.com/rapidsai/rapids-cmake/pull/642)) [@robertmaynard](https://github.com/robertmaynard)
+- Remove CCCL patch for PR 211. ([#640](https://github.com/rapidsai/rapids-cmake/pull/640)) [@bdice](https://github.com/bdice)
+- Try any failing tests up to 3 times to guard against network issues ([#639](https://github.com/rapidsai/rapids-cmake/pull/639)) [@robertmaynard](https://github.com/robertmaynard)
+- rapids_cmake_support_conda_env adds `-O0` to debug compile lines ([#635](https://github.com/rapidsai/rapids-cmake/pull/635)) [@robertmaynard](https://github.com/robertmaynard)
+- Update cuco git tag to fetch new multiset data structure ([#628](https://github.com/rapidsai/rapids-cmake/pull/628)) [@PointKernel](https://github.com/PointKernel)
+- Move required CMake version to 3.26.4 ([#627](https://github.com/rapidsai/rapids-cmake/pull/627)) [@robertmaynard](https://github.com/robertmaynard)
+- Removes legacy rapids-cmake cython implementations as it is deprecated in 24.08 ([#614](https://github.com/rapidsai/rapids-cmake/pull/614)) [@robertmaynard](https://github.com/robertmaynard)
+- Update CCCL to v2.5.0 ([#607](https://github.com/rapidsai/rapids-cmake/pull/607)) [@trxcllnt](https://github.com/trxcllnt)
+
+## 🛠️ Improvements
+
+- Use workflow branch 24.08 again ([#647](https://github.com/rapidsai/rapids-cmake/pull/647)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Build and test with CUDA 12.5.1 ([#643](https://github.com/rapidsai/rapids-cmake/pull/643)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Bump CCCL version to include cuda::std::span fix ([#631](https://github.com/rapidsai/rapids-cmake/pull/631)) [@sleeepyjack](https://github.com/sleeepyjack)
+- Adopt CI/packaging codeowners ([#629](https://github.com/rapidsai/rapids-cmake/pull/629)) [@bdice](https://github.com/bdice)
+
 # rapids-cmake 24.06.00 (5 Jun 2024)
 
 ## 🐛 Bug Fixes

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2021-2023, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 ################################
 # rapids-cmake Version Updater #
 ################################
@@ -19,7 +19,7 @@ CURRENT_MINOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}')
 CURRENT_PATCH=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}')
 CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
 
-#Get <major>.<minor> for next version
+# Get <major>.<minor> for next version
 NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
 NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
 NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -178,10 +178,6 @@ dependencies:
     specific:
       - output_types: conda
         matrices:
-          - matrix:
-              py: "3.9"
-            packages:
-              - python=3.9
           - matrix:
               py: "3.10"
             packages:
@@ -192,7 +188,7 @@ dependencies:
               - python=3.11
           - matrix:
             packages:
-              - python>=3.9,<3.12
+              - python>=3.10,<3.12
   style_checks:
     common:
       - output_types: [conda, requirements]

diff --git a/docs/basics.rst b/docs/basics.rst
@@ -48,24 +48,51 @@ There are two ways projects can use ``rapids-cmake`` functions.
 Overriding RAPIDS.cmake
 ***********************
 
-At times projects or developers will need to verify ``rapids-cmake`` branches. To do this you need to override the default git repository and branch that ``RAPIDS.cmake`` downloads, which should be done
-like this:
+At times projects or developers will need to verify ``rapids-cmake`` branches. To do this you can set variables that control which repository ``RAPIDS.cmake`` downloads, which should be done like this:
 
 .. code-block:: cmake
 
-  include(FetchContent)
-  FetchContent_Declare(
-    rapids-cmake
-    GIT_REPOSITORY https://github.com/<my_fork>/rapids-cmake.git
-    GIT_TAG        <my_feature_branch>
-  )
-  file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.10/RAPIDS.cmake
+  # To override the version that is pulled:
+  set(rapids-cmake-version "<version>")
+
+  # To override the GitHub repository:
+  set(rapids-cmake-repo "<my_fork>")
+
+  # To use an exact Git SHA:
+  set(rapids-cmake-sha "<my_git_sha>")
+
+  # To use a Git tag:
+  set(rapids-cmake-tag "<my_git_tag>")
+
+  # To override the repository branch:
+  set(rapids-cmake-branch "<my_feature_branch>")
+
+  # Or to override the entire repository URL (e.g. to use a GitLab repo):
+  set(rapids-cmake-url "https://gitlab.com/<my_user>/<my_fork>/-/archive/<my_branch>/<my_fork>-<my_branch>.zip")
+
+  # To override the usage of fetching the repository without git info
+  # This only works when specifying
+  #
+  # set(rapids-cmake-fetch-via-git "ON")
+  # set(rapids-cmake-branch "branch-<cal_ver>")
+  #
+  # or
+  # set(rapids-cmake-fetch-via-git "ON")
+  # set(rapids-cmake-url "https://gitlab.com/<my_user>/<private_fork>/")
+  # set(rapids-cmake-sha "ABC123")
+  #
+  set(rapids-cmake-fetch-via-git "ON")
+
+  file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake
       ${CMAKE_CURRENT_BINARY_DIR}/RAPIDS.cmake)
   include(${CMAKE_CURRENT_BINARY_DIR}/RAPIDS.cmake)
 
+A few notes:
 
-This tells ``FetchContent`` to ignore the explicit url and branch in ``RAPIDS.cmake`` and use the
-ones provided.
+- An explicitly defined ``rapids-cmake-url`` will always be used
+- ``rapids-cmake-sha`` takes precedence over ``rapids-cmake-tag``
+- ``rapids-cmake-tag`` takes precedence over ``rapids-cmake-branch``
+- It is advised to always set ``rapids-cmake-version`` to the version expected by the repo your modifications will pull
 
 An incorrect approach that people try is to modify the ``file(DOWNLOAD)`` line to point to the
 custom ``rapids-cmake`` branch. That doesn't work as the downloaded ``RAPIDS.cmake`` contains

diff --git a/rapids-cmake/cmake/detail/compute_git_info.cmake b/rapids-cmake/cmake/detail/compute_git_info.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,4 +49,5 @@ if(_RAPIDS_WRITE_VERSION MATCHES dirty)
   set(_RAPIDS_GIT_IS_DIRTY 1)
 endif()
 
+string(TIMESTAMP current_year "%Y" UTC)
 configure_file("${TEMPLATE_FILE}" "${FILE_TO_WRITE}" @ONLY)
diff --git a/rapids-cmake/cmake/template/git_revision.hpp.in b/rapids-cmake/cmake/template/git_revision.hpp.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) @current_year@, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/rapids-cmake/cmake/template/version.hpp.in b/rapids-cmake/cmake/template/version.hpp.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) @current_year@, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/rapids-cmake/cmake/write_version_file.cmake b/rapids-cmake/cmake/write_version_file.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,6 +91,7 @@ function(rapids_cmake_write_version_file file_path)
     set(_RAPIDS_WRITE_PATCH 0)
   endif()
 
+  string(TIMESTAMP current_year "%Y" UTC)
   configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/version.hpp.in" "${output_path}"
                  @ONLY)
 endfunction()
diff --git a/rapids-cmake/cpm/detail/download.cmake b/rapids-cmake/cpm/detail/download.cmake
@@ -27,8 +27,18 @@ Does the downloading of the `CPM` module
 
   rapids_cpm_download()
 
-The CPM module will be downloaded based on the state of :cmake:variable:`CPM_SOURCE_CACHE` and
-:cmake:variable:`ENV{CPM_SOURCE_CACHE}`.
+The CPM module will be downloaded based on the following.
+
+.. versionadded:: v24.10.00
+
+If :cmake:variable:`CPM_DOWNLOAD_LOCATION` is defined that location will be used
+as the download location. If a file already exists at that location no download will occur
+
+If the :cmake:variable:`CPM_SOURCE_CACHE` or :cmake:variable:`ENV{CPM_SOURCE_CACHE}` are
+defined those will be used to compute a location for the file.
+
+If none of the above variables are defined, rapids-cmake will download the file
+to `cmake` directory under :cmake:variable:`CMAKE_BINARY_DIR`.
 
 .. note::
   Use `rapids_cpm_init` instead of this function, as this is an implementation detail
@@ -45,28 +55,30 @@ function(rapids_cpm_download)
   set(CPM_DOWNLOAD_VERSION 0.40.0)
   set(CPM_DOWNLOAD_MD5_HASH 6c9866a0aa0f804a36fe8c3866fb8a2c)
 
-  if(CPM_SOURCE_CACHE)
-    # Expand relative path. This is important if the provided path contains a tilde (~)
-    cmake_path(ABSOLUTE_PATH CPM_SOURCE_CACHE)
-
-    # default to the same location that cpm computes
-    set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
-    if(EXISTS "${CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
-      # Also support the rapids-cmake download location ( cmake/ vs cpm/ )
-      set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+  if(NOT DEFINED CPM_DOWNLOAD_LOCATION)
+    if(CPM_SOURCE_CACHE)
+      # Expand relative path. This is important if the provided path contains a tilde (~)
+      cmake_path(ABSOLUTE_PATH CPM_SOURCE_CACHE)
+
+      # default to the same location that cpm computes
+      set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+      if(EXISTS "${CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+        # Also support the rapids-cmake download location ( cmake/ vs cpm/ )
+        set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+      endif()
+
+    elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+
+      # default to the same location that cpm computes
+      set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+      if(EXISTS "$ENV{CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+        # Also support the rapids-cmake download location ( cmake/ vs cpm/ )
+        set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+      endif()
+
+    else()
+      set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
     endif()
-
-  elseif(DEFINED ENV{CPM_SOURCE_CACHE})
-
-    # default to the same location that cpm computes
-    set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
-    if(EXISTS "$ENV{CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
-      # Also support the rapids-cmake download location ( cmake/ vs cpm/ )
-      set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
-    endif()
-
-  else()
-    set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
   endif()
 
   if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))

diff --git a/rapids-cmake/cpm/nvcomp.cmake b/rapids-cmake/cpm/nvcomp.cmake
@@ -104,6 +104,11 @@ function(rapids_cpm_nvcomp)
     endif()
   endif()
 
+  # Set up the version of nvcomp we have downloaded to match the OS layout. that means ensuring we
+  # have a `lib64` directory on Fedora based machines
+  include("${rapids-cmake-dir}/cmake/install_lib_dir.cmake")
+  rapids_cmake_install_lib_dir(lib_dir)
+
   # second see if we have a proprietary pre-built binary listed in versions.json and download it if
   # requested.
   set(nvcomp_proprietary_binary OFF) # will be set to true by rapids_cpm_get_proprietary_binary
@@ -116,16 +121,19 @@ function(rapids_cpm_nvcomp)
     endif()
 
     if(nvcomp_proprietary_binary)
-      # Set up the version of nvcomp we have downloaded to match the OS layout. that means ensuring
-      # we have a `lib64` directory on Fedora based machines
-      include("${rapids-cmake-dir}/cmake/install_lib_dir.cmake")
-      rapids_cmake_install_lib_dir(lib_dir)
-
-      # Replace ${_IMPORT_PREFIX}/lib/ with ${_IMPORT_PREFIX}/${lib_dir}/ in all the target files
-      # that nvcomp ships. Guarded in an EXISTS check so we only try to do this on the first
-      # configuration pass
-      if(NOT EXISTS "${nvcomp_ROOT}/${lib_dir}/")
-        file(RENAME "${nvcomp_ROOT}/lib/" "${nvcomp_ROOT}/${lib_dir}/")
+      if(NOT EXISTS "${nvcomp_ROOT}/${lib_dir}/cmake/nvcomp/nvcomp-config.cmake")
+        include(GNUInstallDirs)
+        cmake_path(GET lib_dir PARENT_PATH lib_dir_parent)
+        cmake_path(GET CMAKE_INSTALL_INCLUDEDIR PARENT_PATH include_dir_parent)
+        if(NOT lib_dir_parent STREQUAL include_dir_parent)
+          message(FATAL_ERROR "CMAKE_INSTALL_INCLUDEDIR and CMAKE_INSTALL_LIBDIR must share parent directory"
+          )
+        endif()
+
+      # Replace ${_IMPORT_PREFIX}/lib/ with ${_IMPORT_PREFIX}/${lib_dir}/ in
+      # nvcomp-release-targets.cmake. Guarded in an EXISTS check so we only try to do this on the
+      # first configuration pass
+        cmake_path(GET lib_dir FILENAME lib_dir_name)
         set(nvcomp_list_of_target_files
             "nvcomp-targets-common-release.cmake"
             "nvcomp-targets-common.cmake"
@@ -135,21 +143,25 @@ function(rapids_cpm_nvcomp)
             "nvcomp-targets-static-release.cmake"
             "nvcomp-targets-static.cmake")
         foreach(filename IN LISTS nvcomp_list_of_target_files)
-          if(EXISTS "${nvcomp_ROOT}/${lib_dir}/cmake/nvcomp/${filename}")
-            file(READ "${nvcomp_ROOT}/${lib_dir}/cmake/nvcomp/${filename}" FILE_CONTENTS)
-            string(REPLACE "\$\{_IMPORT_PREFIX\}/lib/" "\$\{_IMPORT_PREFIX\}/${lib_dir}/"
+          if(EXISTS "${nvcomp_ROOT}/lib/cmake/nvcomp/${filename}")
+            file(READ "${nvcomp_ROOT}/lib/cmake/nvcomp/${filename}" FILE_CONTENTS)
+            string(REPLACE "\$\{_IMPORT_PREFIX\}/lib/" "\$\{_IMPORT_PREFIX\}/${lib_dir_name}/"
                            FILE_CONTENTS ${FILE_CONTENTS})
-            file(WRITE "${nvcomp_ROOT}/${lib_dir}/cmake/nvcomp/${filename}" ${FILE_CONTENTS})
+            file(WRITE "${nvcomp_ROOT}/lib/cmake/nvcomp/${filename}" ${FILE_CONTENTS})
           endif()
         endforeach()
+        file(MAKE_DIRECTORY "${nvcomp_ROOT}/${lib_dir_parent}")
+        file(RENAME "${nvcomp_ROOT}/lib/" "${nvcomp_ROOT}/${lib_dir}/")
+        # Move the `include` dir if necessary as well
+        file(RENAME "${nvcomp_ROOT}/include/" "${nvcomp_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/")
       endif()
 
       # Record the nvcomp_DIR so that if USE_PROPRIETARY_BINARY is disabled we can safely clear the
       # nvcomp_DIR value
-      set(nvcomp_proprietary_binary_dir "${nvcomp_ROOT}/${lib_dir}/cmake/nvcomp")
-      cmake_path(NORMAL_PATH nvcomp_proprietary_binary_dir)
-      set(rapids_cpm_nvcomp_proprietary_binary_dir "${nvcomp_proprietary_binary_dir}"
-          CACHE INTERNAL "nvcomp proprietary location")
+      set(nvcomp_proprietary_root "${nvcomp_ROOT}")
+      cmake_path(NORMAL_PATH nvcomp_proprietary_root)
+      set(rapids_cpm_nvcomp_proprietary_root "${nvcomp_proprietary_root}"
+          CACHE INTERNAL "nvcomp proprietary root dir location")
 
       # Enforce that we need to find the local download of nvcomp and nothing else when we have a
       # proprietary binary enabled.
@@ -159,7 +171,9 @@ function(rapids_cpm_nvcomp)
     endif()
   elseif(DEFINED nvcomp_DIR)
     cmake_path(NORMAL_PATH nvcomp_DIR)
-    if(nvcomp_DIR STREQUAL rapids_cpm_nvcomp_proprietary_binary_dir)
+    if(nvcomp_DIR STREQUAL "${rapids_cpm_nvcomp_proprietary_root}/${lib_dir}/cmake/nvcomp")
+      set(nvcomp_proprietary_binary ON)
+      set(nvcomp_ROOT "${rapids_cpm_nvcomp_proprietary_root}")
       unset(nvcomp_DIR)
       unset(nvcomp_DIR CACHE)
     endif()
@@ -211,7 +225,8 @@ function(rapids_cpm_nvcomp)
     include(GNUInstallDirs)
 
     install(DIRECTORY "${nvcomp_ROOT}/${lib_dir}/" DESTINATION "${lib_dir}")
-    install(DIRECTORY "${nvcomp_ROOT}/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+    install(DIRECTORY "${nvcomp_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
     # place the license information in the location that conda uses
     install(FILES "${nvcomp_ROOT}/NOTICE" DESTINATION info/ RENAME NVCOMP_NOTICE)
     install(FILES "${nvcomp_ROOT}/LICENSE" DESTINATION info/ RENAME NVCOMP_LICENSE)

diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json
@@ -21,7 +21,7 @@
       "git_shallow": false,
       "always_download": true,
       "git_url": "https://github.com/NVIDIA/cuCollections.git",
-      "git_tag": "ee5c10456c7ad584c254152411ba3dc114537a6f"
+      "git_tag": "d3477661d771e0d6fd22259bf6dd6f8c64a7401c"
     },
     "fmt": {
       "version": "10.1.1",

diff --git a/rapids-cmake/cython-core/create_modules.cmake b/rapids-cmake/cython-core/create_modules.cmake
@@ -28,7 +28,8 @@ Generate C(++) from Cython and create Python modules.
                                [SOURCE_FILES <src1> <src2> ...]
                                [LINKED_LIBRARIES <lib1> <lib2> ... ]
                                [INSTALL_DIR <install_path>]
-                               [MODULE_PREFIX <module_prefix>])
+                               [MODULE_PREFIX <module_prefix>]
+                               [ASSOCIATED_TARGETS <target1> <target2> ...])
 
 Creates a Cython target for each provided source file, then adds a
 corresponding Python extension module. Each built library has its RPATH set to