Merge branch 'branch-25.02' into add_graph_dgroups

rapidsai · Jan 14, 2025 · 8456071 · 8456071
2 parents 64268ad + 6b5db94
commit 8456071
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cpp/src/sampling/neighbor_sampling_impl.hpp b/cpp/src/sampling/neighbor_sampling_impl.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -184,7 +184,7 @@ neighbor_sample_impl(raft::handle_t const& handle,
 
   std::vector<size_t> level_sizes{};
 
-  for (auto hop = 0; hop < num_hops; hop++) {
+  for (size_t hop = 0; hop < num_hops; ++hop) {
     rmm::device_uvector<vertex_t> level_result_src(0, handle.get_stream());
     rmm::device_uvector<vertex_t> level_result_dst(0, handle.get_stream());
 

diff --git a/cpp/src/sampling/sampling_post_processing_impl.cuh b/cpp/src/sampling/sampling_post_processing_impl.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1391,12 +1391,10 @@ compute_vertex_renumber_map(
           [offsets = *vertex_type_offsets] __device__(auto lhs, auto rhs) {
             auto lhs_v_type = thrust::distance(
               offsets.begin() + 1,
-              thrust::upper_bound(
-                thrust::seq, offsets.begin() + 1, offsets.end(), thrust::get<0>(lhs)));
+              thrust::upper_bound(thrust::seq, offsets.begin() + 1, offsets.end(), lhs));
             auto rhs_v_type = thrust::distance(
               offsets.begin() + 1,
-              thrust::upper_bound(
-                thrust::seq, offsets.begin() + 1, offsets.end(), thrust::get<0>(rhs)));
+              thrust::upper_bound(thrust::seq, offsets.begin() + 1, offsets.end(), rhs));
             return lhs_v_type < rhs_v_type;
           });
       }

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -101,6 +101,7 @@ files:
       - depends_on_dask_cuda
       - depends_on_dask_cudf
       - depends_on_pylibcugraph
+      - depends_on_pylibraft
       - depends_on_raft_dask
       - depends_on_rmm
       - depends_on_ucx_py

diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml
@@ -32,6 +32,7 @@ dependencies = [
     "numba>=0.57",
     "numpy>=1.23,<3.0a0",
     "pylibcugraph==25.2.*,>=0.0.0a0",
+    "pylibraft==25.2.*,>=0.0.0a0",
     "raft-dask==25.2.*,>=0.0.0a0",
     "rapids-dask-dependency==25.2.*,>=0.0.0a0",
     "rmm==25.2.*,>=0.0.0a0",