From ea528bcf3c5b3fb4211a6987ba94a26266f7e0c8 Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Thu, 9 Dec 2021 12:33:14 -0500 Subject: [PATCH 1/5] Update .clang-format --- cpp/.clang-format | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cpp/.clang-format b/cpp/.clang-format index 0c05436e922..6019a6f3d5c 100644 --- a/cpp/.clang-format +++ b/cpp/.clang-format @@ -72,15 +72,6 @@ ForEachMacros: - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: - - Regex: '^' - Priority: 2 - - Regex: '^<.*\.h>' - Priority: 1 - - Regex: '^<.*' - Priority: 2 - - Regex: '.*' - Priority: 3 IncludeIsMainRegex: '([-_](test|unittest))?$' IndentCaseLabels: true IndentPPDirectives: None From dd8c7b426041fc98082074911150b42639417c6d Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Thu, 9 Dec 2021 12:33:45 -0500 Subject: [PATCH 2/5] Clang-format changes --- cpp/include/cugraph/detail/graph_utils.cuh | 2 +- cpp/include/cugraph/legacy/graph.hpp | 2 +- .../prims/copy_v_transform_reduce_in_out_nbr.cuh | 2 +- cpp/include/cugraph/prims/property_op_utils.cuh | 2 +- .../prims/update_frontier_v_push_if_out_nbr.cuh | 2 +- cpp/include/cugraph/utilities/thrust_tuple_utils.cuh | 2 +- cpp/include/cugraph/visitors/cascaded_dispatch.hpp | 2 +- cpp/include/cugraph/visitors/graph_enum_mapping.hpp | 2 +- cpp/src/c_api/cugraph_api.cpp | 2 +- cpp/src/c_api/error.cpp | 2 +- cpp/src/c_api/graph.hpp | 2 +- cpp/src/c_api/graph_sg.cpp | 2 +- cpp/src/centrality/betweenness_centrality.cu | 2 +- cpp/src/community/legacy/ecg.cu | 2 +- cpp/src/community/legacy/egonet.cu | 2 +- cpp/src/community/legacy/ktruss.cu | 2 +- cpp/src/community/legacy/spectral_clustering.cu | 2 +- cpp/src/community/legacy/triangles_counting.cu | 2 +- cpp/src/components/utils.h | 2 +- cpp/src/components/weak_cc.cuh | 2 +- cpp/src/converters/COOtoCSR.cu | 2 +- cpp/src/converters/COOtoCSR.cuh | 2 +- cpp/src/converters/permute_graph.cuh | 2 +- cpp/src/detail/utility_wrappers.cu | 2 +- cpp/src/sampling/random_walks.cu | 2 +- cpp/src/traversal/legacy/bfs.cu | 6 +++--- cpp/src/traversal/legacy/bfs_kernels.cuh | 4 ++-- cpp/src/traversal/legacy/mg/bfs.cuh | 4 ++-- cpp/src/traversal/legacy/mg/common_utils.cuh | 4 ++-- cpp/src/traversal/legacy/mg/frontier_expand.cuh | 4 ++-- .../traversal/legacy/mg/frontier_expand_kernels.cuh | 2 +- cpp/src/traversal/legacy/mg/vertex_binning.cuh | 2 +- cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh | 2 +- cpp/src/traversal/legacy/sssp_kernels.cuh | 2 +- cpp/src/traversal/two_hop_neighbors.cu | 2 +- cpp/src/tree/mst.cu | 2 +- cpp/src/utilities/spmv_1D.cu | 2 +- cpp/tests/bcast/mg_graph_bcast.cpp | 2 +- cpp/tests/centrality/katz_centrality_test.cpp | 2 +- cpp/tests/centrality/legacy/katz_centrality_test.cu | 2 +- cpp/tests/centrality/mg_katz_centrality_test.cpp | 2 +- cpp/tests/community/egonet_test.cu | 2 +- cpp/tests/community/mg_louvain_test.cpp | 2 +- cpp/tests/components/con_comp_test.cu | 2 +- .../components/mg_weakly_connected_components_test.cpp | 2 +- cpp/tests/components/scc_test.cu | 2 +- .../components/weakly_connected_components_test.cpp | 2 +- cpp/tests/cores/core_number_test.cpp | 2 +- cpp/tests/cores/mg_core_number_test.cpp | 2 +- cpp/tests/layout/force_atlas2_test.cu | 4 ++-- cpp/tests/link_analysis/hits_test.cpp | 10 +++++----- cpp/tests/link_analysis/mg_hits_test.cpp | 2 +- cpp/tests/link_analysis/mg_pagerank_test.cpp | 2 +- cpp/tests/link_analysis/pagerank_test.cpp | 2 +- .../prims/mg_copy_v_transform_reduce_inout_nbr.cu | 6 +++--- cpp/tests/prims/mg_count_if_e.cu | 4 ++-- cpp/tests/prims/mg_count_if_v.cu | 4 ++-- cpp/tests/prims/mg_extract_if_e.cu | 6 +++--- cpp/tests/prims/mg_reduce_v.cu | 4 ++-- cpp/tests/prims/mg_transform_reduce_e.cu | 4 ++-- cpp/tests/prims/mg_transform_reduce_v.cu | 4 ++-- cpp/tests/sampling/random_walks_test.cu | 2 +- cpp/tests/sampling/rw_low_level_test.cu | 4 ++-- cpp/tests/serialization/un_serialize_test.cpp | 2 +- cpp/tests/structure/coarsen_graph_test.cpp | 2 +- .../count_self_loops_and_multi_edges_test.cpp | 2 +- .../mg_count_self_loops_and_multi_edges_test.cpp | 2 +- cpp/tests/structure/mg_symmetrize_test.cpp | 2 +- cpp/tests/structure/mg_transpose_storage_test.cpp | 2 +- cpp/tests/structure/mg_transpose_test.cpp | 2 +- cpp/tests/structure/renumbering_test.cpp | 2 +- cpp/tests/structure/streams.cu | 4 ++-- cpp/tests/structure/symmetrize_test.cpp | 2 +- cpp/tests/structure/transpose_storage_test.cpp | 2 +- cpp/tests/structure/transpose_test.cpp | 2 +- cpp/tests/traversal/bfs_test.cpp | 2 +- cpp/tests/traversal/extract_bfs_paths_test.cu | 2 +- cpp/tests/traversal/legacy/sssp_test.cu | 2 +- cpp/tests/traversal/mg_bfs_test.cpp | 2 +- cpp/tests/traversal/mg_extract_bfs_paths_test.cu | 2 +- cpp/tests/traversal/mg_sssp_test.cpp | 2 +- cpp/tests/traversal/sssp_test.cpp | 2 +- cpp/tests/tree/mst_test.cu | 4 ++-- cpp/tests/utilities/high_res_clock.h | 2 +- cpp/tests/utilities/test_utilities.hpp | 4 ++-- 85 files changed, 109 insertions(+), 109 deletions(-) mode change 100755 => 100644 cpp/include/cugraph/visitors/cascaded_dispatch.hpp mode change 100755 => 100644 cpp/include/cugraph/visitors/graph_enum_mapping.hpp diff --git a/cpp/include/cugraph/detail/graph_utils.cuh b/cpp/include/cugraph/detail/graph_utils.cuh index d9ca3dbe03e..2d9ee2b2547 100644 --- a/cpp/include/cugraph/detail/graph_utils.cuh +++ b/cpp/include/cugraph/detail/graph_utils.cuh @@ -24,10 +24,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/cpp/include/cugraph/legacy/graph.hpp b/cpp/include/cugraph/legacy/graph.hpp index 4345fd225c1..62f192fa5f3 100644 --- a/cpp/include/cugraph/legacy/graph.hpp +++ b/cpp/include/cugraph/legacy/graph.hpp @@ -14,13 +14,13 @@ * limitations under the License. */ #pragma once -#include #include #include #include #include #include #include +#include namespace cugraph { namespace legacy { diff --git a/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh b/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh index a25b8e2ecde..6251c269697 100644 --- a/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh +++ b/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh @@ -28,12 +28,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/cpp/include/cugraph/prims/property_op_utils.cuh b/cpp/include/cugraph/prims/property_op_utils.cuh index 32ece7c166a..f6c8b4bee08 100644 --- a/cpp/include/cugraph/prims/property_op_utils.cuh +++ b/cpp/include/cugraph/prims/property_op_utils.cuh @@ -20,10 +20,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh b/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh index fe9d884499b..5fe7d6b1e8c 100644 --- a/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh +++ b/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh b/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh index eb1a095bc90..7321fe12f9b 100644 --- a/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh +++ b/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/cpp/include/cugraph/visitors/cascaded_dispatch.hpp b/cpp/include/cugraph/visitors/cascaded_dispatch.hpp old mode 100755 new mode 100644 index 4af2a4320fe..53d861e26c4 --- a/cpp/include/cugraph/visitors/cascaded_dispatch.hpp +++ b/cpp/include/cugraph/visitors/cascaded_dispatch.hpp @@ -31,8 +31,8 @@ #include "enum_mapping.hpp" #include "graph_enum_mapping.hpp" -#include #include "graph_factory.hpp" +#include namespace cugraph { namespace visitors { diff --git a/cpp/include/cugraph/visitors/graph_enum_mapping.hpp b/cpp/include/cugraph/visitors/graph_enum_mapping.hpp old mode 100755 new mode 100644 index 74eec6c3840..7aaa0f9b856 --- a/cpp/include/cugraph/visitors/graph_enum_mapping.hpp +++ b/cpp/include/cugraph/visitors/graph_enum_mapping.hpp @@ -19,8 +19,8 @@ #pragma once -#include #include "graph_enum.hpp" +#include namespace cugraph { namespace visitors { diff --git a/cpp/src/c_api/cugraph_api.cpp b/cpp/src/c_api/cugraph_api.cpp index f93b3e23da6..dc81223f8fe 100644 --- a/cpp/src/c_api/cugraph_api.cpp +++ b/cpp/src/c_api/cugraph_api.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include diff --git a/cpp/src/c_api/error.cpp b/cpp/src/c_api/error.cpp index b9545b1ae2e..21cd3344e14 100644 --- a/cpp/src/c_api/error.cpp +++ b/cpp/src/c_api/error.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include extern "C" const char* cugraph_error_message(const cugraph_error_t* error) { diff --git a/cpp/src/c_api/graph.hpp b/cpp/src/c_api/graph.hpp index 8c20fa54a14..188f3bee727 100644 --- a/cpp/src/c_api/graph.hpp +++ b/cpp/src/c_api/graph.hpp @@ -15,9 +15,9 @@ */ #pragma once -#include #include #include +#include #include diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp index e32c0e6b94e..c58d3368cac 100644 --- a/cpp/src/c_api/graph_sg.cpp +++ b/cpp/src/c_api/graph_sg.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include #include #include #include #include +#include #include #include diff --git a/cpp/src/centrality/betweenness_centrality.cu b/cpp/src/centrality/betweenness_centrality.cu index 927850769cb..dd1a398ea01 100644 --- a/cpp/src/centrality/betweenness_centrality.cu +++ b/cpp/src/centrality/betweenness_centrality.cu @@ -27,9 +27,9 @@ #include #include -#include #include "betweenness_centrality.cuh" #include "betweenness_centrality_kernels.cuh" +#include namespace cugraph { namespace detail { diff --git a/cpp/src/community/legacy/ecg.cu b/cpp/src/community/legacy/ecg.cu index 30af37ec2e5..8745370e1f1 100644 --- a/cpp/src/community/legacy/ecg.cu +++ b/cpp/src/community/legacy/ecg.cu @@ -20,8 +20,8 @@ #include #include -#include #include +#include #include diff --git a/cpp/src/community/legacy/egonet.cu b/cpp/src/community/legacy/egonet.cu index 3f79e58615e..5e46be18f13 100644 --- a/cpp/src/community/legacy/egonet.cu +++ b/cpp/src/community/legacy/egonet.cu @@ -25,8 +25,8 @@ #include #include -#include #include +#include #include diff --git a/cpp/src/community/legacy/ktruss.cu b/cpp/src/community/legacy/ktruss.cu index 2216278add8..74a871adb01 100644 --- a/cpp/src/community/legacy/ktruss.cu +++ b/cpp/src/community/legacy/ktruss.cu @@ -23,10 +23,10 @@ #include +#include "Static/KTruss/KTruss.cuh" #include #include #include -#include "Static/KTruss/KTruss.cuh" using namespace hornets_nest; diff --git a/cpp/src/community/legacy/spectral_clustering.cu b/cpp/src/community/legacy/spectral_clustering.cu index 8534665530b..631348f3826 100644 --- a/cpp/src/community/legacy/spectral_clustering.cu +++ b/cpp/src/community/legacy/spectral_clustering.cu @@ -22,10 +22,10 @@ #include -#include #include #include #include +#include #include #include diff --git a/cpp/src/community/legacy/triangles_counting.cu b/cpp/src/community/legacy/triangles_counting.cu index e4fe6f09a1b..aeb76c6e15a 100644 --- a/cpp/src/community/legacy/triangles_counting.cu +++ b/cpp/src/community/legacy/triangles_counting.cu @@ -16,10 +16,10 @@ #include -#include #include #include #include +#include #include #include diff --git a/cpp/src/components/utils.h b/cpp/src/components/utils.h index 4e7dbe075da..964eb750f6d 100644 --- a/cpp/src/components/utils.h +++ b/cpp/src/components/utils.h @@ -16,9 +16,9 @@ #pragma once +#include #include #include -#include #include #include #include diff --git a/cpp/src/components/weak_cc.cuh b/cpp/src/components/weak_cc.cuh index 6ae1e8d096c..0f459ac4531 100644 --- a/cpp/src/components/weak_cc.cuh +++ b/cpp/src/components/weak_cc.cuh @@ -28,8 +28,8 @@ #include #include -#include #include "utils.h" +#include namespace MLCommon { diff --git a/cpp/src/converters/COOtoCSR.cu b/cpp/src/converters/COOtoCSR.cu index 49986810539..904b2856c49 100644 --- a/cpp/src/converters/COOtoCSR.cu +++ b/cpp/src/converters/COOtoCSR.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include "COOtoCSR.cuh" +#include namespace cugraph { diff --git a/cpp/src/converters/COOtoCSR.cuh b/cpp/src/converters/COOtoCSR.cuh index a790782be11..ec208dbf4f0 100644 --- a/cpp/src/converters/COOtoCSR.cuh +++ b/cpp/src/converters/COOtoCSR.cuh @@ -22,12 +22,12 @@ #pragma once +#include #include #include #include #include #include -#include #include #include diff --git a/cpp/src/converters/permute_graph.cuh b/cpp/src/converters/permute_graph.cuh index cbff8ad3f7c..77ce3caf056 100644 --- a/cpp/src/converters/permute_graph.cuh +++ b/cpp/src/converters/permute_graph.cuh @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "converters/COOtoCSR.cuh" #include #include #include #include #include -#include "converters/COOtoCSR.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/detail/utility_wrappers.cu b/cpp/src/detail/utility_wrappers.cu index 73c4bbaedc3..85ccbcad3bc 100644 --- a/cpp/src/detail/utility_wrappers.cu +++ b/cpp/src/detail/utility_wrappers.cu @@ -17,8 +17,8 @@ #include -#include #include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/random_walks.cu b/cpp/src/sampling/random_walks.cu index 7526f1b7674..8136e3b6185 100644 --- a/cpp/src/sampling/random_walks.cu +++ b/cpp/src/sampling/random_walks.cu @@ -16,8 +16,8 @@ // Andrei Schaffer, aschaffer@nvidia.com // -#include #include "random_walks.cuh" +#include namespace cugraph { // template explicit instantiation directives (EIDir's): diff --git a/cpp/src/traversal/legacy/bfs.cu b/cpp/src/traversal/legacy/bfs.cu index 74a94ba0670..8ded72e68f4 100644 --- a/cpp/src/traversal/legacy/bfs.cu +++ b/cpp/src/traversal/legacy/bfs.cu @@ -9,19 +9,19 @@ * */ +#include "bfs.cuh" #include #include #include -#include "bfs.cuh" #include -#include -#include #include "bfs_kernels.cuh" #include "mg/bfs.cuh" #include "mg/common_utils.cuh" #include "traversal_common.cuh" +#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/traversal/legacy/bfs_kernels.cuh b/cpp/src/traversal/legacy/bfs_kernels.cuh index 4e482b446ba..de04be3ff86 100644 --- a/cpp/src/traversal/legacy/bfs_kernels.cuh +++ b/cpp/src/traversal/legacy/bfs_kernels.cuh @@ -15,11 +15,11 @@ */ #include -#include #include +#include -#include #include "traversal_common.cuh" +#include namespace cugraph { namespace detail { diff --git a/cpp/src/traversal/legacy/mg/bfs.cuh b/cpp/src/traversal/legacy/mg/bfs.cuh index 5e53ea78e04..300916c5d55 100644 --- a/cpp/src/traversal/legacy/mg/bfs.cuh +++ b/cpp/src/traversal/legacy/mg/bfs.cuh @@ -16,11 +16,11 @@ #pragma once -#include -#include #include "../traversal_common.cuh" #include "common_utils.cuh" #include "frontier_expand.cuh" +#include +#include namespace cugraph { diff --git a/cpp/src/traversal/legacy/mg/common_utils.cuh b/cpp/src/traversal/legacy/mg/common_utils.cuh index ad3c6b71659..2b159703dba 100644 --- a/cpp/src/traversal/legacy/mg/common_utils.cuh +++ b/cpp/src/traversal/legacy/mg/common_utils.cuh @@ -18,14 +18,14 @@ #include "../traversal_common.cuh" -#include #include #include #include +#include #include -#include #include +#include namespace cugraph { diff --git a/cpp/src/traversal/legacy/mg/frontier_expand.cuh b/cpp/src/traversal/legacy/mg/frontier_expand.cuh index 8390dbaf5e3..22cecf22549 100644 --- a/cpp/src/traversal/legacy/mg/frontier_expand.cuh +++ b/cpp/src/traversal/legacy/mg/frontier_expand.cuh @@ -16,10 +16,10 @@ #pragma once -#include -#include #include "frontier_expand_kernels.cuh" #include "vertex_binning.cuh" +#include +#include namespace cugraph { diff --git a/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh b/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh index 32b9310f02f..f451b980dee 100644 --- a/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh +++ b/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh @@ -16,8 +16,8 @@ #pragma once -#include #include "vertex_binning.cuh" +#include namespace cugraph { diff --git a/cpp/src/traversal/legacy/mg/vertex_binning.cuh b/cpp/src/traversal/legacy/mg/vertex_binning.cuh index 22973f6d1a9..7c8384c5810 100644 --- a/cpp/src/traversal/legacy/mg/vertex_binning.cuh +++ b/cpp/src/traversal/legacy/mg/vertex_binning.cuh @@ -16,9 +16,9 @@ #pragma once -#include #include "common_utils.cuh" #include "vertex_binning_kernels.cuh" +#include #include diff --git a/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh b/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh index 6af2df61f14..534e23d83a4 100644 --- a/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh +++ b/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh @@ -16,8 +16,8 @@ #pragma once -#include #include "../traversal_common.cuh" +#include namespace cugraph { diff --git a/cpp/src/traversal/legacy/sssp_kernels.cuh b/cpp/src/traversal/legacy/sssp_kernels.cuh index d1cf9980773..38c88e04c0b 100644 --- a/cpp/src/traversal/legacy/sssp_kernels.cuh +++ b/cpp/src/traversal/legacy/sssp_kernels.cuh @@ -18,9 +18,9 @@ #include +#include "traversal_common.cuh" #include #include -#include "traversal_common.cuh" namespace cugraph { namespace detail { namespace sssp_kernels { diff --git a/cpp/src/traversal/two_hop_neighbors.cu b/cpp/src/traversal/two_hop_neighbors.cu index c6ef012b1d3..c7050536247 100644 --- a/cpp/src/traversal/two_hop_neighbors.cu +++ b/cpp/src/traversal/two_hop_neighbors.cu @@ -19,12 +19,12 @@ * @file two_hop_neighbors.cu * ---------------------------------------------------------------------------**/ +#include "two_hop_neighbors.cuh" #include #include #include #include #include -#include "two_hop_neighbors.cuh" #include #include diff --git a/cpp/src/tree/mst.cu b/cpp/src/tree/mst.cu index e1c22fb87da..8a4f1c7dc1e 100644 --- a/cpp/src/tree/mst.cu +++ b/cpp/src/tree/mst.cu @@ -24,9 +24,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/cpp/src/utilities/spmv_1D.cu b/cpp/src/utilities/spmv_1D.cu index b4db219fb89..0309100950f 100644 --- a/cpp/src/utilities/spmv_1D.cu +++ b/cpp/src/utilities/spmv_1D.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include "spmv_1D.cuh" +#include namespace cugraph { namespace mg { diff --git a/cpp/tests/bcast/mg_graph_bcast.cpp b/cpp/tests/bcast/mg_graph_bcast.cpp index e952eb31848..0eadedf808b 100644 --- a/cpp/tests/bcast/mg_graph_bcast.cpp +++ b/cpp/tests/bcast/mg_graph_bcast.cpp @@ -23,9 +23,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/cpp/tests/centrality/katz_centrality_test.cpp b/cpp/tests/centrality/katz_centrality_test.cpp index 84ec1427de5..e90ab6ca8ce 100644 --- a/cpp/tests/centrality/katz_centrality_test.cpp +++ b/cpp/tests/centrality/katz_centrality_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/centrality/legacy/katz_centrality_test.cu b/cpp/tests/centrality/legacy/katz_centrality_test.cu index e9d3f8d7a69..e66eaef193d 100644 --- a/cpp/tests/centrality/legacy/katz_centrality_test.cu +++ b/cpp/tests/centrality/legacy/katz_centrality_test.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/centrality/mg_katz_centrality_test.cpp b/cpp/tests/centrality/mg_katz_centrality_test.cpp index 41270d81f84..8d7ead0432c 100644 --- a/cpp/tests/centrality/mg_katz_centrality_test.cpp +++ b/cpp/tests/centrality/mg_katz_centrality_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/community/egonet_test.cu b/cpp/tests/community/egonet_test.cu index f2b80bc6cb0..e8e6396f9f1 100644 --- a/cpp/tests/community/egonet_test.cu +++ b/cpp/tests/community/egonet_test.cu @@ -29,8 +29,8 @@ #include -#include #include +#include #include #include #include diff --git a/cpp/tests/community/mg_louvain_test.cpp b/cpp/tests/community/mg_louvain_test.cpp index 1c7e0b1de84..9acca9a88ae 100644 --- a/cpp/tests/community/mg_louvain_test.cpp +++ b/cpp/tests/community/mg_louvain_test.cpp @@ -24,9 +24,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/cpp/tests/components/con_comp_test.cu b/cpp/tests/components/con_comp_test.cu index 97758058adc..9cbb8e63775 100644 --- a/cpp/tests/components/con_comp_test.cu +++ b/cpp/tests/components/con_comp_test.cu @@ -12,8 +12,8 @@ // connected components tests // Author: Andrei Schaffer aschaffer@nvidia.com -#include #include +#include #include #include diff --git a/cpp/tests/components/mg_weakly_connected_components_test.cpp b/cpp/tests/components/mg_weakly_connected_components_test.cpp index fccf14b8371..1b965717571 100644 --- a/cpp/tests/components/mg_weakly_connected_components_test.cpp +++ b/cpp/tests/components/mg_weakly_connected_components_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include diff --git a/cpp/tests/components/scc_test.cu b/cpp/tests/components/scc_test.cu index 1a0d22cdb26..beb78b21ba7 100644 --- a/cpp/tests/components/scc_test.cu +++ b/cpp/tests/components/scc_test.cu @@ -12,8 +12,8 @@ // strongly connected components tests // Author: Andrei Schaffer aschaffer@nvidia.com -#include #include +#include #include #include diff --git a/cpp/tests/components/weakly_connected_components_test.cpp b/cpp/tests/components/weakly_connected_components_test.cpp index fb870bcd1a4..d4116f496bd 100644 --- a/cpp/tests/components/weakly_connected_components_test.cpp +++ b/cpp/tests/components/weakly_connected_components_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/cores/core_number_test.cpp b/cpp/tests/cores/core_number_test.cpp index 647ef83b88d..6167c5f4662 100644 --- a/cpp/tests/cores/core_number_test.cpp +++ b/cpp/tests/cores/core_number_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/cores/mg_core_number_test.cpp b/cpp/tests/cores/mg_core_number_test.cpp index 78efd735781..d134fe2eb95 100644 --- a/cpp/tests/cores/mg_core_number_test.cpp +++ b/cpp/tests/cores/mg_core_number_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/layout/force_atlas2_test.cu b/cpp/tests/layout/force_atlas2_test.cu index 6f02a5dace9..2d9da885661 100644 --- a/cpp/tests/layout/force_atlas2_test.cu +++ b/cpp/tests/layout/force_atlas2_test.cu @@ -12,13 +12,13 @@ // Force_Atlas2 tests // Author: Hugo Linsenmaier hlinsenmaier@nvidia.com -#include #include +#include #include -#include #include #include +#include #include #include diff --git a/cpp/tests/link_analysis/hits_test.cpp b/cpp/tests/link_analysis/hits_test.cpp index edd8c40286d..ca299727e00 100644 --- a/cpp/tests/link_analysis/hits_test.cpp +++ b/cpp/tests/link_analysis/hits_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include @@ -32,15 +32,15 @@ #include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include #include template diff --git a/cpp/tests/link_analysis/mg_hits_test.cpp b/cpp/tests/link_analysis/mg_hits_test.cpp index 4875641f7bf..8606f7b3b9e 100644 --- a/cpp/tests/link_analysis/mg_hits_test.cpp +++ b/cpp/tests/link_analysis/mg_hits_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/link_analysis/mg_pagerank_test.cpp b/cpp/tests/link_analysis/mg_pagerank_test.cpp index a6ae7cfae83..86d04880965 100644 --- a/cpp/tests/link_analysis/mg_pagerank_test.cpp +++ b/cpp/tests/link_analysis/mg_pagerank_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/link_analysis/pagerank_test.cpp b/cpp/tests/link_analysis/pagerank_test.cpp index 464744b4475..8f73e1d10e5 100644 --- a/cpp/tests/link_analysis/pagerank_test.cpp +++ b/cpp/tests/link_analysis/pagerank_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu b/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu index 739ace26734..e560f4ca524 100644 --- a/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu +++ b/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -32,14 +32,14 @@ #include #include -#include -#include #include #include #include #include #include #include +#include +#include #include diff --git a/cpp/tests/prims/mg_count_if_e.cu b/cpp/tests/prims/mg_count_if_e.cu index 202352bfc9d..66791c51e56 100644 --- a/cpp/tests/prims/mg_count_if_e.cu +++ b/cpp/tests/prims/mg_count_if_e.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -32,12 +32,12 @@ #include #include -#include #include #include #include #include #include +#include #include diff --git a/cpp/tests/prims/mg_count_if_v.cu b/cpp/tests/prims/mg_count_if_v.cu index dc68de0810c..c685af7a455 100644 --- a/cpp/tests/prims/mg_count_if_v.cu +++ b/cpp/tests/prims/mg_count_if_v.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -28,12 +28,12 @@ #include #include -#include #include #include #include #include #include +#include #include diff --git a/cpp/tests/prims/mg_extract_if_e.cu b/cpp/tests/prims/mg_extract_if_e.cu index cbbc5fc7d36..56ba1f4de7f 100644 --- a/cpp/tests/prims/mg_extract_if_e.cu +++ b/cpp/tests/prims/mg_extract_if_e.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -30,13 +30,13 @@ #include #include -#include -#include #include #include #include #include #include +#include +#include #include diff --git a/cpp/tests/prims/mg_reduce_v.cu b/cpp/tests/prims/mg_reduce_v.cu index 1bdc8fb1366..58ef5450b5c 100644 --- a/cpp/tests/prims/mg_reduce_v.cu +++ b/cpp/tests/prims/mg_reduce_v.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -29,12 +29,12 @@ #include #include -#include #include #include #include #include #include +#include #include diff --git a/cpp/tests/prims/mg_transform_reduce_e.cu b/cpp/tests/prims/mg_transform_reduce_e.cu index 8382cc0fece..e25f006ada9 100644 --- a/cpp/tests/prims/mg_transform_reduce_e.cu +++ b/cpp/tests/prims/mg_transform_reduce_e.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -32,12 +32,12 @@ #include #include -#include #include #include #include #include #include +#include #include diff --git a/cpp/tests/prims/mg_transform_reduce_v.cu b/cpp/tests/prims/mg_transform_reduce_v.cu index f33fc97ee09..99fbc920ce3 100644 --- a/cpp/tests/prims/mg_transform_reduce_v.cu +++ b/cpp/tests/prims/mg_transform_reduce_v.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -28,12 +28,12 @@ #include #include -#include #include #include #include #include #include +#include #include diff --git a/cpp/tests/sampling/random_walks_test.cu b/cpp/tests/sampling/random_walks_test.cu index 9dcec44be40..33fd67cfc44 100644 --- a/cpp/tests/sampling/random_walks_test.cu +++ b/cpp/tests/sampling/random_walks_test.cu @@ -20,8 +20,8 @@ #include #include -#include #include +#include #include #include diff --git a/cpp/tests/sampling/rw_low_level_test.cu b/cpp/tests/sampling/rw_low_level_test.cu index 717a03a38e0..a0a7b2b1d79 100644 --- a/cpp/tests/sampling/rw_low_level_test.cu +++ b/cpp/tests/sampling/rw_low_level_test.cu @@ -14,15 +14,15 @@ * limitations under the License. */ -#include #include "cuda_profiler_api.h" +#include #include #include #include -#include #include +#include #include #include diff --git a/cpp/tests/serialization/un_serialize_test.cpp b/cpp/tests/serialization/un_serialize_test.cpp index d1a08818978..6b4ca95d135 100644 --- a/cpp/tests/serialization/un_serialize_test.cpp +++ b/cpp/tests/serialization/un_serialize_test.cpp @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include "cuda_profiler_api.h" +#include #include #include diff --git a/cpp/tests/structure/coarsen_graph_test.cpp b/cpp/tests/structure/coarsen_graph_test.cpp index 08fc7815b1f..22bb1df3c83 100644 --- a/cpp/tests/structure/coarsen_graph_test.cpp +++ b/cpp/tests/structure/coarsen_graph_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp index 3fa211fbda7..c5de949fa2e 100644 --- a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp +++ b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp index adea1e01acc..289ec69e9ac 100644 --- a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp +++ b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/structure/mg_symmetrize_test.cpp b/cpp/tests/structure/mg_symmetrize_test.cpp index ccf38af4705..0c595d14cf3 100644 --- a/cpp/tests/structure/mg_symmetrize_test.cpp +++ b/cpp/tests/structure/mg_symmetrize_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/structure/mg_transpose_storage_test.cpp b/cpp/tests/structure/mg_transpose_storage_test.cpp index c2a66269423..1bee1ca2bfc 100644 --- a/cpp/tests/structure/mg_transpose_storage_test.cpp +++ b/cpp/tests/structure/mg_transpose_storage_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/structure/mg_transpose_test.cpp b/cpp/tests/structure/mg_transpose_test.cpp index f32a2770b38..bd3adc92189 100644 --- a/cpp/tests/structure/mg_transpose_test.cpp +++ b/cpp/tests/structure/mg_transpose_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/structure/renumbering_test.cpp b/cpp/tests/structure/renumbering_test.cpp index 9ca2472670b..f7020324b86 100644 --- a/cpp/tests/structure/renumbering_test.cpp +++ b/cpp/tests/structure/renumbering_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/structure/streams.cu b/cpp/tests/structure/streams.cu index c89ffe1e532..1ab6395d4ef 100644 --- a/cpp/tests/structure/streams.cu +++ b/cpp/tests/structure/streams.cu @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "gtest/gtest.h" #include -#include #include #include #include #include -#include "gtest/gtest.h" +#include struct StreamTest : public ::testing::Test { }; TEST_F(StreamTest, basic_test) diff --git a/cpp/tests/structure/symmetrize_test.cpp b/cpp/tests/structure/symmetrize_test.cpp index f89bec6ad34..f5bff02ceaa 100644 --- a/cpp/tests/structure/symmetrize_test.cpp +++ b/cpp/tests/structure/symmetrize_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/structure/transpose_storage_test.cpp b/cpp/tests/structure/transpose_storage_test.cpp index ad56fe095b8..024f4e1e1f6 100644 --- a/cpp/tests/structure/transpose_storage_test.cpp +++ b/cpp/tests/structure/transpose_storage_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/structure/transpose_test.cpp b/cpp/tests/structure/transpose_test.cpp index 5ba8faf2c77..7983e85e9a8 100644 --- a/cpp/tests/structure/transpose_test.cpp +++ b/cpp/tests/structure/transpose_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/cpp/tests/traversal/bfs_test.cpp b/cpp/tests/traversal/bfs_test.cpp index bb2ab014236..3645e66c4ae 100644 --- a/cpp/tests/traversal/bfs_test.cpp +++ b/cpp/tests/traversal/bfs_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/traversal/extract_bfs_paths_test.cu b/cpp/tests/traversal/extract_bfs_paths_test.cu index 93a47822910..ee9b8ea5d27 100644 --- a/cpp/tests/traversal/extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/extract_bfs_paths_test.cu @@ -15,8 +15,8 @@ */ #include "randomly_select_destinations.cuh" -#include #include +#include #include #include #include diff --git a/cpp/tests/traversal/legacy/sssp_test.cu b/cpp/tests/traversal/legacy/sssp_test.cu index ffa04f6d649..e7a698099a3 100644 --- a/cpp/tests/traversal/legacy/sssp_test.cu +++ b/cpp/tests/traversal/legacy/sssp_test.cu @@ -9,8 +9,8 @@ * */ -#include #include +#include #include #include diff --git a/cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/traversal/mg_bfs_test.cpp index 8cd3435a3bf..d991fc2c6c2 100644 --- a/cpp/tests/traversal/mg_bfs_test.cpp +++ b/cpp/tests/traversal/mg_bfs_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu index f4824e581b8..3c7b1c6deb5 100644 --- a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu @@ -15,8 +15,8 @@ */ #include "randomly_select_destinations.cuh" -#include #include +#include #include #include #include diff --git a/cpp/tests/traversal/mg_sssp_test.cpp b/cpp/tests/traversal/mg_sssp_test.cpp index 4bc4b60e49e..5ff0fb2e3a5 100644 --- a/cpp/tests/traversal/mg_sssp_test.cpp +++ b/cpp/tests/traversal/mg_sssp_test.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include diff --git a/cpp/tests/traversal/sssp_test.cpp b/cpp/tests/traversal/sssp_test.cpp index 0242ebc1a3a..2ea7a3cd10d 100644 --- a/cpp/tests/traversal/sssp_test.cpp +++ b/cpp/tests/traversal/sssp_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include #include diff --git a/cpp/tests/tree/mst_test.cu b/cpp/tests/tree/mst_test.cu index ffbddd96eb0..336f36587ce 100644 --- a/cpp/tests/tree/mst_test.cu +++ b/cpp/tests/tree/mst_test.cu @@ -17,8 +17,8 @@ // Mst solver tests // Author: Alex Fender afender@nvidia.com -#include #include +#include #include #include @@ -31,9 +31,9 @@ #include +#include "../src/converters/COOtoCSR.cuh" #include #include -#include "../src/converters/COOtoCSR.cuh" typedef struct Mst_Usecase_t { std::string matrix_file; diff --git a/cpp/tests/utilities/high_res_clock.h b/cpp/tests/utilities/high_res_clock.h index e52e7c9a522..3fe14182659 100644 --- a/cpp/tests/utilities/high_res_clock.h +++ b/cpp/tests/utilities/high_res_clock.h @@ -17,9 +17,9 @@ // Michael A. Frumkin (mfrumkin@nvidia.com) #pragma once -#include #include #include +#include class HighResClock { public: diff --git a/cpp/tests/utilities/test_utilities.hpp b/cpp/tests/utilities/test_utilities.hpp index 4729d3d9f13..98a92e5f2f4 100644 --- a/cpp/tests/utilities/test_utilities.hpp +++ b/cpp/tests/utilities/test_utilities.hpp @@ -19,10 +19,10 @@ #include #include -#include -#include #include #include +#include +#include #include #include From 294bd3e285050b58d846246ad3ae83164a42dfa9 Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Thu, 9 Dec 2021 12:50:05 -0500 Subject: [PATCH 3/5] Copyright fix --- cpp/tests/utilities/high_res_clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/tests/utilities/high_res_clock.h b/cpp/tests/utilities/high_res_clock.h index 3fe14182659..88a86709591 100644 --- a/cpp/tests/utilities/high_res_clock.h +++ b/cpp/tests/utilities/high_res_clock.h @@ -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. From dfbb003fda5ee2c9be23fc80a7c2f477ae22d6c3 Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Wed, 15 Dec 2021 15:34:13 -0500 Subject: [PATCH 4/5] Clang format fix --- .../prims/mg_update_frontier_v_push_if_out_nbr.cu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu b/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu index 0fb2880bae6..610e793eb61 100644 --- a/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu +++ b/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include #include #include +#include #include #include #include @@ -33,16 +33,16 @@ #include #include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include #include From 19db8e1764526717a0d5a325b71cca0d76d4f719 Mon Sep 17 00:00:00 2001 From: Conor Hoekstra Date: Wed, 15 Dec 2021 22:00:35 -0500 Subject: [PATCH 5/5] CI fix --- cpp/src/c_api/graph_sg.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp index c58d3368cac..e51e94edeeb 100644 --- a/cpp/src/c_api/graph_sg.cpp +++ b/cpp/src/c_api/graph_sg.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include -#include - -#include -#include -#include #include