Merge branch 'branch-23.12' into bug/git_revision_target_works_with_e…

…xport

.github/workflows/build.yaml

@@ -28,7 +28,7 @@ concurrency:
 jobs:
   cpp-build:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
   upload-conda:
     needs: [cpp-build]
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
   docs-build:
     if: github.ref_type == 'branch'
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.12
     with:
       arch: "amd64"
       branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

@@ -17,26 +17,26 @@ jobs:
       - conda-cpp-tests
       - docs-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.12
   checks:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.12
   conda-cpp-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
     with:
       build_type: pull-request
   conda-cpp-tests:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
     with:
       build_type: pull-request
   docs-build:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.12
     with:
       build_type: pull-request
       node_type: "cpu4"

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ on:
 jobs:
   cpp-tests:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120-arm
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}

CHANGELOG.md

@@ -1,3 +1,28 @@
+# rapids-cmake 23.10.00 (11 Oct 2023)
+
+## 🐛 Bug Fixes
+
+- Quote the list of patch files in case they have spaces in their paths ([#463](https://github.com/rapidsai/rapids-cmake/pull/463)) [@ericniebler](https://github.com/ericniebler)
+- cpm overrides don't occur when `CPM_<pkg>_SOURCE` exists ([#458](https://github.com/rapidsai/rapids-cmake/pull/458)) [@robertmaynard](https://github.com/robertmaynard)
+- Use `conda mambabuild` not `mamba mambabuild` ([#457](https://github.com/rapidsai/rapids-cmake/pull/457)) [@bdice](https://github.com/bdice)
+- Support fmt use in debug builds ([#456](https://github.com/rapidsai/rapids-cmake/pull/456)) [@robertmaynard](https://github.com/robertmaynard)
+
+## 📖 Documentation
+
+- Move rapids_cpm_package_override to CPM section of docs ([#462](https://github.com/rapidsai/rapids-cmake/pull/462)) [@robertmaynard](https://github.com/robertmaynard)
+- Improve docs around fetch content and rapids-cmake overrides ([#444](https://github.com/rapidsai/rapids-cmake/pull/444)) [@robertmaynard](https://github.com/robertmaynard)
+
+## 🚀 New Features
+
+- Bump cuco version ([#452](https://github.com/rapidsai/rapids-cmake/pull/452)) [@PointKernel](https://github.com/PointKernel)
+
+## 🛠️ Improvements
+
+- Update image names ([#461](https://github.com/rapidsai/rapids-cmake/pull/461)) [@AyodeAwe](https://github.com/AyodeAwe)
+- Update to CPM v0.38.5 ([#460](https://github.com/rapidsai/rapids-cmake/pull/460)) [@trxcllnt](https://github.com/trxcllnt)
+- Update to clang 16.0.6. ([#459](https://github.com/rapidsai/rapids-cmake/pull/459)) [@bdice](https://github.com/bdice)
+- Use `copy-pr-bot` ([#455](https://github.com/rapidsai/rapids-cmake/pull/455)) [@ajschmidt8](https://github.com/ajschmidt8)
+
 # rapids-cmake 23.08.00 (9 Aug 2023)
 
 ## 🐛 Bug Fixes

rapids-cmake/cpm/patches/command_template.cmake.in

@@ -68,6 +68,16 @@ function(rapids_cpm_run_git_patch file issue)
   set(msg_state ${msg_state} PARENT_SCOPE)
 endfunction()
 
+# We want to ensure that any patched files have a timestamp
+# that is at least 1 second newer compared to the git checkout
+# This ensures that all of CMake up-to-date install logic
+# considers these files as modified.
+#
+# This ensures that if our patch contains additional install rules
+# they will execute even when an existing install rule exists
+# with the same destination ( and our patch is listed last ).
+execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
+
 set(files "@patch_files_to_run@")
 set(issues "@patch_issues_to_ref@")
 set(output_file "@log_file@")

rapids-cmake/cpm/patches/libcudacxx/install_rules.diff

@@ -1,36 +1,18 @@
 diff --git a/cmake/libcudacxxInstallRules.cmake b/cmake/libcudacxxInstallRules.cmake
-index 446ccb50..ff622bb7 100644
+index bd92a3be..f99a5606 100644
 --- a/cmake/libcudacxxInstallRules.cmake
 +++ b/cmake/libcudacxxInstallRules.cmake
-@@ -1,5 +1,5 @@
- option(libcudacxx_ENABLE_INSTALL_RULES
--  "Enable installation of libcudacxx" ${libcudacxx_TOPLEVEL_PROJECT}
-+  "Enable installation of libcudacxx" ${LIBCUDACXX_TOPLEVEL_PROJECT}
- )
-
- if (NOT libcudacxx_ENABLE_INSTALL_RULES)
-@@ -12,24 +12,27 @@ include(GNUInstallDirs)
- # Libcudacxx headers
- install(DIRECTORY "${libcudacxx_SOURCE_DIR}/include/cuda"
-   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+  PATTERN CMakeLists.txt EXCLUDE
- )
- install(DIRECTORY "${libcudacxx_SOURCE_DIR}/include/nv"
-   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+  PATTERN CMakeLists.txt EXCLUDE
- )
-
- # Libcudacxx cmake package
- install(DIRECTORY "${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx"
-   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake"
--  PATTERN libcudacxx-header-search EXCLUDE
-+  PATTERN *.cmake.in EXCLUDE
- )
-
+@@ -28,10 +28,17 @@ install(DIRECTORY "${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx"
  # Need to configure a file to store CMAKE_INSTALL_INCLUDEDIR
  # since it can be defined by the user. This is common to work around collisions
  # with the CTK installed headers.
 +set(install_location "${CMAKE_INSTALL_LIBDIR}/cmake/libcudacxx")
++# Transform to a list of directories, replace each directory with "../"
++# and convert back to a string
++string(REGEX REPLACE "/" ";" from_install_prefix "${install_location}")
++list(TRANSFORM from_install_prefix REPLACE ".+" "../")
++list(JOIN from_install_prefix "" from_install_prefix)
++
  configure_file("${libcudacxx_SOURCE_DIR}/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in"
    "${libcudacxx_BINARY_DIR}/lib/cmake/libcudacxx/libcudacxx-header-search.cmake"
    @ONLY
@@ -39,23 +21,16 @@ index 446ccb50..ff622bb7 100644
 -  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libcudacxx"
 +  DESTINATION "${install_location}"
  )
-
 diff --git a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
-index 9e7e187c..cb3b946f 100644
+index 9e7e187c..6130197f 100644
 --- a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
 +++ b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
-@@ -1,8 +1,18 @@
+@@ -1,8 +1,12 @@
  # Parse version information from version header:
  unset(_libcudacxx_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
 +
 +# Find CMAKE_INSTALL_INCLUDEDIR=@CMAKE_INSTALL_INCLUDEDIR@ directory"
-+set(from_install_prefix "@install_location@")
-+
-+# Transform to a list of directories, replace each directory with "../"
-+# and convert back to a string
-+string(REGEX REPLACE "/" ";" from_install_prefix "${from_install_prefix}")
-+list(TRANSFORM from_install_prefix REPLACE ".+" "../")
-+list(JOIN from_install_prefix "" from_install_prefix)
++set(from_install_prefix "@from_install_prefix@")
 +
  find_path(_libcudacxx_VERSION_INCLUDE_DIR cuda/std/detail/__config
    NO_DEFAULT_PATH # Only search explicit paths below:

rapids-cmake/cpm/patches/libcudacxx/proclaim_return_type_nv_exec_check_disable.diff

@@ -0,0 +1,74 @@
+diff --git a/include/cuda/std/detail/libcxx/include/__functional/invoke.h b/include/cuda/std/detail/libcxx/include/__functional/invoke.h
+index 1ab318d5..850d00a8 100644
+--- a/include/cuda/std/detail/libcxx/include/__functional/invoke.h
++++ b/include/cuda/std/detail/libcxx/include/__functional/invoke.h
+@@ -342,6 +342,9 @@ _LIBCUDACXX_INLINE_VISIBILITY __nat __invoke(__any, _Args&& ...__args);
+
+ // bullets 1, 2 and 3
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0, class ..._Args,
+           class = __enable_if_bullet1<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -350,6 +353,9 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
+     _NOEXCEPT_(noexcept((static_cast<_A0&&>(__a0).*__f)(static_cast<_Args&&>(__args)...)))
+     { return           (static_cast<_A0&&>(__a0).*__f)(static_cast<_Args&&>(__args)...); }
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0, class ..._Args,
+           class = __enable_if_bullet2<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -358,6 +364,9 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
+     _NOEXCEPT_(noexcept((__a0.get().*__f)(static_cast<_Args&&>(__args)...)))
+     { return          (__a0.get().*__f)(static_cast<_Args&&>(__args)...); }
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0, class ..._Args,
+           class = __enable_if_bullet3<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -368,6 +377,9 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
+
+ // bullets 4, 5 and 6
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0,
+           class = __enable_if_bullet4<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -376,6 +388,9 @@ __invoke(_Fp&& __f, _A0&& __a0)
+     _NOEXCEPT_(noexcept(static_cast<_A0&&>(__a0).*__f))
+     { return          static_cast<_A0&&>(__a0).*__f; }
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0,
+           class = __enable_if_bullet5<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -384,6 +399,9 @@ __invoke(_Fp&& __f, _A0&& __a0)
+     _NOEXCEPT_(noexcept(__a0.get().*__f))
+     { return          __a0.get().*__f; }
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class _A0,
+           class = __enable_if_bullet6<_Fp, _A0> >
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+@@ -394,6 +412,9 @@ __invoke(_Fp&& __f, _A0&& __a0)
+
+ // bullet 7
+
++#ifdef __CUDACC__
++#pragma nv_exec_check_disable
++#endif
+ template <class _Fp, class ..._Args>
+ inline _LIBCUDACXX_INLINE_VISIBILITY
+ _LIBCUDACXX_CONSTEXPR decltype(_CUDA_VSTD::declval<_Fp>()(_CUDA_VSTD::declval<_Args>()...))

rapids-cmake/cpm/patches/libcudacxx/reroot_support.diff

@@ -1,10 +1,10 @@
 diff --git a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
-index 8c44d990..365b9de0 100644
+index 6130197f..ec53d5de 100644
 --- a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
 +++ b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
-@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../")
- list(JOIN from_install_prefix "" from_install_prefix)
-
+@@ -5,6 +5,7 @@ unset(_libcudacxx_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
+ set(from_install_prefix "@from_install_prefix@")
+ 
  find_path(_libcudacxx_VERSION_INCLUDE_DIR cuda/std/detail/__config
 +  NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search
    NO_DEFAULT_PATH # Only search explicit paths below:

rapids-cmake/cpm/versions.json

@@ -1,4 +1,3 @@
-
 {
   "packages" : {
     "benchmark" : {
@@ -30,18 +29,23 @@
       "git_tag" : "v${version}"
     },
     "libcudacxx" : {
-      "version" : "1.9.1",
+      "version" : "2.1.0",
       "git_url" : "https://github.com/NVIDIA/libcudacxx.git",
-      "git_tag" : "branch/${version}",
+      "git_tag" : "${version}",
       "patches" : [
         {
           "file" : "libcudacxx/install_rules.diff",
-          "issue" : "libcudacxx 1.X installs incorrect files [https://github.com/NVIDIA/libcudacxx/pull/428]",
+          "issue" : "libcudacxx installs incorrect files [https://github.com/NVIDIA/libcudacxx/pull/428]",
           "fixed_in" : "2.2"
         },
         {
           "file" : "libcudacxx/reroot_support.diff",
-          "issue" : "Support conda-forge usage of CMake rerooting [https://github.com/NVIDIA/libcudacxx/pull/490]",
+          "issue" : "Support conda-forge usage of CMake rerooting [https://github.com/NVIDIA/libcudacxx/pull/490], requires libcudacxx/install_rules.diff.",
+          "fixed_in" : "2.2"
+        },
+        {
+          "file" : "libcudacxx/proclaim_return_type_nv_exec_check_disable.diff",
+          "issue" : "Use pragma to disable execution checks in cuda::proclaim_return_type. [https://github.com/NVIDIA/libcudacxx/pull/448]",
           "fixed_in" : "2.2"
         }
       ]