Update CCCL to v2.5.0

rapids-cmake/cpm/patches/cccl/revert_pr_211.diff

@@ -1,79 +1,47 @@
 diff --git a/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h b/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
-index a0d9d492d..69c4e20df 100644
+index 046eb83c0..8047c9701 100644
 --- a/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
 +++ b/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
-@@ -33,38 +33,12 @@
- #include <thrust/system/cuda/config.h>
- #include <thrust/system/cuda/detail/execution_policy.h>
- #include <thrust/system/cuda/detail/transform.h>
--#include <thrust/system/cuda/detail/util.h>
--#include <thrust/distance.h>
- #include <thrust/functional.h>
--#include <thrust/type_traits/is_trivially_relocatable.h>
+@@ -53,41 +53,15 @@ namespace cuda_cub
 
- THRUST_NAMESPACE_BEGIN
- namespace cuda_cub {
-
- namespace __copy {
--  template <class Derived,
--            class InputIt,
--            class OutputIt>
--  OutputIt THRUST_RUNTIME_FUNCTION
--  device_to_device(execution_policy<Derived>& policy,
--                   InputIt                    first,
--                   InputIt                    last,
--                   OutputIt                   result,
--                   thrust::detail::true_type)
+ namespace __copy
+ {
+-template <class Derived, class InputIt, class OutputIt>
+-OutputIt THRUST_RUNTIME_FUNCTION device_to_device(
+-  execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, thrust::detail::true_type)
+-{
+-  typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
+-  const auto n = thrust::distance(first, last);
+-  if (n > 0)
 -  {
--    typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
--    const auto n = thrust::distance(first, last);
--    if (n > 0) {
--      cudaError status;
--      status = trivial_copy_device_to_device(policy,
--                                             reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
--                                             reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
--                                             n);
--      cuda_cub::throw_on_error(status, "__copy:: D->D: failed");
--    }
--
--    return result + n;
--  }
-
-   template <class Derived,
-             class InputIt,
-@@ -73,32 +47,16 @@ namespace __copy {
-   device_to_device(execution_policy<Derived>& policy,
-                    InputIt                    first,
-                    InputIt                    last,
--                   OutputIt                   result,
--                   thrust::detail::false_type)
-+                   OutputIt                   result)
-   {
-     typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
-     return cuda_cub::transform(policy,
--                              first,
--                              last,
--                              result,
--                              thrust::identity<InputTy>());
+-    cudaError status;
+-    status = trivial_copy_device_to_device(
+-      policy,
+-      reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
+-      reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
+-      n);
+-    cuda_cub::throw_on_error(status, "__copy:: D->D: failed");
 -  }
 -
--  template <class Derived,
--            class InputIt,
--            class OutputIt>
--  OutputIt THRUST_RUNTIME_FUNCTION
--  device_to_device(execution_policy<Derived>& policy,
--                   InputIt                    first,
--                   InputIt                    last,
--                   OutputIt                   result)
--  {
--    return device_to_device(policy,
-                             first,
-                             last,
-                             result,
--                            typename is_indirectly_trivially_relocatable_to<InputIt, OutputIt>::type());
-+                            thrust::identity<InputTy>());
-   }
-+
- }    // namespace __copy
+-  return result + n;
+-}
+
+ template <class Derived, class InputIt, class OutputIt>
+ OutputIt THRUST_RUNTIME_FUNCTION device_to_device(
+-  execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, thrust::detail::false_type)
++  execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
+ {
+   typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
+   return cuda_cub::transform(policy, first, last, result, thrust::identity<InputTy>());
+ }
+
+-template <class Derived, class InputIt, class OutputIt>
+-OutputIt THRUST_RUNTIME_FUNCTION
+-device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
+-{
+-  return device_to_device(
+-    policy, first, last, result, typename is_indirectly_trivially_relocatable_to<InputIt, OutputIt>::type());
+-}
+ } // namespace __copy
 
- }    // namespace cuda_cub
+ } // namespace cuda_cub

rapids-cmake/cpm/versions.json

@@ -6,9 +6,10 @@
       "git_tag": "v${version}"
     },
     "CCCL": {
-      "version": "2.2.0",
-      "git_url": "https://github.com/NVIDIA/cccl.git",
-      "git_tag": "v${version}",
+      "version": "2.5.0",
+      "git_shallow": false,
+      "git_url": "https://github.com/trxcllnt/cccl.git",
+      "git_tag": "fea/build-rapids",
       "patches": [
         {
           "file": "cccl/bug_fixes.diff",
@@ -35,8 +36,9 @@
     "cuco": {
       "version": "0.0.1",
       "git_shallow": false,
+      "always_download": true,
       "git_url": "https://github.com/NVIDIA/cuCollections.git",
-      "git_tag": "2101cb31d0210b609cd02c88f9b538e10881d91d"
+      "git_tag": "6923b3b1e526b3305de81f784fdca26736caf5ba"
     },
     "fmt": {
       "version": "10.1.1",