Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cuGraph code cleanup #2431

Merged
merged 15 commits into from
Jul 25, 2022
Merged

cuGraph code cleanup #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c39b618
delete eidir_graph.hpp
seunghwak Jul 19, 2022
f19cd41
move functions.hpp to legacy
seunghwak Jul 19, 2022
ca7cf7f
move functions.hpp to legacy
seunghwak Jul 19, 2022
5cb9b47
remove unused code
seunghwak Jul 19, 2022
60f82e2
clang-format
seunghwak Jul 19, 2022
1098af6
move legacy code to the legacy directories
seunghwak Jul 19, 2022
13601f8
delete unused permute_graph.cuh
seunghwak Jul 19, 2022
6ad0dcc
clang-format
seunghwak Jul 19, 2022
934725d
copyright
seunghwak Jul 19, 2022
6d54948
fix build error
seunghwak Jul 20, 2022
824f790
Merge branch 'branch-22.08' of github.com:rapidsai/cugraph into enh_c…
seunghwak Jul 20, 2022
14c57c1
undelete the comms_bcast (this is used by python)
seunghwak Jul 21, 2022
3db4190
Merge branch 'branch-22.08' of github.com:rapidsai/cugraph into enh_c…
seunghwak Jul 21, 2022
367285c
adjust include paths
seunghwak Jul 21, 2022
1860582
copyright year
seunghwak Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,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
Expand All @@ -203,7 +203,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
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cugraph/algorithms.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
45 changes: 0 additions & 45 deletions cpp/include/cugraph/eidir_graph.hpp
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion cpp/include/cugraph/functions.hpp → cpp/include/cugraph/legacy/functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion cpp/include/cugraph/internals.hpp → cpp/include/cugraph/legacy/internals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion cpp/src/community/legacy/ecg.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions cpp/src/community/legacy/louvain.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion cpp/src/community/legacy/louvain.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 cpp/src/components/connectivity.cu → cpp/src/components/legacy/connectivity.cu
View file
Open in desktop
File renamed without changes.
0 cpp/src/components/scc_matrix.cuh → cpp/src/components/legacy/scc_matrix.cuh
View file
Open in desktop
File renamed without changes.
0 cpp/src/components/utils.h → cpp/src/components/legacy/utils.h
View file
Open in desktop
File renamed without changes.
0 cpp/src/components/weak_cc.cuh → cpp/src/components/legacy/weak_cc.cuh
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions cpp/src/converters/COOtoCSR.cu → cpp/src/converters/legacy/COOtoCSR.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -15,7 +15,6 @@
*/

#include "COOtoCSR.cuh"
#include <cugraph/functions.hpp>

namespace cugraph {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/converters/COOtoCSR.cuh → cpp/src/converters/legacy/COOtoCSR.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
96 changes: 0 additions & 96 deletions cpp/src/converters/permute_graph.cuh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cpp/src/layout/barnes_hut.cuh → cpp/src/layout/legacy/barnes_hut.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/layout/bh_kernels.cuh → cpp/src/layout/legacy/bh_kernels.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/layout/exact_fa2.cuh → cpp/src/layout/legacy/exact_fa2.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 cpp/src/layout/exact_repulsion.cuh → cpp/src/layout/legacy/exact_repulsion.cuh
View file
Open in desktop
File renamed without changes.
0 cpp/src/layout/fa2_kernels.cuh → cpp/src/layout/legacy/fa2_kernels.cuh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/layout/force_atlas2.cu → cpp/src/layout/legacy/force_atlas2.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
0 cpp/src/layout/utils.hpp → cpp/src/layout/legacy/utils.hpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions cpp/tests/components/con_comp_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions cpp/tests/components/scc_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/tree/mst_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/utilities/matrix_market_file_utilities.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/utilities/test_graphs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph/cugraph/internals/callbacks_implems.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -17,7 +17,7 @@
#pragma once

#include <Python.h>
#include <cugraph/internals.hpp>
#include <cugraph/legacy/internals.hpp>

#include <iostream>

Expand Down
4 changes: 2 additions & 2 deletions python/cugraph/cugraph/layout/force_atlas2.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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":
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph/cugraph/layout/force_atlas2_wrapper.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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


Expand Down
Loading