Merge branch 'branch-21.10' of github.com:rapidsai/cugraph into fea_c…

…pp_benchmark
rapidsai · Aug 4, 2021 · 09fcdee · 09fcdee
2 parents 173e60e + f1dffc4
commit 09fcdee
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 21 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -162,29 +162,29 @@ add_library(cugraph SHARED
     src/utilities/cython.cu
     src/utilities/path_retrieval.cu
     src/utilities/graph_bcast.cu
-    src/structure/graph.cu
+    src/structure/legacy/graph.cu
     src/linear_assignment/hungarian.cu
     src/link_analysis/gunrock_hits.cpp
-    src/traversal/bfs.cu
-    src/traversal/sssp.cu
+    src/traversal/legacy/bfs.cu
+    src/traversal/legacy/sssp.cu
     src/traversal/tsp.cu
     src/link_prediction/jaccard.cu
     src/link_prediction/overlap.cu
     src/layout/force_atlas2.cu
     src/converters/COOtoCSR.cu
-    src/community/spectral_clustering.cu
+    src/community/legacy/spectral_clustering.cu
     src/community/louvain.cu
-    src/community/leiden.cu
-    src/community/ktruss.cu
-    src/community/ecg.cu
-    src/community/triangles_counting.cu
-    src/community/extract_subgraph_by_vertex.cu
-    src/community/egonet.cu
+    src/community/legacy/leiden.cu
+    src/community/legacy/ktruss.cu
+    src/community/legacy/ecg.cu
+    src/community/legacy/triangles_counting.cu
+    src/community/legacy/extract_subgraph_by_vertex.cu
+    src/community/legacy/egonet.cu
     src/sampling/random_walks.cu
     src/cores/core_number.cu
     src/traversal/two_hop_neighbors.cu
     src/components/connectivity.cu
-    src/centrality/katz_centrality.cu
+    src/centrality/legacy/katz_centrality.cu
     src/centrality/betweenness_centrality.cu
     src/generators/generate_rmat_edgelist.cu
     src/generators/generator_tools.cu

diff --git a/cpp/src/centrality/katz_centrality.cu → cpp/src/centrality/legacy/katz_centrality.cu b/cpp/src/centrality/katz_centrality.cu → cpp/src/centrality/legacy/katz_centrality.cu
diff --git a/cpp/src/community/ecg.cu → cpp/src/community/legacy/ecg.cu b/cpp/src/community/ecg.cu → cpp/src/community/legacy/ecg.cu
diff --git a/cpp/src/community/egonet.cu → cpp/src/community/legacy/egonet.cu b/cpp/src/community/egonet.cu → cpp/src/community/legacy/egonet.cu
diff --git a/...c/community/extract_subgraph_by_vertex.cu → ...nity/legacy/extract_subgraph_by_vertex.cu b/...c/community/extract_subgraph_by_vertex.cu → ...nity/legacy/extract_subgraph_by_vertex.cu
diff --git a/cpp/src/community/ktruss.cu → cpp/src/community/legacy/ktruss.cu b/cpp/src/community/ktruss.cu → cpp/src/community/legacy/ktruss.cu
diff --git a/cpp/src/community/leiden.cu → cpp/src/community/legacy/leiden.cu b/cpp/src/community/leiden.cu → cpp/src/community/legacy/leiden.cu
@@ -15,7 +15,7 @@
  */
 
 #include <community/flatten_dendrogram.cuh>
-#include <community/leiden.cuh>
+#include <community/legacy/leiden.cuh>
 
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/src/community/leiden.cuh → cpp/src/community/legacy/leiden.cuh b/cpp/src/community/leiden.cuh → cpp/src/community/legacy/leiden.cuh
diff --git a/cpp/src/community/spectral_clustering.cu → ...c/community/legacy/spectral_clustering.cu b/cpp/src/community/spectral_clustering.cu → ...c/community/legacy/spectral_clustering.cu
diff --git a/cpp/src/community/triangles_counting.cu → ...rc/community/legacy/triangles_counting.cu b/cpp/src/community/triangles_counting.cu → ...rc/community/legacy/triangles_counting.cu
diff --git a/cpp/src/community/louvain.cu b/cpp/src/community/louvain.cu
@@ -28,6 +28,22 @@ namespace cugraph {
 
 namespace detail {
 
+template <typename vertex_t, typename edge_t, typename weight_t, bool multi_gpu>
+void check_clustering(
+  experimental::graph_view_t<vertex_t, edge_t, weight_t, false, multi_gpu> const& graph_view,
+  vertex_t* clustering)
+{
+  if (graph_view.get_number_of_local_vertices() > 0)
+    CUGRAPH_EXPECTS(clustering != nullptr, "Invalid input argument: clustering is null");
+}
+
+template <typename vertex_t, typename edge_t, typename weight_t>
+void check_clustering(legacy::GraphCSRView<vertex_t, edge_t, weight_t> const& graph_view,
+                      vertex_t* clustering)
+{
+  CUGRAPH_EXPECTS(clustering != nullptr, "Invalid input argument: clustering is null");
+}
+
 template <typename vertex_t, typename edge_t, typename weight_t>
 std::pair<std::unique_ptr<Dendrogram<vertex_t>>, weight_t> louvain(
   raft::handle_t const& handle,
@@ -128,7 +144,7 @@ std::pair<size_t, typename graph_view_t::weight_type> louvain(
   using vertex_t = typename graph_view_t::vertex_type;
   using weight_t = typename graph_view_t::weight_type;
 
-  CUGRAPH_EXPECTS(clustering != nullptr, "Invalid input argument: clustering is null");
+  detail::check_clustering(graph_view, clustering);
 
   std::unique_ptr<Dendrogram<vertex_t>> dendrogram;
   weight_t modularity;

diff --git a/cpp/src/structure/graph.cu → cpp/src/structure/legacy/graph.cu b/cpp/src/structure/graph.cu → cpp/src/structure/legacy/graph.cu
diff --git a/cpp/src/traversal/bfs.cu → cpp/src/traversal/legacy/bfs.cu b/cpp/src/traversal/bfs.cu → cpp/src/traversal/legacy/bfs.cu
diff --git a/cpp/src/traversal/bfs.cuh → cpp/src/traversal/legacy/bfs.cuh b/cpp/src/traversal/bfs.cuh → cpp/src/traversal/legacy/bfs.cuh
diff --git a/cpp/src/traversal/bfs_kernels.cuh → cpp/src/traversal/legacy/bfs_kernels.cuh b/cpp/src/traversal/bfs_kernels.cuh → cpp/src/traversal/legacy/bfs_kernels.cuh
diff --git a/cpp/src/traversal/mg/bfs.cuh → cpp/src/traversal/legacy/mg/bfs.cuh b/cpp/src/traversal/mg/bfs.cuh → cpp/src/traversal/legacy/mg/bfs.cuh
diff --git a/cpp/src/traversal/mg/common_utils.cuh → cpp/src/traversal/legacy/mg/common_utils.cuh b/cpp/src/traversal/mg/common_utils.cuh → cpp/src/traversal/legacy/mg/common_utils.cuh
diff --git a/cpp/src/traversal/mg/frontier_expand.cuh → ...c/traversal/legacy/mg/frontier_expand.cuh b/cpp/src/traversal/mg/frontier_expand.cuh → ...c/traversal/legacy/mg/frontier_expand.cuh
diff --git a/.../traversal/mg/frontier_expand_kernels.cuh → ...sal/legacy/mg/frontier_expand_kernels.cuh b/.../traversal/mg/frontier_expand_kernels.cuh → ...sal/legacy/mg/frontier_expand_kernels.cuh
diff --git a/cpp/src/traversal/mg/vertex_binning.cuh → ...rc/traversal/legacy/mg/vertex_binning.cuh b/cpp/src/traversal/mg/vertex_binning.cuh → ...rc/traversal/legacy/mg/vertex_binning.cuh
diff --git a/...c/traversal/mg/vertex_binning_kernels.cuh → ...rsal/legacy/mg/vertex_binning_kernels.cuh b/...c/traversal/mg/vertex_binning_kernels.cuh → ...rsal/legacy/mg/vertex_binning_kernels.cuh
diff --git a/cpp/src/traversal/sssp.cu → cpp/src/traversal/legacy/sssp.cu b/cpp/src/traversal/sssp.cu → cpp/src/traversal/legacy/sssp.cu
diff --git a/cpp/src/traversal/sssp.cuh → cpp/src/traversal/legacy/sssp.cuh b/cpp/src/traversal/sssp.cuh → cpp/src/traversal/legacy/sssp.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2021, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cpp/src/traversal/sssp_kernels.cuh → cpp/src/traversal/legacy/sssp_kernels.cuh b/cpp/src/traversal/sssp_kernels.cuh → cpp/src/traversal/legacy/sssp_kernels.cuh
diff --git a/cpp/src/traversal/traversal_common.cuh → ...src/traversal/legacy/traversal_common.cuh b/cpp/src/traversal/traversal_common.cuh → ...src/traversal/legacy/traversal_common.cuh
diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -258,20 +258,20 @@ set(ERDOS_RENYI_GENERATOR_TEST_SRC
 
 ###################################################################################################
 # - katz centrality tests -------------------------------------------------------------------------
-ConfigureTest(KATZ_TEST centrality/katz_centrality_test.cu)
+ConfigureTest(LEGACY_KATZ_TEST centrality/legacy/katz_centrality_test.cu)
 
 ###################################################################################################
 # - betweenness centrality tests ------------------------------------------------------------------
-ConfigureTest(BETWEENNESS_TEST centrality/betweenness_centrality_test.cu)
-ConfigureTest(EDGE_BETWEENNESS_TEST centrality/edge_betweenness_centrality_test.cu)
+ConfigureTest(LEGACY_BETWEENNESS_TEST centrality/legacy/betweenness_centrality_test.cu)
+ConfigureTest(LEGACY_EDGE_BETWEENNESS_TEST centrality/legacy/edge_betweenness_centrality_test.cu)
 
 ###################################################################################################
 # - SSSP tests ------------------------------------------------------------------------------------
-ConfigureTest(SSSP_TEST traversal/sssp_test.cu)
+ConfigureTest(LEGACY_SSSP_TEST traversal/legacy/sssp_test.cu)
 
 ###################################################################################################
 # - BFS tests -------------------------------------------------------------------------------------
-ConfigureTest(BFS_TEST traversal/bfs_test.cu)
+ConfigureTest(LEGACY_BFS_TEST traversal/legacy/bfs_test.cu)
 
 ###################################################################################################
 # - LOUVAIN tests ---------------------------------------------------------------------------------

diff --git a/...centrality/betweenness_centrality_test.cu → ...ity/legacy/betweenness_centrality_test.cu b/...centrality/betweenness_centrality_test.cu → ...ity/legacy/betweenness_centrality_test.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <traversal/bfs_ref.h>
+#include <traversal/legacy/bfs_ref.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/test_utilities.hpp>
 

diff --git a/...ality/edge_betweenness_centrality_test.cu → ...egacy/edge_betweenness_centrality_test.cu b/...ality/edge_betweenness_centrality_test.cu → ...egacy/edge_betweenness_centrality_test.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <traversal/bfs_ref.h>
+#include <traversal/legacy/bfs_ref.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/test_utilities.hpp>
 

diff --git a/cpp/tests/centrality/katz_centrality_test.cu → ...centrality/legacy/katz_centrality_test.cu b/cpp/tests/centrality/katz_centrality_test.cu → ...centrality/legacy/katz_centrality_test.cu
diff --git a/cpp/tests/traversal/bfs_ref.h → cpp/tests/traversal/legacy/bfs_ref.h b/cpp/tests/traversal/bfs_ref.h → cpp/tests/traversal/legacy/bfs_ref.h
diff --git a/cpp/tests/traversal/bfs_test.cu → cpp/tests/traversal/legacy/bfs_test.cu b/cpp/tests/traversal/bfs_test.cu → cpp/tests/traversal/legacy/bfs_test.cu
diff --git a/cpp/tests/traversal/sssp_test.cu → cpp/tests/traversal/legacy/sssp_test.cu b/cpp/tests/traversal/sssp_test.cu → cpp/tests/traversal/legacy/sssp_test.cu