Test updates of CCCL (thrust, cub, libcudacxx) to 2.1.0.

conda/recipes/libraft/meta.yaml

@@ -62,15 +62,15 @@ outputs:
         - cuda-cudart-dev
         {% endif %}
         - cuda-version ={{ cuda_version }}
-        - librmm ={{ minor_version }}
+        #- librmm ={{ minor_version }}  # TODO: Temporarily disabled so that rmm doesn't provide CCCL
         - spdlog {{ spdlog_version }}
         - fmt {{ fmt_version }}
       run:
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
         {% if cuda_major == "11" %}
         - cudatoolkit
         {% endif %}
-        - librmm ={{ minor_version }}
+        #- librmm ={{ minor_version }}  # TODO: Temporarily disabled so that rmm doesn't provide CCCL
         - spdlog {{ spdlog_version }}
         - fmt {{ fmt_version }}
     about:
@@ -92,7 +92,7 @@ outputs:
         - cuda-version ={{ cuda_version }}
       run:
         - {{ pin_subpackage('libraft-headers-only', exact=True) }}
-        - librmm ={{ minor_version }}
+        #- librmm ={{ minor_version }}  # TODO: Temporarily disabled so that rmm doesn't provide CCCL
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
         {% if cuda_major == "11" %}
         - cudatoolkit

cpp/include/raft/spectral/detail/matrix_wrappers.hpp

@@ -30,6 +30,8 @@
 #include <thrust/reduce.h>
 #include <thrust/system/cuda/execution_policy.h>
 
+#include <cuda/functional>
+
 #include <algorithm>
 
 // =========================================================
@@ -107,15 +109,16 @@ class vector_t {
 
   value_type nrm1() const
   {
-    return thrust::reduce(thrust_policy,
-                          buffer_.data(),
-                          buffer_.data() + buffer_.size(),
-                          value_type{0},
-                          [] __device__(auto left, auto right) {
-                            auto abs_left  = left > 0 ? left : -left;
-                            auto abs_right = right > 0 ? right : -right;
-                            return abs_left + abs_right;
-                          });
+    return thrust::reduce(
+      thrust_policy,
+      buffer_.data(),
+      buffer_.data() + buffer_.size(),
+      value_type{0},
+      cuda::proclaim_return_type<value_type>([] __device__(auto left, auto right) {
+        auto abs_left  = left > 0 ? left : -left;
+        auto abs_right = right > 0 ? right : -right;
+        return abs_left + abs_right;
+      }));
   }
 
   void fill(value_type value)

cpp/test/core/span.cpp

@@ -13,6 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* TODO: This include of cuda_runtime.h is needed to work around
+ * https://github.com/NVIDIA/libcudacxx/pull/476
+ * which is resolved in CCCL 2.2.0. The macro definition order requires CUDA
+ * headers to be included before libcudacxx headers.
+ */
+#include <cuda_runtime.h>
+
 #include "test_span.hpp"
 #include <gtest/gtest.h>
 #include <numeric>  // iota

cpp/test/core/sparse_matrix.cpp

@@ -13,6 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* TODO: This include of cuda_runtime.h is needed to work around
+ * https://github.com/NVIDIA/libcudacxx/pull/476
+ * which is resolved in CCCL 2.2.0. The macro definition order requires CUDA
+ * headers to be included before libcudacxx headers.
+ */
+#include <cuda_runtime.h>
+
 #include <gtest/gtest.h>
 #include <raft/core/host_coo_matrix.hpp>
 #include <raft/core/host_csr_matrix.hpp>

fetch_rapids.cmake

@@ -11,6 +11,8 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 # =============================================================================
+set(rapids-cmake-repo bdice/rapids-cmake)
+set(rapids-cmake-branch cccl-update-2.1.0)
 if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake)
   file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
        ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake