cuGraph code cleanup (rapidsai#2431)

Moved files to the legacy directory and delete unused code. Breaking because legacy public headers are deleted/moved/modified. Authors: - Seunghwa Kang (https://github.com/seunghwak) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Brad Rees (https://github.com/BradReesWork) URL: rapidsai#2431
oorliu · Jul 25, 2022 · d6b4cc5 · d6b4cc5
1 parent efc05b3
commit d6b4cc5
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 175 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -183,8 +183,8 @@ set(CUGRAPH_SOURCES
     src/traversal/legacy/bfs.cu
     src/link_prediction/jaccard.cu
     src/link_prediction/overlap.cu
-    src/layout/force_atlas2.cu
-    src/converters/COOtoCSR.cu
+    src/layout/legacy/force_atlas2.cu
+    src/converters/legacy/COOtoCSR.cu
     src/community/legacy/spectral_clustering.cu
     src/community/louvain_sg.cu
     src/community/louvain_mg.cu
@@ -206,7 +206,7 @@ set(CUGRAPH_SOURCES
     src/cores/core_number_sg.cu
     src/cores/core_number_mg.cu
     src/traversal/two_hop_neighbors.cu
-    src/components/connectivity.cu
+    src/components/legacy/connectivity.cu
     src/centrality/betweenness_centrality.cu
     src/generators/generate_rmat_edgelist.cu
     src/generators/generator_tools.cu

diff --git a/cpp/include/cugraph/algorithms.hpp b/cpp/include/cugraph/algorithms.hpp
@@ -21,8 +21,8 @@
 #include <cugraph/graph.hpp>
 #include <cugraph/graph_view.hpp>
 
-#include <cugraph/internals.hpp>
 #include <cugraph/legacy/graph.hpp>
+#include <cugraph/legacy/internals.hpp>
 
 #ifndef NO_CUGRAPH_OPS
 #include <cugraph-ops/graph/sampling.hpp>

diff --git a/cpp/include/cugraph/eidir_graph.hpp b/cpp/include/cugraph/eidir_graph.hpp
diff --git a/cpp/include/cugraph/functions.hpp → cpp/include/cugraph/legacy/functions.hpp b/cpp/include/cugraph/functions.hpp → cpp/include/cugraph/legacy/functions.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,4 +64,5 @@ void comms_bcast(const raft::handle_t& handle, value_t* value, size_t count)
 {
   handle.get_comms().bcast(value, count, 0, handle.get_stream());
 }
+
 }  // namespace cugraph
diff --git a/cpp/include/cugraph/internals.hpp → cpp/include/cugraph/legacy/internals.hpp b/cpp/include/cugraph/internals.hpp → cpp/include/cugraph/legacy/internals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, 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/community/legacy/ecg.cu b/cpp/src/community/legacy/ecg.cu
@@ -15,7 +15,6 @@
  */
 
 #include <community/legacy/louvain.cuh>
-#include <converters/permute_graph.cuh>
 #include <cugraph/algorithms.hpp>
 #include <cugraph/utilities/error.hpp>
 #include <utilities/graph_utils.cuh>

diff --git a/cpp/src/community/legacy/louvain.cu b/cpp/src/community/legacy/louvain.cu
@@ -122,5 +122,3 @@ template std::pair<size_t, double> louvain(raft::handle_t const&,
                                            size_t,
                                            double);
 }  // namespace cugraph
-
-#include <cugraph/legacy/eidir_graph.hpp>
diff --git a/cpp/src/community/legacy/louvain.cuh b/cpp/src/community/legacy/louvain.cuh
@@ -17,7 +17,7 @@
 
 #include <cugraph/legacy/graph.hpp>
 
-#include <converters/COOtoCSR.cuh>
+#include <converters/legacy/COOtoCSR.cuh>
 #include <utilities/graph_utils.cuh>
 
 #include <cugraph/dendrogram.hpp>

diff --git a/cpp/src/components/connectivity.cu → cpp/src/components/legacy/connectivity.cu b/cpp/src/components/connectivity.cu → cpp/src/components/legacy/connectivity.cu
diff --git a/cpp/src/components/scc_matrix.cuh → cpp/src/components/legacy/scc_matrix.cuh b/cpp/src/components/scc_matrix.cuh → cpp/src/components/legacy/scc_matrix.cuh
diff --git a/cpp/src/components/utils.h → cpp/src/components/legacy/utils.h b/cpp/src/components/utils.h → cpp/src/components/legacy/utils.h
diff --git a/cpp/src/components/weak_cc.cuh → cpp/src/components/legacy/weak_cc.cuh b/cpp/src/components/weak_cc.cuh → cpp/src/components/legacy/weak_cc.cuh
diff --git a/cpp/src/converters/COOtoCSR.cu → cpp/src/converters/legacy/COOtoCSR.cu b/cpp/src/converters/COOtoCSR.cu → cpp/src/converters/legacy/COOtoCSR.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 
 #include "COOtoCSR.cuh"
-#include <cugraph/functions.hpp>
 
 namespace cugraph {
 

diff --git a/cpp/src/converters/COOtoCSR.cuh → cpp/src/converters/legacy/COOtoCSR.cuh b/cpp/src/converters/COOtoCSR.cuh → cpp/src/converters/legacy/COOtoCSR.cuh
@@ -41,7 +41,7 @@
 #include <cub/device/device_radix_sort.cuh>
 #include <cub/device/device_run_length_encode.cuh>
 
-#include <cugraph/functions.hpp>
+#include <cugraph/legacy/functions.hpp>
 
 #include <cugraph/legacy/graph.hpp>
 

diff --git a/cpp/src/converters/permute_graph.cuh b/cpp/src/converters/permute_graph.cuh
diff --git a/cpp/src/layout/barnes_hut.cuh → cpp/src/layout/legacy/barnes_hut.cuh b/cpp/src/layout/barnes_hut.cuh → cpp/src/layout/legacy/barnes_hut.cuh
@@ -20,12 +20,12 @@
 #include "fa2_kernels.cuh"
 #include "utils.hpp"
 
-#include <converters/COOtoCSR.cuh>
+#include <converters/legacy/COOtoCSR.cuh>
 #include <utilities/graph_utils.cuh>
 
 #include <cugraph/detail/utility_wrappers.hpp>
-#include <cugraph/internals.hpp>
 #include <cugraph/legacy/graph.hpp>
+#include <cugraph/legacy/internals.hpp>
 #include <cugraph/utilities/error.hpp>
 
 #include <rmm/device_uvector.hpp>

diff --git a/cpp/src/layout/bh_kernels.cuh → cpp/src/layout/legacy/bh_kernels.cuh b/cpp/src/layout/bh_kernels.cuh → cpp/src/layout/legacy/bh_kernels.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, 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/layout/exact_fa2.cuh → cpp/src/layout/legacy/exact_fa2.cuh b/cpp/src/layout/exact_fa2.cuh → cpp/src/layout/legacy/exact_fa2.cuh
@@ -19,11 +19,11 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <converters/COOtoCSR.cuh>
+#include <converters/legacy/COOtoCSR.cuh>
 
 #include <cugraph/detail/utility_wrappers.hpp>
-#include <cugraph/internals.hpp>
 #include <cugraph/legacy/graph.hpp>
+#include <cugraph/legacy/internals.hpp>
 #include <cugraph/utilities/error.hpp>
 
 #include <thrust/fill.h>

diff --git a/cpp/src/layout/exact_repulsion.cuh → cpp/src/layout/legacy/exact_repulsion.cuh b/cpp/src/layout/exact_repulsion.cuh → cpp/src/layout/legacy/exact_repulsion.cuh
diff --git a/cpp/src/layout/fa2_kernels.cuh → cpp/src/layout/legacy/fa2_kernels.cuh b/cpp/src/layout/fa2_kernels.cuh → cpp/src/layout/legacy/fa2_kernels.cuh
diff --git a/cpp/src/layout/force_atlas2.cu → cpp/src/layout/legacy/force_atlas2.cu b/cpp/src/layout/force_atlas2.cu → cpp/src/layout/legacy/force_atlas2.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, 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/layout/utils.hpp → cpp/src/layout/legacy/utils.hpp b/cpp/src/layout/utils.hpp → cpp/src/layout/legacy/utils.hpp
diff --git a/cpp/tests/components/con_comp_test.cu b/cpp/tests/components/con_comp_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.  All rights reserved.
  *
  * NVIDIA CORPORATION and its licensors retain all intellectual property
  * and proprietary rights in and to this software, related documentation
@@ -20,7 +20,7 @@
 
 #include <rmm/device_vector.hpp>
 
-#include <converters/COOtoCSR.cuh>
+#include <converters/legacy/COOtoCSR.cuh>
 #include <cugraph/algorithms.hpp>
 #include <cugraph/legacy/graph.hpp>
 

diff --git a/cpp/tests/components/scc_test.cu b/cpp/tests/components/scc_test.cu
@@ -18,8 +18,8 @@
 
 #include <rmm/device_vector.hpp>
 
-#include <components/scc_matrix.cuh>
-#include <converters/COOtoCSR.cuh>
+#include <components/legacy/scc_matrix.cuh>
+#include <converters/legacy/COOtoCSR.cuh>
 #include <cugraph/algorithms.hpp>
 #include <cugraph/legacy/graph.hpp>
 #include <rmm/device_vector.hpp>

diff --git a/cpp/tests/tree/mst_test.cu b/cpp/tests/tree/mst_test.cu
@@ -31,7 +31,7 @@
 
 #include <cmath>
 
-#include "../src/converters/COOtoCSR.cuh"
+#include "../src/converters/legacy/COOtoCSR.cuh"
 #include <thrust/device_ptr.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/reduce.h>

diff --git a/cpp/tests/utilities/matrix_market_file_utilities.cu b/cpp/tests/utilities/matrix_market_file_utilities.cu
@@ -17,8 +17,8 @@
 #include <detail/graph_utils.cuh>
 #include <utilities/test_utilities.hpp>
 
-#include <cugraph/functions.hpp>
 #include <cugraph/graph_functions.hpp>
+#include <cugraph/legacy/functions.hpp>
 #include <cugraph/partition_manager.hpp>
 #include <cugraph/utilities/error.hpp>
 

diff --git a/cpp/tests/utilities/test_graphs.hpp b/cpp/tests/utilities/test_graphs.hpp
@@ -17,9 +17,9 @@
 
 #include <cugraph/detail/shuffle_wrappers.hpp>
 #include <cugraph/detail/utility_wrappers.hpp>
-#include <cugraph/functions.hpp>  // legacy coo_to_csr
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/graph_generators.hpp>
+#include <cugraph/legacy/functions.hpp>  // legacy coo_to_csr
 
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>

diff --git a/python/cugraph/cugraph/internals/callbacks_implems.hpp b/python/cugraph/cugraph/internals/callbacks_implems.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <Python.h>
-#include <cugraph/internals.hpp>
+#include <cugraph/legacy/internals.hpp>
 
 #include <iostream>
 

diff --git a/python/cugraph/cugraph/layout/force_atlas2.pxd b/python/cugraph/cugraph/layout/force_atlas2.pxd
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021, NVIDIA CORPORATION.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -19,7 +19,7 @@
 from cugraph.structure.graph_primtypes cimport *
 from libcpp cimport bool
 
-cdef extern from "cugraph/internals.hpp" namespace "cugraph::internals":
+cdef extern from "cugraph/legacy/internals.hpp" namespace "cugraph::internals":
     cdef cppclass GraphBasedDimRedCallback
 
 cdef extern from "cugraph/algorithms.hpp" namespace "cugraph":

diff --git a/python/cugraph/cugraph/layout/force_atlas2_wrapper.pyx b/python/cugraph/cugraph/layout/force_atlas2_wrapper.pyx
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021, NVIDIA CORPORATION.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -25,7 +25,7 @@ import cudf
 from numba import cuda
 import numpy as np
 
-cdef extern from "cugraph/internals.hpp" namespace "cugraph::internals":
+cdef extern from "cugraph/legacy/internals.hpp" namespace "cugraph::internals":
     cdef cppclass GraphBasedDimRedCallback