Don't compile int32_t/int64_t vertex_t/edge_t combinations (#4720)

To reduce compile time and library size... we're dropping pre-compiled support for vertex_t as int32_t and edge_t as int64_t. This is a small edge case in memory utilization. The data structures and primitives would still support such a configuration, but we're not compiling it into libcugraph.so with this PR. Seems to improve C++ compile time by 25% on my dgx18 and a 30% reduction in the size of libcugraph.so. Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Seunghwa Kang (https://github.com/seunghwak) URL: #4720
rapidsai · Oct 18, 2024 · 2ac5586 · 2ac5586
1 parent 69d6601
commit 2ac5586
Show file tree

Hide file tree

Showing 209 changed files with 39 additions and 7,672 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
diff --git a/cpp/include/cugraph/utilities/graph_traits.hpp b/cpp/include/cugraph/utilities/graph_traits.hpp
@@ -44,7 +44,7 @@ template <typename vertex_t, typename edge_t>
 struct is_vertex_edge_combo {
   static constexpr bool value = is_one_of<vertex_t, int32_t, int64_t>::value &&
                                 is_one_of<edge_t, int32_t, int64_t>::value &&
-                                (sizeof(vertex_t) <= sizeof(edge_t));
+                                (sizeof(vertex_t) == sizeof(edge_t));
 };
 
 // meta-function that constrains

diff --git a/cpp/src/c_api/graph_helper_mg.cu b/cpp/src/c_api/graph_helper_mg.cu
@@ -25,12 +25,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, false, true> const& graph_view,
   float constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, false, true>, float>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, false, true> const& graph_view,
-  float constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, false, true>, float>
 create_constant_edge_property(
   raft::handle_t const& handle,
@@ -42,11 +36,6 @@ create_constant_edge_property(raft::handle_t const& handle,
                               cugraph::graph_view_t<int32_t, int32_t, true, true> const& graph_view,
                               float constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, true, true>, float>
-create_constant_edge_property(raft::handle_t const& handle,
-                              cugraph::graph_view_t<int32_t, int64_t, true, true> const& graph_view,
-                              float constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, true, true>, float>
 create_constant_edge_property(raft::handle_t const& handle,
                               cugraph::graph_view_t<int64_t, int64_t, true, true> const& graph_view,
@@ -58,12 +47,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, false, true> const& graph_view,
   double constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, false, true>, double>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, false, true> const& graph_view,
-  double constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, false, true>, double>
 create_constant_edge_property(
   raft::handle_t const& handle,
@@ -75,11 +58,6 @@ create_constant_edge_property(raft::handle_t const& handle,
                               cugraph::graph_view_t<int32_t, int32_t, true, true> const& graph_view,
                               double constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, true, true>, double>
-create_constant_edge_property(raft::handle_t const& handle,
-                              cugraph::graph_view_t<int32_t, int64_t, true, true> const& graph_view,
-                              double constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, true, true>, double>
 create_constant_edge_property(raft::handle_t const& handle,
                               cugraph::graph_view_t<int64_t, int64_t, true, true> const& graph_view,

diff --git a/cpp/src/c_api/graph_helper_sg.cu b/cpp/src/c_api/graph_helper_sg.cu
@@ -48,12 +48,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, false, false> const& graph_view,
   float constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, false, false>, float>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, false, false> const& graph_view,
-  float constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, false, false>, float>
 create_constant_edge_property(
   raft::handle_t const& handle,
@@ -66,12 +60,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, true, false> const& graph_view,
   float constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, true, false>, float>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, true, false> const& graph_view,
-  float constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, true, false>, float>
 create_constant_edge_property(
   raft::handle_t const& handle,
@@ -84,12 +72,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, false, false> const& graph_view,
   double constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, false, false>, double>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, false, false> const& graph_view,
-  double constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, false, false>, double>
 create_constant_edge_property(
   raft::handle_t const& handle,
@@ -102,12 +84,6 @@ create_constant_edge_property(
   cugraph::graph_view_t<int32_t, int32_t, true, false> const& graph_view,
   double constant_value);
 
-template edge_property_t<cugraph::graph_view_t<int32_t, int64_t, true, false>, double>
-create_constant_edge_property(
-  raft::handle_t const& handle,
-  cugraph::graph_view_t<int32_t, int64_t, true, false> const& graph_view,
-  double constant_value);
-
 template edge_property_t<cugraph::graph_view_t<int64_t, int64_t, true, false>, double>
 create_constant_edge_property(
   raft::handle_t const& handle,

diff --git a/cpp/src/c_api/graph_mg.cpp b/cpp/src/c_api/graph_mg.cpp
@@ -402,6 +402,14 @@ extern "C" cugraph_error_code_t cugraph_graph_create_mg(
                                                     raft::comms::op_t::SUM,
                                                     p_handle->handle_->get_stream());
 
+  cugraph_data_type_id_t edge_type{vertex_type};
+
+  if (vertex_type == cugraph_data_type_id_t::INT32)
+    CAPI_EXPECTS(num_edges < int32_threshold,
+                 CUGRAPH_INVALID_INPUT,
+                 "Number of edges won't fit in 32-bit integer, using 32-bit type",
+                 *error);
+
   auto vertex_types = cugraph::host_scalar_allgather(
     p_handle->handle_->get_comms(), static_cast<int>(vertex_type), p_handle->handle_->get_stream());
 
@@ -434,14 +442,6 @@ extern "C" cugraph_error_code_t cugraph_graph_create_mg(
                "different weight type used on different GPUs",
                *error);
 
-  cugraph_data_type_id_t edge_type;
-
-  if (num_edges < int32_threshold) {
-    edge_type = static_cast<cugraph_data_type_id_t>(vertex_types[0]);
-  } else {
-    edge_type = cugraph_data_type_id_t::INT64;
-  }
-
   if (weight_type == cugraph_data_type_id_t::NTYPES) {
     weight_type = cugraph_data_type_id_t::FLOAT32;
   }

diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp
@@ -609,14 +609,14 @@ extern "C" cugraph_error_code_t cugraph_graph_create_sg(
                "Invalid input arguments: src size != weights size.",
                *error);
 
-  cugraph_data_type_id_t edge_type;
-  cugraph_data_type_id_t weight_type;
+  if (p_src->type_ == cugraph_data_type_id_t::INT32)
+    CAPI_EXPECTS(p_src->size_ < int32_threshold,
+                 CUGRAPH_INVALID_INPUT,
+                 "Number of edges won't fit in 32-bit integer, using 32-bit type",
+                 *error);
 
-  if (p_src->size_ < int32_threshold) {
-    edge_type = p_src->type_;
-  } else {
-    edge_type = cugraph_data_type_id_t::INT64;
-  }
+  cugraph_data_type_id_t edge_type = p_src->type_;
+  cugraph_data_type_id_t weight_type;
 
   if (weights != nullptr) {
     weight_type = p_weights->type_;

diff --git a/cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu b/cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu
diff --git a/cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu b/cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu
diff --git a/cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu b/cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu
diff --git a/cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu b/cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu