Merge pull request #3733 from rapidsai/branch-23.08

Forward-merge branch-23.08 to branch-23.10
rapidsai · Jul 21, 2023 · e3a431a · e3a431a
2 parents 3b0299b + 487efd6
commit e3a431a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu
@@ -163,7 +163,6 @@ class Tests_MGUniform_Neighbor_Sampling
     EXPECT_THROW(
       cugraph::uniform_neighbor_sample(
         *handle_,
-        handle,
         mg_graph_view,
         mg_edge_weight_view,
         std::optional<cugraph::edge_property_view_t<edge_t, edge_t const*>>{std::nullopt},

diff --git a/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu b/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu
@@ -128,25 +128,29 @@ class Tests_Uniform_Neighbor_Sampling
                random_sources.size(),
                handle.get_stream());
 
-#ifdef NO_CUGRAPH_OPS
-    EXPECT_THROW(cugraph::uniform_neighbor_sample(
-                   handle,
-                   graph_view,
-                   edge_weight_view,
-                   std::nullopt,
-                   std::nullopt,
-                   std::move(random_sources_copy),
-                   std::move(batch_number),
-                   raft::host_span<int32_t const>(uniform_neighbor_sampling_usecase.fanout.data(),
-                                                  uniform_neighbor_sampling_usecase.fanout.size()),
-                   rng_state,
-                   true,
-                   uniform_neighbor_sampling_usecase.flag_replacement),
-                 std::exception);
-#else
     std::optional<std::tuple<raft::device_span<int32_t const>, raft::device_span<int32_t const>>>
       label_to_output_comm_rank_mapping{std::nullopt};
 
+#ifdef NO_CUGRAPH_OPS
+    EXPECT_THROW(
+      cugraph::uniform_neighbor_sample(
+        handle,
+        graph_view,
+        edge_weight_view,
+        std::optional<cugraph::edge_property_view_t<edge_t, edge_t const*>>{std::nullopt},
+        std::optional<cugraph::edge_property_view_t<edge_t, int32_t const*>>{std::nullopt},
+        raft::device_span<vertex_t const>{random_sources_copy.data(), random_sources.size()},
+        batch_number ? std::make_optional(raft::device_span<int32_t const>{batch_number->data(),
+                                                                           batch_number->size()})
+                     : std::nullopt,
+        label_to_output_comm_rank_mapping,
+        raft::host_span<int32_t const>(uniform_neighbor_sampling_usecase.fanout.data(),
+                                       uniform_neighbor_sampling_usecase.fanout.size()),
+        rng_state,
+        true,
+        uniform_neighbor_sampling_usecase.flag_replacement),
+      std::exception);
+#else
     auto&& [src_out, dst_out, wgt_out, edge_id, edge_type, hop, labels, offsets] =
       cugraph::uniform_neighbor_sample(
         handle,