[REVIEW] 2D cython/python infrastructure- BFS & SSSP

CHANGELOG.md

@@ -10,6 +10,7 @@
 - PR #1163 Integrated 2D shuffling and Louvain updates
 - PR #1178 Refactored cython graph factory code to scale to additional data types
 - PR #1175 Integrated 2D pagerank python/cython infra
+- PR #1177 Integrated 2D bfs and sssp python/cython infra
 
 ## Improvements
 - PR 1081 MNMG Renumbering - sort partitions by degree
@@ -49,6 +50,7 @@
 - PR #1196 Move subcomms init outside of individual algorithm functions
 - PR #1198 Remove deprecated call to from_gpu_matrix
 
+
 # cuGraph 0.15.0 (26 Aug 2020)
 
 ## New Features

cpp/include/algorithms.hpp

@@ -965,7 +965,7 @@ namespace experimental {
  * @param do_expensive_check A flag to run expensive checks for input arguments (if set to `true`).
  */
 template <typename vertex_t, typename edge_t, typename weight_t, bool multi_gpu>
-void bfs(raft::handle_t &handle,
+void bfs(raft::handle_t const &handle,
          graph_view_t<vertex_t, edge_t, weight_t, false, multi_gpu> const &graph_view,
          vertex_t *distances,
          vertex_t *predecessors,
@@ -998,7 +998,7 @@ void bfs(raft::handle_t &handle,
  * @param do_expensive_check A flag to run expensive checks for input arguments (if set to `true`).
  */
 template <typename vertex_t, typename edge_t, typename weight_t, bool multi_gpu>
-void sssp(raft::handle_t &handle,
+void sssp(raft::handle_t const &handle,
           graph_view_t<vertex_t, edge_t, weight_t, false, multi_gpu> const &graph_view,
           weight_t *distances,
           vertex_t *predecessors,

cpp/include/utilities/cython.hpp

@@ -213,6 +213,26 @@ void call_pagerank(raft::handle_t const& handle,
                    int64_t max_iter,
                    bool has_guess);
 
+// Wrapper for calling BFS through a graph container
+template <typename vertex_t, typename weight_t>
+void call_bfs(raft::handle_t const& handle,
+              graph_container_t const& graph_container,
+              vertex_t* identifiers,
+              vertex_t* distances,
+              vertex_t* predecessors,
+              double* sp_counters,
+              const vertex_t start_vertex,
+              bool directed);
+
+// Wrapper for calling SSSP through a graph container
+template <typename vertex_t, typename weight_t>
+void call_sssp(raft::handle_t const& handle,
+               graph_container_t const& graph_container,
+               vertex_t* identifiers,
+               weight_t* distances,
+               vertex_t* predecessors,
+               const vertex_t source_vertex);
+
 // Helper for setting up subcommunicators, typically called as part of the
 // user-initiated comms initialization in Python.
 //

cpp/src/experimental/bfs.cu

@@ -41,7 +41,7 @@ namespace experimental {
 namespace detail {
 
 template <typename GraphViewType, typename PredecessorIterator>
-void bfs(raft::handle_t &handle,
+void bfs(raft::handle_t const &handle,
          GraphViewType const &push_graph_view,
          typename GraphViewType::vertex_type *distances,
          PredecessorIterator predecessor_first,
@@ -164,7 +164,7 @@ void bfs(raft::handle_t &handle,
 }  // namespace detail
 
 template <typename vertex_t, typename edge_t, typename weight_t, bool multi_gpu>
-void bfs(raft::handle_t &handle,
+void bfs(raft::handle_t const &handle,
          graph_view_t<vertex_t, edge_t, weight_t, false, multi_gpu> const &graph_view,
          vertex_t *distances,
          vertex_t *predecessors,
@@ -196,7 +196,7 @@ void bfs(raft::handle_t &handle,
 
 // explicit instantiation
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int32_t, float, false, true> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -205,7 +205,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int32_t, double, false, true> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -214,7 +214,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int64_t, float, false, true> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -223,7 +223,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int64_t, double, false, true> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -232,7 +232,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int64_t, int64_t, float, false, true> const &graph_view,
                   int64_t *distances,
                   int64_t *predecessors,
@@ -241,7 +241,7 @@ template void bfs(raft::handle_t &handle,
                   int64_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int64_t, int64_t, double, false, true> const &graph_view,
                   int64_t *distances,
                   int64_t *predecessors,
@@ -250,7 +250,7 @@ template void bfs(raft::handle_t &handle,
                   int64_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int32_t, float, false, false> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -259,7 +259,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int32_t, double, false, false> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -268,7 +268,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int64_t, float, false, false> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -277,7 +277,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int32_t, int64_t, double, false, false> const &graph_view,
                   int32_t *distances,
                   int32_t *predecessors,
@@ -286,7 +286,7 @@ template void bfs(raft::handle_t &handle,
                   int32_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int64_t, int64_t, float, false, false> const &graph_view,
                   int64_t *distances,
                   int64_t *predecessors,
@@ -295,7 +295,7 @@ template void bfs(raft::handle_t &handle,
                   int64_t depth_limit,
                   bool do_expensive_check);
 
-template void bfs(raft::handle_t &handle,
+template void bfs(raft::handle_t const &handle,
                   graph_view_t<int64_t, int64_t, double, false, false> const &graph_view,
                   int64_t *distances,
                   int64_t *predecessors,

cpp/src/experimental/sssp.cu

@@ -42,7 +42,7 @@ namespace experimental {
 namespace detail {
 
 template <typename GraphViewType, typename PredecessorIterator>
-void sssp(raft::handle_t &handle,
+void sssp(raft::handle_t const &handle,
           GraphViewType const &push_graph_view,
           typename GraphViewType::weight_type *distances,
           PredecessorIterator predecessor_first,
@@ -241,7 +241,7 @@ void sssp(raft::handle_t &handle,
 }  // namespace detail
 
 template <typename vertex_t, typename edge_t, typename weight_t, bool multi_gpu>
-void sssp(raft::handle_t &handle,
+void sssp(raft::handle_t const &handle,
           graph_view_t<vertex_t, edge_t, weight_t, false, multi_gpu> const &graph_view,
           weight_t *distances,
           vertex_t *predecessors,
@@ -265,95 +265,95 @@ void sssp(raft::handle_t &handle,
 
 // explicit instantiation
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int32_t, float, false, true> const &graph_view,
                    float *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int32_t, double, false, true> const &graph_view,
                    double *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    double cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int64_t, float, false, true> const &graph_view,
                    float *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int64_t, double, false, true> const &graph_view,
                    double *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    double cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int64_t, int64_t, float, false, true> const &graph_view,
                    float *distances,
                    int64_t *predecessors,
                    int64_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int64_t, int64_t, double, false, true> const &graph_view,
                    double *distances,
                    int64_t *predecessors,
                    int64_t source_vertex,
                    double cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int32_t, float, false, false> const &graph_view,
                    float *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int32_t, double, false, false> const &graph_view,
                    double *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    double cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int64_t, float, false, false> const &graph_view,
                    float *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int32_t, int64_t, double, false, false> const &graph_view,
                    double *distances,
                    int32_t *predecessors,
                    int32_t source_vertex,
                    double cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int64_t, int64_t, float, false, false> const &graph_view,
                    float *distances,
                    int64_t *predecessors,
                    int64_t source_vertex,
                    float cutoff,
                    bool do_expensive_check);
 
-template void sssp(raft::handle_t &handle,
+template void sssp(raft::handle_t const &handle,
                    graph_view_t<int64_t, int64_t, double, false, false> const &graph_view,
                    double *distances,
                    int64_t *predecessors,