Compile Optimizations - batch 3

cpp/include/cugraph/mtmg/detail/per_device_edgelist.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/mtmg/handle.hpp>
+#include <cugraph/shuffle_functions.hpp>
 
 // FIXME: Could use std::span once compiler supports C++20
 #include <raft/core/host_span.hpp>
@@ -310,23 +310,22 @@ class per_device_edgelist_t {
     auto tmp_edge_end_time =
       edge_end_time_ ? std::make_optional(std::move((*edge_end_time_)[0])) : std::nullopt;
 
-    std::tie(store_transposed ? dst_[0] : src_[0],
-             store_transposed ? src_[0] : dst_[0],
+    std::tie(src_[0],
+             dst_[0],
              tmp_wgt,
              tmp_edge_id,
              tmp_edge_type,
              tmp_edge_start_time,
              tmp_edge_end_time,
-             std::ignore) =
-      cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
-        handle.raft_handle(),
-        store_transposed ? std::move(dst_[0]) : std::move(src_[0]),
-        store_transposed ? std::move(src_[0]) : std::move(dst_[0]),
-        std::move(tmp_wgt),
-        std::move(tmp_edge_id),
-        std::move(tmp_edge_type),
-        std::move(tmp_edge_start_time),
-        std::move(tmp_edge_end_time));
+             std::ignore) = cugraph::shuffle_ext_edges(handle.raft_handle(),
+                                                       std::move(src_[0]),
+                                                       std::move(dst_[0]),
+                                                       std::move(tmp_wgt),
+                                                       std::move(tmp_edge_id),
+                                                       std::move(tmp_edge_type),
+                                                       std::move(tmp_edge_start_time),
+                                                       std::move(tmp_edge_end_time),
+                                                       store_transposed);
 
     if (tmp_wgt) ((*wgt_)[0]) = std::move(*tmp_wgt);
     if (tmp_edge_id) ((*edge_id_)[0]) = std::move(*tmp_edge_id);

cpp/include/cugraph/shuffle_functions.hpp

@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include <cugraph/utilities/dataframe_buffer.hpp>
+
 #include <raft/core/handle.hpp>
 #include <raft/core/host_span.hpp>
 
@@ -30,23 +32,6 @@
 
 namespace cugraph {
 
-/**
- * @ingroup shuffle_functions_cpp
- * @brief Shuffle external vertex IDs to the owning GPUs (by vertex partitioning)
- *
- * @deprecated Replaced with shuffle_ext_vertices
- *
- * @tparam vertex_t    Type of vertex identifiers. Needs to be an integral type.
- *
- * @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and
- * handles to various CUDA libraries) to run graph algorithms.
- * @param vertices  List of vertex ids
- * @return Vector of vertex ids mapped to this GPU.
- */
-template <typename vertex_t>
-rmm::device_uvector<vertex_t> shuffle_external_vertices(raft::handle_t const& handle,
-                                                        rmm::device_uvector<vertex_t>&& vertices);
-
 /**
  * @ingroup shuffle_functions_cpp
  * @brief Shuffle external vertex IDs to the owning GPUs (by vertex partitioning)
@@ -62,28 +47,6 @@ template <typename vertex_t>
 rmm::device_uvector<vertex_t> shuffle_ext_vertices(raft::handle_t const& handle,
                                                    rmm::device_uvector<vertex_t>&& vertices);
 
-/**
- * @ingroup shuffle_functions_cpp
- * @brief Shuffle external vertex ID & value pairs to the owning GPUs (by vertex partitioning)
- *
- * @deprecated Replaced with shuffle_ext_vertex_value_pairs
- *
- * @tparam vertex_t   Type of vertex identifiers. Needs to be an integral type.
- * @tparam value_t    Type of values. currently supported types are int32_t,
- * int64_t, size_t, float and double.
- *
- * @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and
- * handles to various CUDA libraries) to run graph algorithms.
- * @param vertices  List of vertex ids
- * @param values List of values
- * @return Tuple of vectors storing vertex ids and values mapped to this GPU.
- */
-template <typename vertex_t, typename value_t>
-std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<value_t>>
-shuffle_external_vertex_value_pairs(raft::handle_t const& handle,
-                                    rmm::device_uvector<vertex_t>&& vertices,
-                                    rmm::device_uvector<value_t>&& values);
-
 /**
  * @ingroup shuffle_functions_cpp
  * @brief Shuffle external vertex ID & value pairs to the owning GPUs (by vertex partitioning)

cpp/src/c_api/allgather.cpp

@@ -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.
@@ -19,13 +19,13 @@
 #include "c_api/induced_subgraph_result.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 #include <cugraph_c/graph_generators.h>
 
 #include <cugraph/algorithms.hpp>
 #include <cugraph/detail/collect_comm_wrapper.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/decompress_to_edgelist.cpp

@@ -20,11 +20,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/ecg.cpp

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "detail/shuffle_wrappers.hpp"
+
 #include <cugraph_c/community_algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/extract_vertex_list.cpp

@@ -20,11 +20,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/graph_functions.cpp

@@ -21,11 +21,11 @@
 #include "c_api/graph_helper.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/graph_functions.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/shuffle_functions.hpp>
@@ -81,19 +81,16 @@ struct create_vertex_pairs_functor : public cugraph::c_api::abstract_functor {
                  std::ignore,
                  std::ignore,
                  std::ignore) =
-          cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning<
-            vertex_t,
-            edge_t,
-            weight_t,
-            edge_type_type_t,
-            int32_t>(handle_,
-                     std::move(first_copy),
-                     std::move(second_copy),
-                     std::nullopt,
-                     std::nullopt,
-                     std::nullopt,
-                     std::nullopt,
-                     std::nullopt);
+          cugraph::shuffle_ext_edges<vertex_t, edge_t, weight_t, edge_type_type_t, int32_t>(
+            handle_,
+            std::move(first_copy),
+            std::move(second_copy),
+            std::nullopt,
+            std::nullopt,
+            std::nullopt,
+            std::nullopt,
+            std::nullopt,
+            false);
       }
       // FIXME: use std::tuple (template) instead.
       result_ = new cugraph::c_api::cugraph_vertex_pairs_t{

cpp/src/c_api/hits.cpp

@@ -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.
@@ -18,11 +18,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/induced_subgraph.cpp

@@ -20,11 +20,11 @@
 #include "c_api/induced_subgraph_result.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/k_core.cpp

@@ -19,11 +19,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/k_truss.cpp

@@ -19,11 +19,11 @@
 #include "c_api/induced_subgraph_result.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/katz.cpp

@@ -19,11 +19,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/leiden.cpp

@@ -21,11 +21,11 @@
 #include "c_api/random.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/community_algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/lookup_src_dst.cpp

@@ -21,11 +21,11 @@
 #include "c_api/graph_helper.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/sampling_functions.hpp>

cpp/src/c_api/louvain.cpp

@@ -20,11 +20,11 @@
 #include "c_api/hierarchical_clustering_result.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/community_algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 

cpp/src/c_api/negative_sampling.cpp

@@ -20,11 +20,11 @@
 #include "c_api/random.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/sampling_algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/sampling_functions.hpp>
 

cpp/src/c_api/pagerank.cpp

@@ -19,11 +19,11 @@
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/shuffle_functions.hpp>

cpp/src/c_api/random.cpp

@@ -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.
@@ -13,17 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "c_api/random.hpp"
 
 #include "c_api/abstract_functor.hpp"
 #include "c_api/error.hpp"
 #include "c_api/graph.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/utilities/host_scalar_comm.hpp>
 
 namespace {

cpp/src/c_api/similarity.cpp

@@ -19,11 +19,11 @@
 #include "c_api/graph_functions.hpp"
 #include "c_api/resource_handle.hpp"
 #include "c_api/utils.hpp"
+#include "detail/shuffle_wrappers.hpp"
 
 #include <cugraph_c/algorithms.h>
 
 #include <cugraph/algorithms.hpp>
-#include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/shuffle_functions.hpp>