Move experimental source files and a few implementation headers (#1763)

Last phase of migrating things out of the experimental namespace. This PR moves all of the source and test files out of the experimental directory and renames the tests. Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Seunghwa Kang (https://github.com/seunghwak) URL: #1763
rapidsai · Aug 6, 2021 · 70b4ad3 · 70b4ad3
1 parent 009b53b
commit 70b4ad3
Show file tree

Hide file tree

Showing 33 changed files with 29 additions and 29 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -186,17 +186,17 @@ add_library(cugraph SHARED
     src/generators/generator_tools.cu
     src/generators/simple_generators.cu
     src/generators/erdos_renyi_generator.cu
-    src/experimental/graph.cu
-    src/experimental/graph_view.cu
-    src/experimental/coarsen_graph.cu
-    src/experimental/renumber_edgelist.cu
-    src/experimental/renumber_utils.cu
-    src/experimental/relabel.cu
-    src/experimental/induced_subgraph.cu
-    src/experimental/bfs.cu
-    src/experimental/sssp.cu
-    src/experimental/pagerank.cu
-    src/experimental/katz_centrality.cu
+    src/structure/graph.cu
+    src/structure/graph_view.cu
+    src/structure/coarsen_graph.cu
+    src/structure/renumber_edgelist.cu
+    src/structure/renumber_utils.cu
+    src/structure/relabel.cu
+    src/structure/induced_subgraph.cu
+    src/traversal/bfs.cu
+    src/traversal/sssp.cu
+    src/link_analysis/pagerank.cu
+    src/centrality/katz_centrality.cu
     src/serialization/serializer.cu
     src/tree/mst.cu
     src/components/weakly_connected_components.cu

diff --git a/cpp/src/experimental/katz_centrality.cu → cpp/src/centrality/katz_centrality.cu b/cpp/src/experimental/katz_centrality.cu → cpp/src/centrality/katz_centrality.cu
diff --git a/cpp/src/community/louvain.cu b/cpp/src/community/louvain.cu
@@ -16,8 +16,8 @@
 
 #include <community/flatten_dendrogram.cuh>
 #include <community/legacy/louvain.cuh>
+#include <community/louvain.cuh>
 #include <cugraph/graph.hpp>
-#include <experimental/louvain.cuh>
 
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/src/experimental/louvain.cuh → cpp/src/community/louvain.cuh b/cpp/src/experimental/louvain.cuh → cpp/src/community/louvain.cuh
diff --git a/cpp/src/generators/generator_tools.cu b/cpp/src/generators/generator_tools.cu
@@ -16,7 +16,7 @@
 
 #include <cugraph/graph_generators.hpp>
 #include <cugraph/utilities/error.hpp>
-#include <experimental/scramble.cuh>
+#include <generators/scramble.cuh>
 
 #include <raft/cuda_utils.cuh>
 

diff --git a/cpp/src/experimental/scramble.cuh → cpp/src/generators/scramble.cuh b/cpp/src/experimental/scramble.cuh → cpp/src/generators/scramble.cuh
diff --git a/cpp/src/experimental/pagerank.cu → cpp/src/link_analysis/pagerank.cu b/cpp/src/experimental/pagerank.cu → cpp/src/link_analysis/pagerank.cu
diff --git a/cpp/src/experimental/coarsen_graph.cu → cpp/src/structure/coarsen_graph.cu b/cpp/src/experimental/coarsen_graph.cu → cpp/src/structure/coarsen_graph.cu
diff --git a/cpp/src/experimental/graph.cu → cpp/src/structure/graph.cu b/cpp/src/experimental/graph.cu → cpp/src/structure/graph.cu
diff --git a/cpp/src/experimental/graph_view.cu → cpp/src/structure/graph_view.cu b/cpp/src/experimental/graph_view.cu → cpp/src/structure/graph_view.cu
diff --git a/cpp/src/experimental/induced_subgraph.cu → cpp/src/structure/induced_subgraph.cu b/cpp/src/experimental/induced_subgraph.cu → cpp/src/structure/induced_subgraph.cu
diff --git a/cpp/src/experimental/relabel.cu → cpp/src/structure/relabel.cu b/cpp/src/experimental/relabel.cu → cpp/src/structure/relabel.cu
diff --git a/cpp/src/experimental/renumber_edgelist.cu → cpp/src/structure/renumber_edgelist.cu b/cpp/src/experimental/renumber_edgelist.cu → cpp/src/structure/renumber_edgelist.cu
diff --git a/cpp/src/experimental/renumber_utils.cu → cpp/src/structure/renumber_utils.cu b/cpp/src/experimental/renumber_utils.cu → cpp/src/structure/renumber_utils.cu
diff --git a/cpp/src/experimental/bfs.cu → cpp/src/traversal/bfs.cu b/cpp/src/experimental/bfs.cu → cpp/src/traversal/bfs.cu
diff --git a/cpp/src/experimental/sssp.cu → cpp/src/traversal/sssp.cu b/cpp/src/experimental/sssp.cu → cpp/src/traversal/sssp.cu
diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -327,51 +327,51 @@ ConfigureTest(MST_TEST tree/mst_test.cu)
 
 ###################################################################################################
 # - Experimental stream tests -----------------------------------------------------
-ConfigureTest(EXPERIMENTAL_STREAM experimental/streams.cu)
+ConfigureTest(STREAM_TEST structure/streams.cu)
 
 ###################################################################################################
 # - Experimental R-mat graph generation tests -----------------------------------------------------
-ConfigureTest(EXPERIMENTAL_GENERATE_RMAT_TEST experimental/generate_rmat_test.cpp)
+ConfigureTest(GENERATE_RMAT_TEST generators/generate_rmat_test.cpp)
 
 ###################################################################################################
 # - Experimental Graph tests ----------------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_GRAPH_TEST experimental/graph_test.cpp)
+ConfigureTest(GRAPH_TEST structure/graph_test.cpp)
 
 ###################################################################################################
 # - Experimental weight-sum tests -----------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_WEIGHT_SUM_TEST experimental/weight_sum_test.cpp)
+ConfigureTest(WEIGHT_SUM_TEST structure/weight_sum_test.cpp)
 
 ###################################################################################################
 # - Experimental degree tests ---------------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_DEGREE_TEST experimental/degree_test.cpp)
+ConfigureTest(DEGREE_TEST structure/degree_test.cpp)
 
 ###################################################################################################
 # - Experimental coarsening tests -----------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_COARSEN_GRAPH_TEST experimental/coarsen_graph_test.cpp)
+ConfigureTest(COARSEN_GRAPH_TEST structure/coarsen_graph_test.cpp)
 
 ###################################################################################################
 # - Experimental induced subgraph tests -----------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_INDUCED_SUBGRAPH_TEST experimental/induced_subgraph_test.cpp)
+ConfigureTest(INDUCED_SUBGRAPH_TEST community/induced_subgraph_test.cpp)
 
 ###################################################################################################
 # - Experimental BFS tests ------------------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_BFS_TEST experimental/bfs_test.cpp)
+ConfigureTest(BFS_TEST traversal/bfs_test.cpp)
 
 ###################################################################################################
 # - Experimental Multi-source BFS tests -----------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_MSBFS_TEST experimental/ms_bfs_test.cpp)
+ConfigureTest(MSBFS_TEST traversal/ms_bfs_test.cpp)
 
 ###################################################################################################
 # - Experimental SSSP tests -----------------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_SSSP_TEST experimental/sssp_test.cpp)
+ConfigureTest(SSSP_TEST traversal/sssp_test.cpp)
 
 ###################################################################################################
 # - Experimental PAGERANK tests -------------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_PAGERANK_TEST experimental/pagerank_test.cpp)
+ConfigureTest(PAGERANK_TEST link_analysis/pagerank_test.cpp)
 
 ###################################################################################################
 # - Experimental KATZ_CENTRALITY tests ------------------------------------------------------------
-ConfigureTest(EXPERIMENTAL_KATZ_CENTRALITY_TEST experimental/katz_centrality_test.cpp)
+ConfigureTest(KATZ_CENTRALITY_TEST centrality/katz_centrality_test.cpp)
 
 ###################################################################################################
 # - WEAKLY CONNECTED COMPONENTS tests -------------------------------------------------------------
@@ -431,19 +431,19 @@ if(BUILD_CUGRAPH_MG_TESTS)
     if(MPI_CXX_FOUND)
         ###########################################################################################
         # - MG PAGERANK tests ---------------------------------------------------------------------
-        ConfigureTestMG(MG_PAGERANK_TEST pagerank/mg_pagerank_test.cpp)
+        ConfigureTestMG(MG_PAGERANK_TEST link_analysis/mg_pagerank_test.cpp)
 
         ###########################################################################################
         # - MG KATZ CENTRALITY tests --------------------------------------------------------------
-        ConfigureTestMG(MG_KATZ_CENTRALITY_TEST experimental/mg_katz_centrality_test.cpp)
+        ConfigureTestMG(MG_KATZ_CENTRALITY_TEST centrality/mg_katz_centrality_test.cpp)
 
         ###########################################################################################
         # - MG BFS tests --------------------------------------------------------------------------
-        ConfigureTestMG(MG_BFS_TEST experimental/mg_bfs_test.cpp)
+        ConfigureTestMG(MG_BFS_TEST traversal/mg_bfs_test.cpp)
 
         ###########################################################################################
         # - MG SSSP tests -------------------------------------------------------------------------
-        ConfigureTestMG(MG_SSSP_TEST experimental/mg_sssp_test.cpp)
+        ConfigureTestMG(MG_SSSP_TEST traversal/mg_sssp_test.cpp)
 
         ###########################################################################################
         # - MG LOUVAIN tests ----------------------------------------------------------------------

diff --git a/...sts/experimental/katz_centrality_test.cpp → ...tests/centrality/katz_centrality_test.cpp b/...sts/experimental/katz_centrality_test.cpp → ...tests/centrality/katz_centrality_test.cpp
diff --git a/.../experimental/mg_katz_centrality_test.cpp → ...ts/centrality/mg_katz_centrality_test.cpp b/.../experimental/mg_katz_centrality_test.cpp → ...ts/centrality/mg_katz_centrality_test.cpp
diff --git a/...ts/experimental/induced_subgraph_test.cpp → ...tests/community/induced_subgraph_test.cpp b/...ts/experimental/induced_subgraph_test.cpp → ...tests/community/induced_subgraph_test.cpp
diff --git a/...tests/experimental/generate_rmat_test.cpp → cpp/tests/generators/generate_rmat_test.cpp b/...tests/experimental/generate_rmat_test.cpp → cpp/tests/generators/generate_rmat_test.cpp
diff --git a/cpp/tests/pagerank/mg_pagerank_test.cpp → cpp/tests/link_analysis/mg_pagerank_test.cpp b/cpp/tests/pagerank/mg_pagerank_test.cpp → cpp/tests/link_analysis/mg_pagerank_test.cpp
diff --git a/cpp/tests/experimental/pagerank_test.cpp → cpp/tests/link_analysis/pagerank_test.cpp b/cpp/tests/experimental/pagerank_test.cpp → cpp/tests/link_analysis/pagerank_test.cpp
diff --git a/...tests/experimental/coarsen_graph_test.cpp → cpp/tests/structure/coarsen_graph_test.cpp b/...tests/experimental/coarsen_graph_test.cpp → cpp/tests/structure/coarsen_graph_test.cpp
diff --git a/cpp/tests/experimental/degree_test.cpp → cpp/tests/structure/degree_test.cpp b/cpp/tests/experimental/degree_test.cpp → cpp/tests/structure/degree_test.cpp
diff --git a/cpp/tests/experimental/graph_test.cpp → cpp/tests/structure/graph_test.cpp b/cpp/tests/experimental/graph_test.cpp → cpp/tests/structure/graph_test.cpp
diff --git a/cpp/tests/experimental/streams.cu → cpp/tests/structure/streams.cu b/cpp/tests/experimental/streams.cu → cpp/tests/structure/streams.cu
diff --git a/cpp/tests/experimental/weight_sum_test.cpp → cpp/tests/structure/weight_sum_test.cpp b/cpp/tests/experimental/weight_sum_test.cpp → cpp/tests/structure/weight_sum_test.cpp
diff --git a/cpp/tests/experimental/bfs_test.cpp → cpp/tests/traversal/bfs_test.cpp b/cpp/tests/experimental/bfs_test.cpp → cpp/tests/traversal/bfs_test.cpp
diff --git a/cpp/tests/experimental/mg_bfs_test.cpp → cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/experimental/mg_bfs_test.cpp → cpp/tests/traversal/mg_bfs_test.cpp
diff --git a/cpp/tests/experimental/mg_sssp_test.cpp → cpp/tests/traversal/mg_sssp_test.cpp b/cpp/tests/experimental/mg_sssp_test.cpp → cpp/tests/traversal/mg_sssp_test.cpp
diff --git a/cpp/tests/experimental/ms_bfs_test.cpp → cpp/tests/traversal/ms_bfs_test.cpp b/cpp/tests/experimental/ms_bfs_test.cpp → cpp/tests/traversal/ms_bfs_test.cpp
diff --git a/cpp/tests/experimental/sssp_test.cpp → cpp/tests/traversal/sssp_test.cpp b/cpp/tests/experimental/sssp_test.cpp → cpp/tests/traversal/sssp_test.cpp