From cc4199d86da520b6e6d92bd97e0110fb1c83b2a8 Mon Sep 17 00:00:00 2001 From: Mark Harris <783069+harrism@users.noreply.github.com> Date: Fri, 1 Mar 2024 06:43:09 +1100 Subject: [PATCH] Automate C++ include file grouping and ordering using clang-format (#4205) This uses the `IncludeCategories` settings in` .clang-format` to automate include ordering and grouping and to make include ordering more consistent with the rest of RAPIDS. For discussion, see https://github.com/rapidsai/cudf/pull/15063. This PR uses a similar set of header grouping categories used in that PR, adapted for cuGraph. One purpose of this is to make it easier to automate injection of a header change with an upcoming RMM refactoring (and in the future). Note that this PR also updates all of cugraph to use quotes ("") when includeing local *source* headers. That is, whenever something is included from `cugraph/src/*`, it should be included with quotes rather than angle brackets. This makes it much easier to order includes from "nearest to farthest", and matches the approach now taken in other RAPIDS repos. Without switching to quotes, keeping these includes at the top requires special casing each subdirectory of `src` in the clang-format group regular expressions. Includes from the `include` directory stay as angle brackets, because they always use `#include `. cuGraph tests include a LOT of internal source headers. I think we should generally avoid this, but it depends on the testing philosophy. If one believes that tests should only cover the external interfaces of the library, then there is no need to include internal headers. But if we want to test internal functionality, then the tests need to be more "internal" to the library. The header reordering in this PR also uncovered some places where headers were not included where they are used, which I have fixed. Closes #4185 Authors: - Mark Harris (https://github.com/harrism) Approvers: - Seunghwa Kang (https://github.com/seunghwak) - Naim (https://github.com/naimnv) - Chuck Hastings (https://github.com/ChuckHastings) URL: https://github.com/rapidsai/cugraph/pull/4205 --- cpp/.clang-format | 26 +++- cpp/include/cugraph/algorithms.hpp | 2 - .../cugraph/detail/collect_comm_wrapper.hpp | 1 + .../detail/decompress_edge_partition.cuh | 3 +- .../cugraph/detail/shuffle_wrappers.hpp | 1 + .../cugraph/edge_partition_device_view.cuh | 1 + cpp/include/cugraph/graph.hpp | 3 +- cpp/include/cugraph/graph_functions.hpp | 1 + cpp/include/cugraph/graph_view.hpp | 1 + cpp/include/cugraph/legacy/functions.hpp | 7 +- cpp/include/cugraph/legacy/graph.hpp | 11 +- .../mtmg/detail/device_shared_device_span.hpp | 3 +- .../detail/device_shared_device_vector.hpp | 3 +- cpp/include/cugraph/sampling_functions.hpp | 3 +- .../cugraph/utilities/dataframe_buffer.hpp | 3 +- cpp/include/cugraph/utilities/device_comm.hpp | 3 +- .../cugraph/utilities/host_scalar_comm.hpp | 3 +- cpp/include/cugraph/utilities/misc_utils.cuh | 7 +- .../cugraph/utilities/shuffle_comm.cuh | 6 +- cpp/src/c_api/abstract_functor.hpp | 4 +- cpp/src/c_api/allgather.cpp | 14 +- cpp/src/c_api/array.cpp | 9 +- cpp/src/c_api/betweenness_centrality.cpp | 16 +- cpp/src/c_api/bfs.cpp | 12 +- cpp/src/c_api/capi_helper.cu | 6 +- cpp/src/c_api/capi_helper.hpp | 3 +- cpp/src/c_api/centrality_result.cpp | 6 +- cpp/src/c_api/centrality_result.hpp | 4 +- cpp/src/c_api/core_number.cpp | 14 +- cpp/src/c_api/core_result.cpp | 6 +- cpp/src/c_api/core_result.hpp | 4 +- cpp/src/c_api/eigenvector_centrality.cpp | 14 +- cpp/src/c_api/error.cpp | 5 +- cpp/src/c_api/extract_ego.cpp | 16 +- cpp/src/c_api/extract_paths.cpp | 14 +- cpp/src/c_api/generic_cascaded_dispatch.hpp | 4 +- cpp/src/c_api/graph.hpp | 7 +- cpp/src/c_api/graph_functions.cpp | 17 ++- cpp/src/c_api/graph_functions.hpp | 4 +- cpp/src/c_api/graph_generators.cpp | 12 +- cpp/src/c_api/graph_helper_impl.cuh | 4 +- cpp/src/c_api/graph_helper_mg.cu | 4 +- cpp/src/c_api/graph_helper_sg.cu | 4 +- cpp/src/c_api/graph_mg.cpp | 18 +-- cpp/src/c_api/graph_sg.cpp | 19 +-- .../c_api/hierarchical_clustering_result.cpp | 6 +- .../c_api/hierarchical_clustering_result.hpp | 6 +- cpp/src/c_api/hits.cpp | 12 +- cpp/src/c_api/induced_subgraph.cpp | 16 +- cpp/src/c_api/induced_subgraph_result.cpp | 6 +- cpp/src/c_api/induced_subgraph_result.hpp | 4 +- cpp/src/c_api/k_core.cpp | 14 +- cpp/src/c_api/katz.cpp | 14 +- cpp/src/c_api/labeling_result.cpp | 6 +- cpp/src/c_api/labeling_result.hpp | 4 +- cpp/src/c_api/legacy_ecg.cpp | 14 +- cpp/src/c_api/legacy_k_truss.cpp | 14 +- cpp/src/c_api/legacy_spectral.cpp | 14 +- cpp/src/c_api/leiden.cpp | 18 +-- cpp/src/c_api/louvain.cpp | 14 +- cpp/src/c_api/pagerank.cpp | 14 +- cpp/src/c_api/paths_result.hpp | 4 +- cpp/src/c_api/random.cpp | 17 ++- cpp/src/c_api/random_walks.cpp | 12 +- cpp/src/c_api/resource_handle.cpp | 6 +- cpp/src/c_api/similarity.cpp | 14 +- cpp/src/c_api/sssp.cpp | 14 +- .../c_api/strongly_connected_components.cpp | 14 +- cpp/src/c_api/triangle_count.cpp | 12 +- cpp/src/c_api/uniform_neighbor_sampling.cpp | 14 +- cpp/src/c_api/utils.hpp | 6 +- cpp/src/c_api/weakly_connected_components.cpp | 14 +- .../betweenness_centrality_impl.cuh | 28 ++-- .../centrality/betweenness_centrality_mg.cu | 4 +- .../centrality/betweenness_centrality_sg.cu | 4 +- .../eigenvector_centrality_impl.cuh | 15 +- .../centrality/eigenvector_centrality_mg.cu | 4 +- .../centrality/eigenvector_centrality_sg.cu | 4 +- cpp/src/centrality/katz_centrality_impl.cuh | 13 +- cpp/src/centrality/katz_centrality_mg.cu | 4 +- cpp/src/centrality/katz_centrality_sg.cu | 4 +- cpp/src/community/detail/common_methods.cuh | 23 ++- cpp/src/community/detail/common_methods.hpp | 3 +- cpp/src/community/detail/common_methods_mg.cu | 4 +- cpp/src/community/detail/common_methods_sg.cu | 4 +- cpp/src/community/detail/mis_impl.cuh | 13 +- cpp/src/community/detail/mis_mg.cu | 4 +- cpp/src/community/detail/mis_sg.cu | 4 +- cpp/src/community/detail/refine.hpp | 3 +- cpp/src/community/detail/refine_impl.cuh | 24 +-- cpp/src/community/detail/refine_mg.cu | 4 +- cpp/src/community/detail/refine_sg.cu | 4 +- cpp/src/community/ecg_impl.cuh | 9 +- cpp/src/community/ecg_mg.cu | 2 +- cpp/src/community/ecg_sg.cu | 2 +- cpp/src/community/egonet_impl.cuh | 6 +- cpp/src/community/egonet_mg.cu | 4 +- cpp/src/community/egonet_sg.cu | 4 +- cpp/src/community/flatten_dendrogram.hpp | 1 + cpp/src/community/legacy/ecg.cu | 8 +- cpp/src/community/legacy/ktruss.cu | 6 +- cpp/src/community/legacy/louvain.cu | 7 +- cpp/src/community/legacy/louvain.cuh | 9 +- .../community/legacy/spectral_clustering.cu | 15 +- cpp/src/community/leiden_impl.cuh | 10 +- cpp/src/community/leiden_mg.cu | 4 +- cpp/src/community/leiden_sg.cu | 4 +- cpp/src/community/louvain_impl.cuh | 7 +- cpp/src/community/louvain_mg.cu | 2 +- cpp/src/community/louvain_sg.cu | 2 +- cpp/src/community/mis.hpp | 3 +- cpp/src/community/triangle_count_impl.cuh | 8 +- cpp/src/community/triangle_count_mg.cu | 4 +- cpp/src/community/triangle_count_sg.cu | 4 +- cpp/src/components/legacy/connectivity.cu | 5 +- cpp/src/components/legacy/utils.h | 14 +- cpp/src/components/legacy/weak_cc.cuh | 16 +- .../weakly_connected_components_impl.cuh | 13 +- .../weakly_connected_components_mg.cu | 4 +- .../weakly_connected_components_sg.cu | 4 +- cpp/src/converters/legacy/COOtoCSR.cuh | 21 ++- cpp/src/cores/core_number_impl.cuh | 12 +- cpp/src/cores/core_number_mg.cu | 4 +- cpp/src/cores/core_number_sg.cu | 4 +- cpp/src/cores/k_core_mg.cu | 4 +- cpp/src/cores/k_core_sg.cu | 4 +- cpp/src/detail/collect_comm_wrapper.cu | 8 +- cpp/src/detail/collect_local_vertex_values.cu | 4 +- cpp/src/detail/graph_partition_utils.cuh | 5 +- cpp/src/detail/groupby_and_count.cu | 4 +- cpp/src/detail/shuffle_vertex_pairs.cu | 4 +- cpp/src/detail/shuffle_vertices.cu | 4 +- cpp/src/generators/erdos_renyi_generator.cu | 5 +- .../generate_bipartite_rmat_edgelist.cu | 4 +- cpp/src/generators/generate_rmat_edgelist.cu | 4 +- cpp/src/generators/generator_tools.cu | 5 +- cpp/src/generators/simple_generators.cu | 6 +- cpp/src/layout/legacy/barnes_hut.cuh | 7 +- cpp/src/layout/legacy/exact_fa2.cuh | 17 +-- cpp/src/layout/legacy/fa2_kernels.cuh | 4 +- cpp/src/link_analysis/hits_impl.cuh | 16 +- cpp/src/link_analysis/hits_mg.cu | 4 +- cpp/src/link_analysis/hits_sg.cu | 4 +- cpp/src/link_analysis/pagerank_impl.cuh | 15 +- cpp/src/link_analysis/pagerank_mg.cu | 4 +- cpp/src/link_analysis/pagerank_sg.cu | 4 +- cpp/src/link_prediction/jaccard_impl.cuh | 5 +- cpp/src/link_prediction/jaccard_mg.cu | 4 +- cpp/src/link_prediction/jaccard_sg.cu | 4 +- cpp/src/link_prediction/overlap_impl.cuh | 5 +- cpp/src/link_prediction/overlap_mg.cu | 4 +- cpp/src/link_prediction/overlap_sg.cu | 4 +- cpp/src/link_prediction/similarity_impl.cuh | 8 +- cpp/src/link_prediction/sorensen_impl.cuh | 5 +- cpp/src/link_prediction/sorensen_mg.cu | 4 +- cpp/src/link_prediction/sorensen_sg.cu | 4 +- cpp/src/mtmg/vertex_result.cu | 6 +- cpp/src/prims/count_if_e.cuh | 6 +- cpp/src/prims/count_if_v.cuh | 3 +- .../detail/extract_transform_v_frontier_e.cuh | 7 +- cpp/src/prims/detail/nbr_intersection.cuh | 8 +- cpp/src/prims/edge_bucket.cuh | 3 +- cpp/src/prims/extract_transform_e.cuh | 6 +- ...xtract_transform_v_frontier_outgoing_e.cuh | 4 +- cpp/src/prims/fill_edge_property.cuh | 3 +- cpp/src/prims/fill_edge_src_dst_property.cuh | 1 + cpp/src/prims/key_store.cuh | 3 +- cpp/src/prims/kv_store.cuh | 3 +- ..._v_pair_transform_dst_nbr_intersection.cuh | 11 +- ...r_v_random_select_transform_outgoing_e.cuh | 7 +- ...m_reduce_dst_key_aggregated_outgoing_e.cuh | 9 +- ...v_transform_reduce_incoming_outgoing_e.cuh | 14 +- cpp/src/prims/reduce_op.cuh | 4 +- cpp/src/prims/reduce_v.cuh | 7 +- cpp/src/prims/transform_e.cuh | 1 + ...t_nbr_intersection_of_e_endpoints_by_v.cuh | 9 +- cpp/src/prims/transform_reduce_e.cuh | 5 +- .../transform_reduce_e_by_src_dst_key.cuh | 6 +- cpp/src/prims/transform_reduce_v.cuh | 6 +- ...rm_reduce_v_frontier_outgoing_e_by_dst.cuh | 9 +- .../prims/update_edge_src_dst_property.cuh | 8 +- cpp/src/prims/update_v_frontier.cuh | 3 +- cpp/src/prims/vertex_frontier.cuh | 3 +- .../detail/gather_one_hop_edgelist_impl.cuh | 12 +- .../detail/gather_one_hop_edgelist_mg.cu | 4 +- .../detail/gather_one_hop_edgelist_sg.cu | 4 +- .../detail/prepare_next_frontier_impl.cuh | 10 +- .../detail/prepare_next_frontier_mg.cu | 4 +- .../detail/prepare_next_frontier_sg.cu | 4 +- .../remove_visited_vertices_from_frontier.cu | 6 +- cpp/src/sampling/detail/sample_edges.cuh | 14 +- cpp/src/sampling/detail/sample_edges_mg.cu | 4 +- cpp/src/sampling/detail/sample_edges_sg.cu | 4 +- cpp/src/sampling/detail/sampling_utils.hpp | 7 +- .../shuffle_and_organize_output_impl.cuh | 12 +- .../detail/shuffle_and_organize_output_mg.cu | 4 +- cpp/src/sampling/neighborhood.cu | 7 +- cpp/src/sampling/random_walks.cuh | 13 +- cpp/src/sampling/random_walks_impl.cuh | 10 +- cpp/src/sampling/random_walks_mg.cu | 6 +- cpp/src/sampling/random_walks_sg.cu | 6 +- .../renumber_sampled_edgelist_impl.cuh | 5 +- .../sampling/renumber_sampled_edgelist_sg.cu | 6 +- cpp/src/sampling/rw_traversals.hpp | 9 +- .../sampling_post_processing_impl.cuh | 9 +- .../sampling/sampling_post_processing_sg.cu | 6 +- .../uniform_neighbor_sampling_impl.hpp | 4 +- .../sampling/uniform_neighbor_sampling_mg.cpp | 6 +- .../sampling/uniform_neighbor_sampling_sg.cpp | 6 +- cpp/src/structure/coarsen_graph_impl.cuh | 7 +- cpp/src/structure/coarsen_graph_mg.cu | 4 +- cpp/src/structure/coarsen_graph_sg.cu | 4 +- .../create_graph_from_edgelist_impl.cuh | 6 +- .../create_graph_from_edgelist_mg.cu | 4 +- .../create_graph_from_edgelist_sg.cu | 4 +- .../structure/decompress_to_edgelist_impl.cuh | 5 +- .../structure/decompress_to_edgelist_mg.cu | 4 +- .../structure/decompress_to_edgelist_sg.cu | 4 +- cpp/src/structure/detail/structure_utils.cuh | 3 +- cpp/src/structure/graph_impl.cuh | 7 +- cpp/src/structure/graph_mg.cu | 4 +- cpp/src/structure/graph_sg.cu | 4 +- cpp/src/structure/graph_view_impl.cuh | 14 +- cpp/src/structure/graph_view_mg.cu | 4 +- cpp/src/structure/graph_view_sg.cu | 4 +- cpp/src/structure/graph_weight_utils_impl.cuh | 7 +- cpp/src/structure/graph_weight_utils_mg.cu | 4 +- cpp/src/structure/graph_weight_utils_sg.cu | 4 +- cpp/src/structure/induced_subgraph_impl.cuh | 9 +- cpp/src/structure/induced_subgraph_mg.cu | 4 +- cpp/src/structure/induced_subgraph_sg.cu | 4 +- cpp/src/structure/legacy/graph.cu | 9 +- cpp/src/structure/relabel_impl.cuh | 7 +- cpp/src/structure/relabel_mg.cu | 4 +- cpp/src/structure/relabel_sg.cu | 4 +- cpp/src/structure/remove_multi_edges.cu | 2 +- cpp/src/structure/remove_multi_edges_impl.cuh | 6 +- cpp/src/structure/remove_self_loops.cu | 4 +- cpp/src/structure/remove_self_loops_impl.cuh | 5 +- cpp/src/structure/renumber_edgelist_impl.cuh | 7 +- cpp/src/structure/renumber_edgelist_mg.cu | 4 +- cpp/src/structure/renumber_edgelist_sg.cu | 4 +- cpp/src/structure/renumber_utils_impl.cuh | 8 +- cpp/src/structure/renumber_utils_mg.cu | 4 +- cpp/src/structure/renumber_utils_sg.cu | 4 +- .../structure/select_random_vertices_impl.hpp | 6 +- .../structure/select_random_vertices_mg.cu | 4 +- .../structure/select_random_vertices_sg.cu | 4 +- .../structure/symmetrize_edgelist_impl.cuh | 4 +- cpp/src/structure/symmetrize_edgelist_mg.cu | 4 +- cpp/src/structure/symmetrize_edgelist_sg.cu | 4 +- cpp/src/structure/symmetrize_graph_impl.cuh | 3 +- cpp/src/structure/symmetrize_graph_mg.cu | 4 +- cpp/src/structure/symmetrize_graph_sg.cu | 4 +- cpp/src/structure/transpose_graph_impl.cuh | 3 +- cpp/src/structure/transpose_graph_mg.cu | 4 +- cpp/src/structure/transpose_graph_sg.cu | 4 +- .../transpose_graph_storage_impl.cuh | 3 +- .../structure/transpose_graph_storage_mg.cu | 4 +- .../structure/transpose_graph_storage_sg.cu | 4 +- cpp/src/traversal/bfs_impl.cuh | 15 +- cpp/src/traversal/bfs_mg.cu | 4 +- cpp/src/traversal/bfs_sg.cu | 4 +- cpp/src/traversal/extract_bfs_paths_impl.cuh | 9 +- cpp/src/traversal/extract_bfs_paths_mg.cu | 4 +- cpp/src/traversal/extract_bfs_paths_sg.cu | 4 +- cpp/src/traversal/k_hop_nbrs_impl.cuh | 9 +- cpp/src/traversal/k_hop_nbrs_mg.cu | 4 +- cpp/src/traversal/k_hop_nbrs_sg.cu | 4 +- .../traversal/od_shortest_distances_impl.cuh | 20 +-- cpp/src/traversal/od_shortest_distances_sg.cu | 4 +- cpp/src/traversal/sssp_impl.cuh | 18 +-- cpp/src/traversal/sssp_mg.cu | 4 +- cpp/src/traversal/sssp_sg.cu | 4 +- cpp/src/tree/legacy/mst.cu | 17 ++- cpp/src/utilities/collect_comm.cuh | 7 +- cpp/src/utilities/cugraph_ops_utils.hpp | 5 +- cpp/src/utilities/error_check_utils.cuh | 1 + cpp/src/utilities/graph_utils.cuh | 8 +- cpp/src/utilities/path_retrieval.cu | 10 +- cpp/tests/c_api/mg_test_utils.cpp | 140 +++++++++++------- .../betweenness_centrality_reference.hpp | 4 +- .../betweenness_centrality_test.cpp | 16 +- .../betweenness_centrality_validate.cu | 6 +- .../edge_betweenness_centrality_test.cpp | 16 +- .../eigenvector_centrality_test.cpp | 11 +- cpp/tests/centrality/katz_centrality_test.cpp | 11 +- .../mg_betweenness_centrality_test.cpp | 16 +- .../mg_edge_betweenness_centrality_test.cpp | 16 +- .../mg_eigenvector_centrality_test.cpp | 15 +- .../centrality/mg_katz_centrality_test.cpp | 15 +- cpp/tests/community/balanced_edge_test.cpp | 4 +- cpp/tests/community/ecg_test.cpp | 4 +- cpp/tests/community/egonet_test.cpp | 12 +- cpp/tests/community/egonet_validate.cu | 12 +- cpp/tests/community/leiden_test.cpp | 11 +- cpp/tests/community/louvain_test.cpp | 7 +- cpp/tests/community/mg_ecg_test.cpp | 11 +- cpp/tests/community/mg_egonet_test.cu | 14 +- cpp/tests/community/mg_leiden_test.cpp | 13 +- cpp/tests/community/mg_louvain_test.cpp | 8 +- cpp/tests/community/mg_mis_test.cu | 32 ++-- .../community/mg_triangle_count_test.cpp | 15 +- cpp/tests/community/triangle_count_test.cpp | 11 +- .../mg_weakly_connected_components_test.cpp | 13 +- cpp/tests/components/scc_test.cu | 15 +- .../weakly_connected_components_test.cpp | 9 +- cpp/tests/cores/core_number_test.cpp | 11 +- cpp/tests/cores/k_core_test.cpp | 12 +- cpp/tests/cores/mg_core_number_test.cpp | 15 +- cpp/tests/cores/mg_k_core_test.cpp | 14 +- cpp/tests/generators/erdos_renyi_test.cpp | 6 +- .../generate_bipartite_rmat_test.cpp | 9 +- cpp/tests/generators/generate_rmat_test.cpp | 9 +- cpp/tests/generators/generators_test.cpp | 8 +- cpp/tests/layout/legacy/force_atlas2_test.cu | 9 +- cpp/tests/linear_assignment/hungarian_test.cu | 13 +- cpp/tests/link_analysis/hits_test.cpp | 20 +-- cpp/tests/link_analysis/mg_hits_test.cpp | 15 +- cpp/tests/link_analysis/mg_pagerank_test.cpp | 15 +- cpp/tests/link_analysis/pagerank_test.cpp | 11 +- .../link_prediction/mg_similarity_test.cpp | 17 +-- .../mg_weighted_similarity_test.cpp | 17 +-- .../link_prediction/similarity_compare.cpp | 7 +- .../link_prediction/similarity_compare.hpp | 3 +- cpp/tests/link_prediction/similarity_test.cpp | 14 +- .../weighted_similarity_test.cpp | 12 +- cpp/tests/mtmg/multi_node_threaded_test.cu | 16 +- cpp/tests/mtmg/threaded_test.cu | 17 +-- cpp/tests/mtmg/threaded_test_louvain.cu | 19 ++- cpp/tests/prims/mg_count_if_e.cu | 26 ++-- cpp/tests/prims/mg_count_if_v.cu | 23 +-- cpp/tests/prims/mg_extract_transform_e.cu | 28 ++-- ...extract_transform_v_frontier_outgoing_e.cu | 28 ++-- ...r_v_pair_transform_dst_nbr_intersection.cu | 21 ++- ...transform_dst_nbr_weighted_intersection.cu | 20 ++- ...er_v_random_select_transform_outgoing_e.cu | 21 ++- ..._v_transform_reduce_incoming_outgoing_e.cu | 28 ++-- cpp/tests/prims/mg_reduce_v.cu | 26 ++-- cpp/tests/prims/mg_transform_e.cu | 30 ++-- cpp/tests/prims/mg_transform_reduce_e.cu | 26 ++-- cpp/tests/prims/mg_transform_reduce_v.cu | 24 +-- ...orm_reduce_v_frontier_outgoing_e_by_dst.cu | 28 ++-- cpp/tests/prims/property_generator.cuh | 11 +- .../sampling/detail/nbr_sampling_utils.cuh | 16 +- cpp/tests/sampling/mg_random_walks_test.cpp | 15 +- .../sampling/mg_uniform_neighbor_sampling.cu | 5 +- cpp/tests/sampling/random_walks_check.cuh | 7 +- cpp/tests/sampling/random_walks_check_mg.cu | 4 +- cpp/tests/sampling/random_walks_check_sg.cu | 4 +- cpp/tests/sampling/random_walks_utils.cuh | 7 +- .../sampling/sampling_post_processing_test.cu | 10 +- cpp/tests/sampling/sg_random_walks_test.cpp | 13 +- .../sampling/sg_uniform_neighbor_sampling.cu | 6 +- cpp/tests/structure/coarsen_graph_test.cpp | 7 +- .../count_self_loops_and_multi_edges_test.cpp | 9 +- cpp/tests/structure/degree_test.cpp | 7 +- ...has_edge_and_compute_multiplicity_test.cpp | 9 +- cpp/tests/structure/induced_subgraph_test.cpp | 10 +- .../structure/induced_subgraph_validate.cu | 8 +- ..._count_self_loops_and_multi_edges_test.cpp | 15 +- ...has_edge_and_compute_multiplicity_test.cpp | 13 +- .../structure/mg_induced_subgraph_test.cu | 16 +- .../mg_select_random_vertices_test.cpp | 13 +- cpp/tests/structure/mg_symmetrize_test.cpp | 15 +- .../structure/mg_transpose_storage_test.cpp | 15 +- cpp/tests/structure/mg_transpose_test.cpp | 15 +- cpp/tests/structure/renumbering_test.cpp | 11 +- cpp/tests/structure/streams.cu | 5 +- cpp/tests/structure/symmetrize_test.cpp | 7 +- .../structure/transpose_storage_test.cpp | 7 +- cpp/tests/structure/transpose_test.cpp | 7 +- cpp/tests/structure/weight_sum_test.cpp | 5 +- cpp/tests/traversal/bfs_test.cpp | 11 +- cpp/tests/traversal/extract_bfs_paths_test.cu | 11 +- cpp/tests/traversal/k_hop_nbrs_test.cpp | 11 +- cpp/tests/traversal/mg_bfs_test.cpp | 15 +- .../traversal/mg_extract_bfs_paths_test.cu | 14 +- cpp/tests/traversal/mg_k_hop_nbrs_test.cpp | 15 +- cpp/tests/traversal/mg_sssp_test.cpp | 15 +- cpp/tests/traversal/ms_bfs_test.cu | 12 +- .../traversal/od_shortest_distances_test.cpp | 9 +- cpp/tests/traversal/sssp_test.cpp | 11 +- cpp/tests/tree/mst_test.cu | 16 +- cpp/tests/utilities/base_fixture.hpp | 6 +- cpp/tests/utilities/csv_file_utilities.cu | 8 +- .../utilities/matrix_market_file_utilities.cu | 7 +- cpp/tests/utilities/mg_utilities.cpp | 4 +- cpp/tests/utilities/misc_utilities.cpp | 4 +- cpp/tests/utilities/test_graphs.hpp | 6 +- cpp/tests/utilities/test_utilities.hpp | 2 + cpp/tests/utilities/test_utilities_impl.cuh | 10 +- cpp/tests/utilities/test_utilities_mg.cu | 4 +- cpp/tests/utilities/test_utilities_sg.cu | 4 +- cpp/tests/utilities/thrust_wrapper.cu | 6 +- cpp/tests/utilities/thrust_wrapper.hpp | 3 +- 396 files changed, 1843 insertions(+), 1667 deletions(-) diff --git a/cpp/.clang-format b/cpp/.clang-format index 6019a6f3d5c..3095c6d514a 100644 --- a/cpp/.clang-format +++ b/cpp/.clang-format @@ -15,7 +15,7 @@ AlignTrailingComments: true AllowAllArgumentsOnNextLine: true AllowAllConstructorInitializersOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: true +AllowShortBlocksOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true AllowShortEnumsOnASingleLine: true AllowShortFunctionsOnASingleLine: All @@ -27,7 +27,7 @@ AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true AlwaysBreakTemplateDeclarations: Yes -BinPackArguments: false +BinPackArguments: false BinPackParameters: false BraceWrapping: AfterClass: false @@ -71,8 +71,26 @@ ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH -IncludeBlocks: Preserve -IncludeIsMainRegex: '([-_](test|unittest))?$' +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^"' # quoted includes + Priority: 1 + - Regex: '^ - #include #include #include #include - #include #include diff --git a/cpp/include/cugraph/detail/collect_comm_wrapper.hpp b/cpp/include/cugraph/detail/collect_comm_wrapper.hpp index 4a2f5d7c44e..e547bdb3552 100644 --- a/cpp/include/cugraph/detail/collect_comm_wrapper.hpp +++ b/cpp/include/cugraph/detail/collect_comm_wrapper.hpp @@ -17,6 +17,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/detail/decompress_edge_partition.cuh b/cpp/include/cugraph/detail/decompress_edge_partition.cuh index 4b256a0413a..dad5ce77e45 100644 --- a/cpp/include/cugraph/detail/decompress_edge_partition.cuh +++ b/cpp/include/cugraph/detail/decompress_edge_partition.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/detail/shuffle_wrappers.hpp b/cpp/include/cugraph/detail/shuffle_wrappers.hpp index c77ecb7aa01..1353302f825 100644 --- a/cpp/include/cugraph/detail/shuffle_wrappers.hpp +++ b/cpp/include/cugraph/detail/shuffle_wrappers.hpp @@ -17,6 +17,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/edge_partition_device_view.cuh b/cpp/include/cugraph/edge_partition_device_view.cuh index c286c81683e..fc19a8f68dd 100644 --- a/cpp/include/cugraph/edge_partition_device_view.cuh +++ b/cpp/include/cugraph/edge_partition_device_view.cuh @@ -21,6 +21,7 @@ #include #include + #include #include #include diff --git a/cpp/include/cugraph/graph.hpp b/cpp/include/cugraph/graph.hpp index a723fde24df..0ccd0cbc6df 100644 --- a/cpp/include/cugraph/graph.hpp +++ b/cpp/include/cugraph/graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/graph_functions.hpp b/cpp/include/cugraph/graph_functions.hpp index 6684d31d8fd..90425f86bef 100644 --- a/cpp/include/cugraph/graph_functions.hpp +++ b/cpp/include/cugraph/graph_functions.hpp @@ -22,6 +22,7 @@ #include #include #include + #include #include diff --git a/cpp/include/cugraph/graph_view.hpp b/cpp/include/cugraph/graph_view.hpp index 93d884a56d9..3f3514179bf 100644 --- a/cpp/include/cugraph/graph_view.hpp +++ b/cpp/include/cugraph/graph_view.hpp @@ -25,6 +25,7 @@ #include #include #include + #include #include diff --git a/cpp/include/cugraph/legacy/functions.hpp b/cpp/include/cugraph/legacy/functions.hpp index f29a66ce9d8..1efa2294847 100644 --- a/cpp/include/cugraph/legacy/functions.hpp +++ b/cpp/include/cugraph/legacy/functions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,10 +15,11 @@ */ #pragma once +#include + #include -#include -#include +#include namespace cugraph { diff --git a/cpp/include/cugraph/legacy/graph.hpp b/cpp/include/cugraph/legacy/graph.hpp index 8276853ce7e..e64cbf32d4c 100644 --- a/cpp/include/cugraph/legacy/graph.hpp +++ b/cpp/include/cugraph/legacy/graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,16 @@ * limitations under the License. */ #pragma once +#include + +#include + +#include + #include #include #include #include -#include -#include -#include namespace cugraph { namespace legacy { diff --git a/cpp/include/cugraph/mtmg/detail/device_shared_device_span.hpp b/cpp/include/cugraph/mtmg/detail/device_shared_device_span.hpp index 37398891370..caba9e91d8b 100644 --- a/cpp/include/cugraph/mtmg/detail/device_shared_device_span.hpp +++ b/cpp/include/cugraph/mtmg/detail/device_shared_device_span.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,6 +17,7 @@ #pragma once #include + #include namespace cugraph { diff --git a/cpp/include/cugraph/mtmg/detail/device_shared_device_vector.hpp b/cpp/include/cugraph/mtmg/detail/device_shared_device_vector.hpp index 7f3992b73bd..969d32aa313 100644 --- a/cpp/include/cugraph/mtmg/detail/device_shared_device_vector.hpp +++ b/cpp/include/cugraph/mtmg/detail/device_shared_device_vector.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,6 +17,7 @@ #pragma once #include + #include namespace cugraph { diff --git a/cpp/include/cugraph/sampling_functions.hpp b/cpp/include/cugraph/sampling_functions.hpp index 75cf8f91f92..c83e1f48972 100644 --- a/cpp/include/cugraph/sampling_functions.hpp +++ b/cpp/include/cugraph/sampling_functions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,6 +17,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/utilities/dataframe_buffer.hpp b/cpp/include/cugraph/utilities/dataframe_buffer.hpp index 0e045ed7dbd..d52160abd19 100644 --- a/cpp/include/cugraph/utilities/dataframe_buffer.hpp +++ b/cpp/include/cugraph/utilities/dataframe_buffer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/utilities/device_comm.hpp b/cpp/include/cugraph/utilities/device_comm.hpp index 990074e781b..ffb0f7d9e5b 100644 --- a/cpp/include/cugraph/utilities/device_comm.hpp +++ b/cpp/include/cugraph/utilities/device_comm.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/utilities/host_scalar_comm.hpp b/cpp/include/cugraph/utilities/host_scalar_comm.hpp index 4e6ec35b9d5..4622156fddc 100644 --- a/cpp/include/cugraph/utilities/host_scalar_comm.hpp +++ b/cpp/include/cugraph/utilities/host_scalar_comm.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include #include + #include #include diff --git a/cpp/include/cugraph/utilities/misc_utils.cuh b/cpp/include/cugraph/utilities/misc_utils.cuh index 04aeac49c9d..5b66d978b54 100644 --- a/cpp/include/cugraph/utilities/misc_utils.cuh +++ b/cpp/include/cugraph/utilities/misc_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,19 +15,20 @@ */ #pragma once +#include #include #include + #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/cpp/include/cugraph/utilities/shuffle_comm.cuh b/cpp/include/cugraph/utilities/shuffle_comm.cuh index 414d9b36992..3cbd35b4bc3 100644 --- a/cpp/include/cugraph/utilities/shuffle_comm.cuh +++ b/cpp/include/cugraph/utilities/shuffle_comm.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,12 @@ #include #include + #include #include #include +#include #include #include #include @@ -40,8 +42,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/c_api/abstract_functor.hpp b/cpp/src/c_api/abstract_functor.hpp index 72b433aa9af..219b1256065 100644 --- a/cpp/src/c_api/abstract_functor.hpp +++ b/cpp/src/c_api/abstract_functor.hpp @@ -15,9 +15,9 @@ */ #pragma once -#include +#include "c_api/error.hpp" -#include +#include #include diff --git a/cpp/src/c_api/allgather.cpp b/cpp/src/c_api/allgather.cpp index 7ef401aa6b7..376e598bb45 100644 --- a/cpp/src/c_api/allgather.cpp +++ b/cpp/src/c_api/allgather.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/induced_subgraph_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" + #include #include -#include -#include -#include -#include -#include - #include #include #include diff --git a/cpp/src/c_api/array.cpp b/cpp/src/c_api/array.cpp index 40d83fc0ee9..c9c8eaa78ac 100644 --- a/cpp/src/c_api/array.cpp +++ b/cpp/src/c_api/array.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. */ -#include -#include -#include +#include "c_api/array.hpp" + +#include "c_api/error.hpp" +#include "c_api/resource_handle.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/betweenness_centrality.cpp b/cpp/src/c_api/betweenness_centrality.cpp index 3cf3e92e960..577826fe097 100644 --- a/cpp/src/c_api/betweenness_centrality.cpp +++ b/cpp/src/c_api/betweenness_centrality.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/centrality_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/random.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/bfs.cpp b/cpp/src/c_api/bfs.cpp index 32841b2dd3c..25617f4a82b 100644 --- a/cpp/src/c_api/bfs.cpp +++ b/cpp/src/c_api/bfs.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/paths_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/capi_helper.cu b/cpp/src/c_api/capi_helper.cu index f08af4137db..c909ba06c53 100644 --- a/cpp/src/c_api/capi_helper.cu +++ b/cpp/src/c_api/capi_helper.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "c_api/capi_helper.hpp" +#include "structure/detail/structure_utils.cuh" #include #include diff --git a/cpp/src/c_api/capi_helper.hpp b/cpp/src/c_api/capi_helper.hpp index 56401606477..20f4799b2f7 100644 --- a/cpp/src/c_api/capi_helper.hpp +++ b/cpp/src/c_api/capi_helper.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,6 +17,7 @@ #include #include + #include #include diff --git a/cpp/src/c_api/centrality_result.cpp b/cpp/src/c_api/centrality_result.cpp index 75f10fcbbdb..4557b01200b 100644 --- a/cpp/src/c_api/centrality_result.cpp +++ b/cpp/src/c_api/centrality_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/centrality_result.hpp" -#include +#include extern "C" cugraph_type_erased_device_array_view_t* cugraph_centrality_result_get_vertices( cugraph_centrality_result_t* result) diff --git a/cpp/src/c_api/centrality_result.hpp b/cpp/src/c_api/centrality_result.hpp index e0acde9cce3..164170a76f4 100644 --- a/cpp/src/c_api/centrality_result.hpp +++ b/cpp/src/c_api/centrality_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/core_number.cpp b/cpp/src/c_api/core_number.cpp index 964a7b8966d..b00a8d979e3 100644 --- a/cpp/src/c_api/core_number.cpp +++ b/cpp/src/c_api/core_number.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/core_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/core_result.cpp b/cpp/src/c_api/core_result.cpp index 09476060967..7e003d3cfa1 100644 --- a/cpp/src/c_api/core_result.cpp +++ b/cpp/src/c_api/core_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/core_result.hpp" -#include +#include extern "C" cugraph_error_code_t cugraph_core_result_create( const cugraph_resource_handle_t* handle, diff --git a/cpp/src/c_api/core_result.hpp b/cpp/src/c_api/core_result.hpp index 6ee00d71444..8ce43787b91 100644 --- a/cpp/src/c_api/core_result.hpp +++ b/cpp/src/c_api/core_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/eigenvector_centrality.cpp b/cpp/src/c_api/eigenvector_centrality.cpp index 3d10a7d2b0e..1ada9c95764 100644 --- a/cpp/src/c_api/eigenvector_centrality.cpp +++ b/cpp/src/c_api/eigenvector_centrality.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/centrality_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/error.cpp b/cpp/src/c_api/error.cpp index 21cd3344e14..a8b1213b847 100644 --- a/cpp/src/c_api/error.cpp +++ b/cpp/src/c_api/error.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,8 @@ * limitations under the License. */ -#include +#include "c_api/error.hpp" + #include extern "C" const char* cugraph_error_message(const cugraph_error_t* error) diff --git a/cpp/src/c_api/extract_ego.cpp b/cpp/src/c_api/extract_ego.cpp index cbe07af2e77..84133e6ae86 100644 --- a/cpp/src/c_api/extract_ego.cpp +++ b/cpp/src/c_api/extract_ego.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/capi_helper.hpp" +#include "c_api/graph.hpp" +#include "c_api/induced_subgraph_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/extract_paths.cpp b/cpp/src/c_api/extract_paths.cpp index be019999ce9..26ecadc01fb 100644 --- a/cpp/src/c_api/extract_paths.cpp +++ b/cpp/src/c_api/extract_paths.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/paths_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/generic_cascaded_dispatch.hpp b/cpp/src/c_api/generic_cascaded_dispatch.hpp index 50bd98c903d..56f809041ff 100644 --- a/cpp/src/c_api/generic_cascaded_dispatch.hpp +++ b/cpp/src/c_api/generic_cascaded_dispatch.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ #include +#include + namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/graph.hpp b/cpp/src/c_api/graph.hpp index 2be5c74624e..8332f6600e9 100644 --- a/cpp/src/c_api/graph.hpp +++ b/cpp/src/c_api/graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,8 +15,9 @@ */ #pragma once -#include -#include +#include "c_api/array.hpp" +#include "c_api/error.hpp" + #include #include diff --git a/cpp/src/c_api/graph_functions.cpp b/cpp/src/c_api/graph_functions.cpp index aedb8f8e287..35f7086d726 100644 --- a/cpp/src/c_api/graph_functions.cpp +++ b/cpp/src/c_api/graph_functions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ -#include +#include "c_api/graph_functions.hpp" + +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/graph_helper.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/graph_functions.hpp b/cpp/src/c_api/graph_functions.hpp index 5b9978ce4f0..9e37223f7a6 100644 --- a/cpp/src/c_api/graph_functions.hpp +++ b/cpp/src/c_api/graph_functions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/graph_generators.cpp b/cpp/src/c_api/graph_generators.cpp index adf49de7afe..ef478e57098 100644 --- a/cpp/src/c_api/graph_generators.cpp +++ b/cpp/src/c_api/graph_generators.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "c_api/array.hpp" +#include "c_api/error.hpp" +#include "c_api/random.hpp" +#include "c_api/resource_handle.hpp" -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/graph_helper_impl.cuh b/cpp/src/c_api/graph_helper_impl.cuh index 1b0cc5aa928..a0614c5e08e 100644 --- a/cpp/src/c_api/graph_helper_impl.cuh +++ b/cpp/src/c_api/graph_helper_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,7 @@ */ #pragma once -#include +#include "prims/fill_edge_property.cuh" #include diff --git a/cpp/src/c_api/graph_helper_mg.cu b/cpp/src/c_api/graph_helper_mg.cu index 15e24ba530b..353d3d90de8 100644 --- a/cpp/src/c_api/graph_helper_mg.cu +++ b/cpp/src/c_api/graph_helper_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "c_api/graph_helper_impl.cuh" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/graph_helper_sg.cu b/cpp/src/c_api/graph_helper_sg.cu index dcd6c92325f..86efa0d7bed 100644 --- a/cpp/src/c_api/graph_helper_sg.cu +++ b/cpp/src/c_api/graph_helper_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "c_api/graph_helper_impl.cuh" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/graph_mg.cpp b/cpp/src/c_api/graph_mg.cpp index 57a589caf02..22ceea3f629 100644 --- a/cpp/src/c_api/graph_mg.cpp +++ b/cpp/src/c_api/graph_mg.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/array.hpp" +#include "c_api/error.hpp" +#include "c_api/generic_cascaded_dispatch.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp index 6745be01f95..ff71471a8d0 100644 --- a/cpp/src/c_api/graph_sg.cpp +++ b/cpp/src/c_api/graph_sg.cpp @@ -14,17 +14,18 @@ * limitations under the License. */ -#include -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/array.hpp" +#include "c_api/error.hpp" +#include "c_api/generic_cascaded_dispatch.hpp" +#include "c_api/graph.hpp" +#include "c_api/graph_helper.hpp" +#include "c_api/resource_handle.hpp" + #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include diff --git a/cpp/src/c_api/hierarchical_clustering_result.cpp b/cpp/src/c_api/hierarchical_clustering_result.cpp index 6f66762f85e..36aa71b5552 100644 --- a/cpp/src/c_api/hierarchical_clustering_result.cpp +++ b/cpp/src/c_api/hierarchical_clustering_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/hierarchical_clustering_result.hpp" -#include +#include extern "C" cugraph_type_erased_device_array_view_t* cugraph_hierarchical_clustering_result_get_vertices( diff --git a/cpp/src/c_api/hierarchical_clustering_result.hpp b/cpp/src/c_api/hierarchical_clustering_result.hpp index a2a1f0a413a..9998782d21e 100644 --- a/cpp/src/c_api/hierarchical_clustering_result.hpp +++ b/cpp/src/c_api/hierarchical_clustering_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,9 +15,9 @@ */ #pragma once -#include +#include "c_api/array.hpp" -#include +#include namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/hits.cpp b/cpp/src/c_api/hits.cpp index 1dcf1604100..d469b18a2c5 100644 --- a/cpp/src/c_api/hits.cpp +++ b/cpp/src/c_api/hits.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/induced_subgraph.cpp b/cpp/src/c_api/induced_subgraph.cpp index ac56301e231..85157f824d1 100644 --- a/cpp/src/c_api/induced_subgraph.cpp +++ b/cpp/src/c_api/induced_subgraph.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/capi_helper.hpp" +#include "c_api/graph.hpp" +#include "c_api/induced_subgraph_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/induced_subgraph_result.cpp b/cpp/src/c_api/induced_subgraph_result.cpp index 5226872d404..fdabd1cd582 100644 --- a/cpp/src/c_api/induced_subgraph_result.cpp +++ b/cpp/src/c_api/induced_subgraph_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/induced_subgraph_result.hpp" -#include +#include extern "C" cugraph_type_erased_device_array_view_t* cugraph_induced_subgraph_get_sources( cugraph_induced_subgraph_result_t* induced_subgraph) diff --git a/cpp/src/c_api/induced_subgraph_result.hpp b/cpp/src/c_api/induced_subgraph_result.hpp index 6f02a699605..27c175d4bc9 100644 --- a/cpp/src/c_api/induced_subgraph_result.hpp +++ b/cpp/src/c_api/induced_subgraph_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/k_core.cpp b/cpp/src/c_api/k_core.cpp index b15acf3bcd6..d135f7938c6 100644 --- a/cpp/src/c_api/k_core.cpp +++ b/cpp/src/c_api/k_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/core_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/katz.cpp b/cpp/src/c_api/katz.cpp index 952265062b6..9c242fd6b93 100644 --- a/cpp/src/c_api/katz.cpp +++ b/cpp/src/c_api/katz.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/centrality_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/labeling_result.cpp b/cpp/src/c_api/labeling_result.cpp index f4fb3e324fd..72d24e42a3e 100644 --- a/cpp/src/c_api/labeling_result.cpp +++ b/cpp/src/c_api/labeling_result.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/labeling_result.hpp" -#include +#include extern "C" cugraph_type_erased_device_array_view_t* cugraph_labeling_result_get_vertices( cugraph_labeling_result_t* result) diff --git a/cpp/src/c_api/labeling_result.hpp b/cpp/src/c_api/labeling_result.hpp index 4adeb5c3219..47486323b2e 100644 --- a/cpp/src/c_api/labeling_result.hpp +++ b/cpp/src/c_api/labeling_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/legacy_ecg.cpp b/cpp/src/c_api/legacy_ecg.cpp index b8f83734c69..304d9272910 100644 --- a/cpp/src/c_api/legacy_ecg.cpp +++ b/cpp/src/c_api/legacy_ecg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/hierarchical_clustering_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/legacy_k_truss.cpp b/cpp/src/c_api/legacy_k_truss.cpp index 90db9fc133c..a6a1f17f482 100644 --- a/cpp/src/c_api/legacy_k_truss.cpp +++ b/cpp/src/c_api/legacy_k_truss.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/induced_subgraph_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/legacy_spectral.cpp b/cpp/src/c_api/legacy_spectral.cpp index 4b465eebd0f..5df100e698e 100644 --- a/cpp/src/c_api/legacy_spectral.cpp +++ b/cpp/src/c_api/legacy_spectral.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/capi_helper.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/leiden.cpp b/cpp/src/c_api/leiden.cpp index 7b1ca10545c..e26e6d84517 100644 --- a/cpp/src/c_api/leiden.cpp +++ b/cpp/src/c_api/leiden.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/graph_helper.hpp" +#include "c_api/hierarchical_clustering_result.hpp" +#include "c_api/random.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/louvain.cpp b/cpp/src/c_api/louvain.cpp index a131ee6a3ad..99fb97bbf86 100644 --- a/cpp/src/c_api/louvain.cpp +++ b/cpp/src/c_api/louvain.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/graph_helper.hpp" +#include "c_api/hierarchical_clustering_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/pagerank.cpp b/cpp/src/c_api/pagerank.cpp index 50eda152c67..90d999a9197 100644 --- a/cpp/src/c_api/pagerank.cpp +++ b/cpp/src/c_api/pagerank.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/centrality_result.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/paths_result.hpp b/cpp/src/c_api/paths_result.hpp index 257467898af..2b07d600096 100644 --- a/cpp/src/c_api/paths_result.hpp +++ b/cpp/src/c_api/paths_result.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,7 @@ */ #pragma once -#include +#include "c_api/array.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/random.cpp b/cpp/src/c_api/random.cpp index 6cb371c3fac..4b3fa7921a7 100644 --- a/cpp/src/c_api/random.cpp +++ b/cpp/src/c_api/random.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "c_api/random.hpp" + +#include "c_api/abstract_functor.hpp" +#include "c_api/error.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/random_walks.cpp b/cpp/src/c_api/random_walks.cpp index 1af933c86e6..fd340a2c8e3 100644 --- a/cpp/src/c_api/random_walks.cpp +++ b/cpp/src/c_api/random_walks.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/resource_handle.cpp b/cpp/src/c_api/resource_handle.cpp index 75b9537ef49..68f01c4c66e 100644 --- a/cpp/src/c_api/resource_handle.cpp +++ b/cpp/src/c_api/resource_handle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "c_api/resource_handle.hpp" -#include +#include extern "C" cugraph_resource_handle_t* cugraph_create_resource_handle(void* raft_handle) { diff --git a/cpp/src/c_api/similarity.cpp b/cpp/src/c_api/similarity.cpp index 730416abd7b..f456c957f8e 100644 --- a/cpp/src/c_api/similarity.cpp +++ b/cpp/src/c_api/similarity.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/graph_functions.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/sssp.cpp b/cpp/src/c_api/sssp.cpp index 031be637dd5..6e50890e9cd 100644 --- a/cpp/src/c_api/sssp.cpp +++ b/cpp/src/c_api/sssp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/paths_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/strongly_connected_components.cpp b/cpp/src/c_api/strongly_connected_components.cpp index 9e3b4b3a4a3..a5e25ef0d00 100644 --- a/cpp/src/c_api/strongly_connected_components.cpp +++ b/cpp/src/c_api/strongly_connected_components.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/labeling_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/triangle_count.cpp b/cpp/src/c_api/triangle_count.cpp index f5f84adcbeb..38086f3ee8e 100644 --- a/cpp/src/c_api/triangle_count.cpp +++ b/cpp/src/c_api/triangle_count.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/uniform_neighbor_sampling.cpp b/cpp/src/c_api/uniform_neighbor_sampling.cpp index 1a53c899109..44018e088f7 100644 --- a/cpp/src/c_api/uniform_neighbor_sampling.cpp +++ b/cpp/src/c_api/uniform_neighbor_sampling.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/random.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/c_api/utils.hpp b/cpp/src/c_api/utils.hpp index e755035a9d3..1daf7a4478a 100644 --- a/cpp/src/c_api/utils.hpp +++ b/cpp/src/c_api/utils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "c_api/generic_cascaded_dispatch.hpp" +#include "c_api/graph.hpp" namespace cugraph { namespace c_api { diff --git a/cpp/src/c_api/weakly_connected_components.cpp b/cpp/src/c_api/weakly_connected_components.cpp index 49cbed268ad..8744b671298 100644 --- a/cpp/src/c_api/weakly_connected_components.cpp +++ b/cpp/src/c_api/weakly_connected_components.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include "c_api/abstract_functor.hpp" +#include "c_api/graph.hpp" +#include "c_api/labeling_result.hpp" +#include "c_api/resource_handle.hpp" +#include "c_api/utils.hpp" -#include -#include -#include -#include -#include +#include #include #include diff --git a/cpp/src/centrality/betweenness_centrality_impl.cuh b/cpp/src/centrality/betweenness_centrality_impl.cuh index 08907716412..170f45333b9 100644 --- a/cpp/src/centrality/betweenness_centrality_impl.cuh +++ b/cpp/src/centrality/betweenness_centrality_impl.cuh @@ -15,18 +15,18 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_v.cuh" +#include "prims/edge_bucket.cuh" +#include "prims/extract_transform_e.cuh" +#include "prims/extract_transform_v_frontier_outgoing_e.cuh" +#include "prims/fill_edge_property.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/transform_e.cuh" +#include "prims/transform_reduce_v.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include @@ -34,12 +34,12 @@ #include #include +#include + #include #include #include -#include - // // The formula for BC(v) is the sum over all (s,t) where s != v != t of // sigma_st(v) / sigma_st. Sigma_st(v) is the number of shortest paths diff --git a/cpp/src/centrality/betweenness_centrality_mg.cu b/cpp/src/centrality/betweenness_centrality_mg.cu index 2df843c95c9..23f31e64b0b 100644 --- a/cpp/src/centrality/betweenness_centrality_mg.cu +++ b/cpp/src/centrality/betweenness_centrality_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/betweenness_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/centrality/betweenness_centrality_sg.cu b/cpp/src/centrality/betweenness_centrality_sg.cu index 191857ff5dd..e19345df665 100644 --- a/cpp/src/centrality/betweenness_centrality_sg.cu +++ b/cpp/src/centrality/betweenness_centrality_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/betweenness_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/centrality/eigenvector_centrality_impl.cuh b/cpp/src/centrality/eigenvector_centrality_impl.cuh index 2129dca6985..11d82224b7a 100644 --- a/cpp/src/centrality/eigenvector_centrality_impl.cuh +++ b/cpp/src/centrality/eigenvector_centrality_impl.cuh @@ -15,13 +15,13 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_e.cuh" +#include "prims/count_if_v.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/reduce_v.cuh" +#include "prims/transform_reduce_v.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include @@ -30,6 +30,7 @@ #include #include + #include #include diff --git a/cpp/src/centrality/eigenvector_centrality_mg.cu b/cpp/src/centrality/eigenvector_centrality_mg.cu index 394a456b351..4ad942cd690 100644 --- a/cpp/src/centrality/eigenvector_centrality_mg.cu +++ b/cpp/src/centrality/eigenvector_centrality_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/eigenvector_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/centrality/eigenvector_centrality_sg.cu b/cpp/src/centrality/eigenvector_centrality_sg.cu index 754c6b108e4..e3be04406b7 100644 --- a/cpp/src/centrality/eigenvector_centrality_sg.cu +++ b/cpp/src/centrality/eigenvector_centrality_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/eigenvector_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/centrality/katz_centrality_impl.cuh b/cpp/src/centrality/katz_centrality_impl.cuh index ac31043d862..0b5684b8d2e 100644 --- a/cpp/src/centrality/katz_centrality_impl.cuh +++ b/cpp/src/centrality/katz_centrality_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include "prims/count_if_v.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_v.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/src/centrality/katz_centrality_mg.cu b/cpp/src/centrality/katz_centrality_mg.cu index b7b3b0a2f6e..67fcf028616 100644 --- a/cpp/src/centrality/katz_centrality_mg.cu +++ b/cpp/src/centrality/katz_centrality_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/katz_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/centrality/katz_centrality_sg.cu b/cpp/src/centrality/katz_centrality_sg.cu index 22b7a79b1d8..d36038ee025 100644 --- a/cpp/src/centrality/katz_centrality_sg.cu +++ b/cpp/src/centrality/katz_centrality_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "centrality/katz_centrality_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/detail/common_methods.cuh b/cpp/src/community/detail/common_methods.cuh index f67d4d939ad..fe0a415db30 100644 --- a/cpp/src/community/detail/common_methods.cuh +++ b/cpp/src/community/detail/common_methods.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,17 +15,16 @@ */ #pragma once -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "common_methods.hpp" +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" +#include "prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_e.cuh" +#include "prims/transform_reduce_e_by_src_dst_key.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "utilities/collect_comm.cuh" #include #include diff --git a/cpp/src/community/detail/common_methods.hpp b/cpp/src/community/detail/common_methods.hpp index 62aded12cd3..8a74dd4eed9 100644 --- a/cpp/src/community/detail/common_methods.hpp +++ b/cpp/src/community/detail/common_methods.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #endif #include + #include namespace cugraph { diff --git a/cpp/src/community/detail/common_methods_mg.cu b/cpp/src/community/detail/common_methods_mg.cu index f053e32eb32..980c00993a4 100644 --- a/cpp/src/community/detail/common_methods_mg.cu +++ b/cpp/src/community/detail/common_methods_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/detail/common_methods.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/community/detail/common_methods_sg.cu b/cpp/src/community/detail/common_methods_sg.cu index 59da571f0c7..21e867df4b4 100644 --- a/cpp/src/community/detail/common_methods_sg.cu +++ b/cpp/src/community/detail/common_methods_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/detail/common_methods.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/community/detail/mis_impl.cuh b/cpp/src/community/detail/mis_impl.cuh index 2659a982183..217d64eb1c1 100644 --- a/cpp/src/community/detail/mis_impl.cuh +++ b/cpp/src/community/detail/mis_impl.cuh @@ -1,6 +1,6 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ */ #pragma once -#include -#include -#include -#include +#include "community/mis.hpp" +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -37,8 +38,6 @@ #include #include -#include - #include namespace cugraph { diff --git a/cpp/src/community/detail/mis_mg.cu b/cpp/src/community/detail/mis_mg.cu index 8ff0ed4b395..0fc5eeb63c0 100644 --- a/cpp/src/community/detail/mis_mg.cu +++ b/cpp/src/community/detail/mis_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "mis_impl.cuh" namespace cugraph { template rmm::device_uvector maximal_independent_set( diff --git a/cpp/src/community/detail/mis_sg.cu b/cpp/src/community/detail/mis_sg.cu index d1012ae17bb..8a20b31d157 100644 --- a/cpp/src/community/detail/mis_sg.cu +++ b/cpp/src/community/detail/mis_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "mis_impl.cuh" namespace cugraph { template rmm::device_uvector maximal_independent_set( diff --git a/cpp/src/community/detail/refine.hpp b/cpp/src/community/detail/refine.hpp index 69b6702edf8..a60efee887f 100644 --- a/cpp/src/community/detail/refine.hpp +++ b/cpp/src/community/detail/refine.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include + #include namespace cugraph { diff --git a/cpp/src/community/detail/refine_impl.cuh b/cpp/src/community/detail/refine_impl.cuh index c8ba8163ab2..b767ce7d8bb 100644 --- a/cpp/src/community/detail/refine_impl.cuh +++ b/cpp/src/community/detail/refine_impl.cuh @@ -15,22 +15,24 @@ */ #pragma once -#include -#include +#include "common_methods.hpp" +#include "community/mis.hpp" +#include "detail/graph_partition_utils.cuh" +#include "prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_e.cuh" +#include "prims/transform_reduce_e_by_src_dst_key.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "utilities/collect_comm.cuh" + #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include #include #include @@ -46,8 +48,6 @@ #include #include -#include - CUCO_DECLARE_BITWISE_COMPARABLE(float) CUCO_DECLARE_BITWISE_COMPARABLE(double) // FIXME: a temporary workaround for a compiler error, should be deleted once cuco gets patched. diff --git a/cpp/src/community/detail/refine_mg.cu b/cpp/src/community/detail/refine_mg.cu index 85b4a150e84..946c18de2c5 100644 --- a/cpp/src/community/detail/refine_mg.cu +++ b/cpp/src/community/detail/refine_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/detail/refine_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/community/detail/refine_sg.cu b/cpp/src/community/detail/refine_sg.cu index 140a23b7d53..af4327b44e2 100644 --- a/cpp/src/community/detail/refine_sg.cu +++ b/cpp/src/community/detail/refine_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/detail/refine_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/community/ecg_impl.cuh b/cpp/src/community/ecg_impl.cuh index f885952dfe6..2698f3cad4d 100644 --- a/cpp/src/community/ecg_impl.cuh +++ b/cpp/src/community/ecg_impl.cuh @@ -16,11 +16,11 @@ #pragma once -#include -#include -#include +#include "community/detail/common_methods.hpp" +#include "prims/fill_edge_property.cuh" +#include "prims/transform_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" -#include #include #include #include @@ -28,6 +28,7 @@ #include #include + #include namespace cugraph { diff --git a/cpp/src/community/ecg_mg.cu b/cpp/src/community/ecg_mg.cu index 9c910c70739..d9ba8fe18f2 100644 --- a/cpp/src/community/ecg_mg.cu +++ b/cpp/src/community/ecg_mg.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/ecg_impl.cuh" namespace cugraph { template std::tuple, size_t, float> ecg( diff --git a/cpp/src/community/ecg_sg.cu b/cpp/src/community/ecg_sg.cu index 530fb035ed5..8c4054aa10f 100644 --- a/cpp/src/community/ecg_sg.cu +++ b/cpp/src/community/ecg_sg.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/ecg_impl.cuh" namespace cugraph { template std::tuple, size_t, float> ecg( diff --git a/cpp/src/community/egonet_impl.cuh b/cpp/src/community/egonet_impl.cuh index 5cbb0b5e4b6..8b942be5b6a 100644 --- a/cpp/src/community/egonet_impl.cuh +++ b/cpp/src/community/egonet_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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 @@ // #define TIMING -#include +#include "utilities/graph_utils.cuh" #include #include @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -42,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/cpp/src/community/egonet_mg.cu b/cpp/src/community/egonet_mg.cu index 00db537d84a..6cf9fb2d13b 100644 --- a/cpp/src/community/egonet_mg.cu +++ b/cpp/src/community/egonet_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/egonet_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/egonet_sg.cu b/cpp/src/community/egonet_sg.cu index 32860d844cd..c53f41334ea 100644 --- a/cpp/src/community/egonet_sg.cu +++ b/cpp/src/community/egonet_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "community/egonet_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/flatten_dendrogram.hpp b/cpp/src/community/flatten_dendrogram.hpp index a4299f17d52..83aaf389612 100644 --- a/cpp/src/community/flatten_dendrogram.hpp +++ b/cpp/src/community/flatten_dendrogram.hpp @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/src/community/legacy/ecg.cu b/cpp/src/community/legacy/ecg.cu index 78c3412f16a..d93a4446faa 100644 --- a/cpp/src/community/legacy/ecg.cu +++ b/cpp/src/community/legacy/ecg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,14 @@ * limitations under the License. */ -#include +#include "community/legacy/louvain.cuh" +#include "utilities/graph_utils.cuh" + #include #include -#include #include + #include #include #include diff --git a/cpp/src/community/legacy/ktruss.cu b/cpp/src/community/legacy/ktruss.cu index 403593128c1..38b68eb1947 100644 --- a/cpp/src/community/legacy/ktruss.cu +++ b/cpp/src/community/legacy/ktruss.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ * @file ktruss.cu * --------------------------------------------------------------------------*/ +#include #include -#include "Static/KTruss/KTruss.cuh" #include #include -#include +#include using namespace hornets_nest; diff --git a/cpp/src/community/legacy/louvain.cu b/cpp/src/community/legacy/louvain.cu index 679aa93a5b4..d725ecc3dd1 100644 --- a/cpp/src/community/legacy/louvain.cu +++ b/cpp/src/community/legacy/louvain.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,9 @@ * limitations under the License. */ -#include -#include +#include "community/flatten_dendrogram.hpp" +#include "community/legacy/louvain.cuh" + #include #include diff --git a/cpp/src/community/legacy/louvain.cuh b/cpp/src/community/legacy/louvain.cuh index 063676a909a..6cf5bbdc3c6 100644 --- a/cpp/src/community/legacy/louvain.cuh +++ b/cpp/src/community/legacy/louvain.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,12 +17,11 @@ // #define TIMING -#include - -#include -#include +#include "converters/legacy/COOtoCSR.cuh" +#include "utilities/graph_utils.cuh" #include +#include #ifdef TIMING #include #endif diff --git a/cpp/src/community/legacy/spectral_clustering.cu b/cpp/src/community/legacy/spectral_clustering.cu index 84e9891b7ce..f6d92df691b 100644 --- a/cpp/src/community/legacy/spectral_clustering.cu +++ b/cpp/src/community/legacy/spectral_clustering.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,18 +15,19 @@ */ #include - -#include -#include -#include -#include - #include #include #include #include +#include +#include + +#include + +#include + namespace cugraph { namespace ext_raft { diff --git a/cpp/src/community/leiden_impl.cuh b/cpp/src/community/leiden_impl.cuh index 1e2b8f2ad44..499724583a9 100644 --- a/cpp/src/community/leiden_impl.cuh +++ b/cpp/src/community/leiden_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include "community/detail/common_methods.hpp" +#include "community/detail/refine.hpp" +#include "community/flatten_dendrogram.hpp" +#include "prims/update_edge_src_dst_property.cuh" #include #include diff --git a/cpp/src/community/leiden_mg.cu b/cpp/src/community/leiden_mg.cu index d74e004927b..63e46d02221 100644 --- a/cpp/src/community/leiden_mg.cu +++ b/cpp/src/community/leiden_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/leiden_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/leiden_sg.cu b/cpp/src/community/leiden_sg.cu index bc1b4e6cff5..85e0d9d4673 100644 --- a/cpp/src/community/leiden_sg.cu +++ b/cpp/src/community/leiden_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/leiden_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/louvain_impl.cuh b/cpp/src/community/louvain_impl.cuh index 4919dda5a75..2c524e9dfb8 100644 --- a/cpp/src/community/louvain_impl.cuh +++ b/cpp/src/community/louvain_impl.cuh @@ -19,10 +19,10 @@ // #define TIMING // FIXME: Only outstanding items preventing this becoming a .hpp file -#include +#include "community/detail/common_methods.hpp" +#include "community/flatten_dendrogram.hpp" +#include "prims/update_edge_src_dst_property.cuh" -#include -#include #include #include #include @@ -30,6 +30,7 @@ #include #include + #include namespace cugraph { diff --git a/cpp/src/community/louvain_mg.cu b/cpp/src/community/louvain_mg.cu index 51fb5e3d93d..e6a609ce87c 100644 --- a/cpp/src/community/louvain_mg.cu +++ b/cpp/src/community/louvain_mg.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/louvain_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/louvain_sg.cu b/cpp/src/community/louvain_sg.cu index 557c219d424..9a775684ab3 100644 --- a/cpp/src/community/louvain_sg.cu +++ b/cpp/src/community/louvain_sg.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/louvain_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/mis.hpp b/cpp/src/community/mis.hpp index 3f1e655c0c4..83c0d9775f9 100644 --- a/cpp/src/community/mis.hpp +++ b/cpp/src/community/mis.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include #include + #include namespace cugraph { diff --git a/cpp/src/community/triangle_count_impl.cuh b/cpp/src/community/triangle_count_impl.cuh index 96874041db6..1c7716e6883 100644 --- a/cpp/src/community/triangle_count_impl.cuh +++ b/cpp/src/community/triangle_count_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "prims/extract_transform_e.cuh" +#include "prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include diff --git a/cpp/src/community/triangle_count_mg.cu b/cpp/src/community/triangle_count_mg.cu index c863fe3c20f..299f3390003 100644 --- a/cpp/src/community/triangle_count_mg.cu +++ b/cpp/src/community/triangle_count_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/triangle_count_impl.cuh" namespace cugraph { diff --git a/cpp/src/community/triangle_count_sg.cu b/cpp/src/community/triangle_count_sg.cu index ab46dee0b15..481ac099c6c 100644 --- a/cpp/src/community/triangle_count_sg.cu +++ b/cpp/src/community/triangle_count_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "community/triangle_count_impl.cuh" namespace cugraph { diff --git a/cpp/src/components/legacy/connectivity.cu b/cpp/src/components/legacy/connectivity.cu index 16e6da56e0d..ecaaab173db 100644 --- a/cpp/src/components/legacy/connectivity.cu +++ b/cpp/src/components/legacy/connectivity.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, 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,10 +15,9 @@ */ #include "scc_matrix.cuh" +#include "utilities/graph_utils.cuh" #include "weak_cc.cuh" -#include - #include #include #include diff --git a/cpp/src/components/legacy/utils.h b/cpp/src/components/legacy/utils.h index b025b352ae4..b7c6f42a169 100644 --- a/cpp/src/components/legacy/utils.h +++ b/cpp/src/components/legacy/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,21 @@ #pragma once -#include +#include + +#include + #include + #include + +#include #include #include #include #include #include -#include - -#include - namespace MLCommon { /** base exception class for the cuML or ml-prims project */ diff --git a/cpp/src/components/legacy/weak_cc.cuh b/cpp/src/components/legacy/weak_cc.cuh index ef301473379..ad9aa773590 100644 --- a/cpp/src/components/legacy/weak_cc.cuh +++ b/cpp/src/components/legacy/weak_cc.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, 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,23 +15,25 @@ */ #pragma once +#include "utils.h" + +#include +#include + +#include + #include #include #include #include + #include #include #include #include -#include -#include - -#include "utils.h" -#include - namespace MLCommon { /** diff --git a/cpp/src/components/weakly_connected_components_impl.cuh b/cpp/src/components/weakly_connected_components_impl.cuh index b7b6e139cfa..d4d6d842951 100644 --- a/cpp/src/components/weakly_connected_components_impl.cuh +++ b/cpp/src/components/weakly_connected_components_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include @@ -31,6 +31,7 @@ #include #include + #include #include diff --git a/cpp/src/components/weakly_connected_components_mg.cu b/cpp/src/components/weakly_connected_components_mg.cu index 0702da8d54b..ba9298d7f11 100644 --- a/cpp/src/components/weakly_connected_components_mg.cu +++ b/cpp/src/components/weakly_connected_components_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "components/weakly_connected_components_impl.cuh" namespace cugraph { diff --git a/cpp/src/components/weakly_connected_components_sg.cu b/cpp/src/components/weakly_connected_components_sg.cu index 836281102a4..3aad0e6a3a2 100644 --- a/cpp/src/components/weakly_connected_components_sg.cu +++ b/cpp/src/components/weakly_connected_components_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "components/weakly_connected_components_impl.cuh" namespace cugraph { diff --git a/cpp/src/converters/legacy/COOtoCSR.cuh b/cpp/src/converters/legacy/COOtoCSR.cuh index 09f3d131b8e..d2fc9fb2cc2 100644 --- a/cpp/src/converters/legacy/COOtoCSR.cuh +++ b/cpp/src/converters/legacy/COOtoCSR.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,14 @@ #pragma once -#include +#include +#include +#include + +#include + +#include +#include #include #include #include @@ -35,15 +42,7 @@ #include #include -#include -#include - -#include -#include - -#include - -#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/cores/core_number_impl.cuh b/cpp/src/cores/core_number_impl.cuh index ea8e2a9c4ee..8c9234d6f7d 100644 --- a/cpp/src/cores/core_number_impl.cuh +++ b/cpp/src/cores/core_number_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include "prims/reduce_v.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include diff --git a/cpp/src/cores/core_number_mg.cu b/cpp/src/cores/core_number_mg.cu index f483198ece0..662fa9f3853 100644 --- a/cpp/src/cores/core_number_mg.cu +++ b/cpp/src/cores/core_number_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "cores/core_number_impl.cuh" namespace cugraph { diff --git a/cpp/src/cores/core_number_sg.cu b/cpp/src/cores/core_number_sg.cu index 5ebac9d0624..94c270aa5c9 100644 --- a/cpp/src/cores/core_number_sg.cu +++ b/cpp/src/cores/core_number_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "cores/core_number_impl.cuh" namespace cugraph { diff --git a/cpp/src/cores/k_core_mg.cu b/cpp/src/cores/k_core_mg.cu index e07c5e83cd3..b797a4454cb 100644 --- a/cpp/src/cores/k_core_mg.cu +++ b/cpp/src/cores/k_core_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "cores/k_core_impl.cuh" namespace cugraph { diff --git a/cpp/src/cores/k_core_sg.cu b/cpp/src/cores/k_core_sg.cu index b45bfd32d30..d61c8f8d196 100644 --- a/cpp/src/cores/k_core_sg.cu +++ b/cpp/src/cores/k_core_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "cores/k_core_impl.cuh" namespace cugraph { diff --git a/cpp/src/detail/collect_comm_wrapper.cu b/cpp/src/detail/collect_comm_wrapper.cu index 7ce2241c677..20bb1409a54 100644 --- a/cpp/src/detail/collect_comm_wrapper.cu +++ b/cpp/src/detail/collect_comm_wrapper.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include +#include "c_api/capi_helper.hpp" +#include "structure/detail/structure_utils.cuh" +#include "utilities/collect_comm.cuh" #include #include -#include #include #include diff --git a/cpp/src/detail/collect_local_vertex_values.cu b/cpp/src/detail/collect_local_vertex_values.cu index 795902dfd87..2726e33b922 100644 --- a/cpp/src/detail/collect_local_vertex_values.cu +++ b/cpp/src/detail/collect_local_vertex_values.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "detail/graph_partition_utils.cuh" #include #include diff --git a/cpp/src/detail/graph_partition_utils.cuh b/cpp/src/detail/graph_partition_utils.cuh index 67574719b45..957436459cd 100644 --- a/cpp/src/detail/graph_partition_utils.cuh +++ b/cpp/src/detail/graph_partition_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -27,6 +26,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/src/detail/groupby_and_count.cu b/cpp/src/detail/groupby_and_count.cu index cbb37f76207..81557153e9c 100644 --- a/cpp/src/detail/groupby_and_count.cu +++ b/cpp/src/detail/groupby_and_count.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "detail/graph_partition_utils.cuh" #include #include diff --git a/cpp/src/detail/shuffle_vertex_pairs.cu b/cpp/src/detail/shuffle_vertex_pairs.cu index eb81e21c017..33a7834f5ff 100644 --- a/cpp/src/detail/shuffle_vertex_pairs.cu +++ b/cpp/src/detail/shuffle_vertex_pairs.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "detail/graph_partition_utils.cuh" #include #include diff --git a/cpp/src/detail/shuffle_vertices.cu b/cpp/src/detail/shuffle_vertices.cu index 94729a770f7..be6875f1073 100644 --- a/cpp/src/detail/shuffle_vertices.cu +++ b/cpp/src/detail/shuffle_vertices.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "detail/graph_partition_utils.cuh" #include #include diff --git a/cpp/src/generators/erdos_renyi_generator.cu b/cpp/src/generators/erdos_renyi_generator.cu index 8448eeaf960..db4de177331 100644 --- a/cpp/src/generators/erdos_renyi_generator.cu +++ b/cpp/src/generators/erdos_renyi_generator.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include +#include #include #include #include @@ -28,8 +29,6 @@ #include #include -#include - namespace cugraph { template diff --git a/cpp/src/generators/generate_bipartite_rmat_edgelist.cu b/cpp/src/generators/generate_bipartite_rmat_edgelist.cu index c02e1a7e7fa..bb284b588a5 100644 --- a/cpp/src/generators/generate_bipartite_rmat_edgelist.cu +++ b/cpp/src/generators/generate_bipartite_rmat_edgelist.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -28,7 +29,6 @@ #include #include -#include #include namespace cugraph { diff --git a/cpp/src/generators/generate_rmat_edgelist.cu b/cpp/src/generators/generate_rmat_edgelist.cu index bcafd2661d5..82f992a8fcd 100644 --- a/cpp/src/generators/generate_rmat_edgelist.cu +++ b/cpp/src/generators/generate_rmat_edgelist.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -28,7 +29,6 @@ #include #include -#include #include namespace cugraph { diff --git a/cpp/src/generators/generator_tools.cu b/cpp/src/generators/generator_tools.cu index 1650d3c15c6..f2ca48c4c43 100644 --- a/cpp/src/generators/generator_tools.cu +++ b/cpp/src/generators/generator_tools.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "generators/scramble.cuh" + #include #include -#include #include diff --git a/cpp/src/generators/simple_generators.cu b/cpp/src/generators/simple_generators.cu index 65647be5de0..a6de94f5fa0 100644 --- a/cpp/src/generators/simple_generators.cu +++ b/cpp/src/generators/simple_generators.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,10 @@ #include #include + #include +#include #include #include #include @@ -27,8 +29,6 @@ #include #include -#include - #include namespace cugraph { diff --git a/cpp/src/layout/legacy/barnes_hut.cuh b/cpp/src/layout/legacy/barnes_hut.cuh index 6c56797a55b..fa6d3816417 100644 --- a/cpp/src/layout/legacy/barnes_hut.cuh +++ b/cpp/src/layout/legacy/barnes_hut.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,12 +17,11 @@ #pragma once #include "bh_kernels.cuh" +#include "converters/legacy/COOtoCSR.cuh" #include "fa2_kernels.cuh" +#include "utilities/graph_utils.cuh" #include "utils.hpp" -#include -#include - #include #include #include diff --git a/cpp/src/layout/legacy/exact_fa2.cuh b/cpp/src/layout/legacy/exact_fa2.cuh index 3652f5827cf..479944cee6e 100644 --- a/cpp/src/layout/legacy/exact_fa2.cuh +++ b/cpp/src/layout/legacy/exact_fa2.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,23 +16,22 @@ #pragma once -#include -#include - -#include +#include "converters/legacy/COOtoCSR.cuh" +#include "exact_repulsion.cuh" +#include "fa2_kernels.cuh" +#include "utils.hpp" #include #include #include #include +#include +#include + #include #include -#include "exact_repulsion.cuh" -#include "fa2_kernels.cuh" -#include "utils.hpp" - namespace cugraph { namespace detail { diff --git a/cpp/src/layout/legacy/fa2_kernels.cuh b/cpp/src/layout/legacy/fa2_kernels.cuh index e33111e8a99..4f1ce520387 100644 --- a/cpp/src/layout/legacy/fa2_kernels.cuh +++ b/cpp/src/layout/legacy/fa2_kernels.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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 #define restrict __restrict__ -#include +#include "utilities/graph_utils.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/link_analysis/hits_impl.cuh b/cpp/src/link_analysis/hits_impl.cuh index 5cdf1b9dc6a..028b1ae050d 100644 --- a/cpp/src/link_analysis/hits_impl.cuh +++ b/cpp/src/link_analysis/hits_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,13 +15,13 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_v.cuh" +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/reduce_v.cuh" +#include "prims/transform_reduce_v.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include diff --git a/cpp/src/link_analysis/hits_mg.cu b/cpp/src/link_analysis/hits_mg.cu index fad475d3fc1..ae1295a9c3b 100644 --- a/cpp/src/link_analysis/hits_mg.cu +++ b/cpp/src/link_analysis/hits_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "link_analysis/hits_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_analysis/hits_sg.cu b/cpp/src/link_analysis/hits_sg.cu index 1f1b04b65b0..21bfcea143e 100644 --- a/cpp/src/link_analysis/hits_sg.cu +++ b/cpp/src/link_analysis/hits_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "link_analysis/hits_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_analysis/pagerank_impl.cuh b/cpp/src/link_analysis/pagerank_impl.cuh index 9a76ba73f92..570ee73c49e 100644 --- a/cpp/src/link_analysis/pagerank_impl.cuh +++ b/cpp/src/link_analysis/pagerank_impl.cuh @@ -15,13 +15,13 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_e.cuh" +#include "prims/count_if_v.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/reduce_v.cuh" +#include "prims/transform_reduce_v.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include @@ -31,6 +31,7 @@ #include #include + #include #include diff --git a/cpp/src/link_analysis/pagerank_mg.cu b/cpp/src/link_analysis/pagerank_mg.cu index dc9892f69a8..136c8355817 100644 --- a/cpp/src/link_analysis/pagerank_mg.cu +++ b/cpp/src/link_analysis/pagerank_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_analysis/pagerank_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_analysis/pagerank_sg.cu b/cpp/src/link_analysis/pagerank_sg.cu index 51d123fe337..3156ebb8c9b 100644 --- a/cpp/src/link_analysis/pagerank_sg.cu +++ b/cpp/src/link_analysis/pagerank_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_analysis/pagerank_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/jaccard_impl.cuh b/cpp/src/link_prediction/jaccard_impl.cuh index bd4e2d5e58e..bdc80f4f6ac 100644 --- a/cpp/src/link_prediction/jaccard_impl.cuh +++ b/cpp/src/link_prediction/jaccard_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,8 +15,9 @@ */ #pragma once +#include "link_prediction/similarity_impl.cuh" + #include -#include #include diff --git a/cpp/src/link_prediction/jaccard_mg.cu b/cpp/src/link_prediction/jaccard_mg.cu index 3207e2a8d6f..8e91bb9f3e1 100644 --- a/cpp/src/link_prediction/jaccard_mg.cu +++ b/cpp/src/link_prediction/jaccard_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/jaccard_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/jaccard_sg.cu b/cpp/src/link_prediction/jaccard_sg.cu index 74d5b3d429e..e25d2d72d3b 100644 --- a/cpp/src/link_prediction/jaccard_sg.cu +++ b/cpp/src/link_prediction/jaccard_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/jaccard_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/overlap_impl.cuh b/cpp/src/link_prediction/overlap_impl.cuh index 1810df2f76b..95542a83ff5 100644 --- a/cpp/src/link_prediction/overlap_impl.cuh +++ b/cpp/src/link_prediction/overlap_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,8 +15,9 @@ */ #pragma once +#include "link_prediction/similarity_impl.cuh" + #include -#include #include diff --git a/cpp/src/link_prediction/overlap_mg.cu b/cpp/src/link_prediction/overlap_mg.cu index bbc464375ba..54f7912aa14 100644 --- a/cpp/src/link_prediction/overlap_mg.cu +++ b/cpp/src/link_prediction/overlap_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/overlap_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/overlap_sg.cu b/cpp/src/link_prediction/overlap_sg.cu index ac3a3bc7d2b..1b169570e57 100644 --- a/cpp/src/link_prediction/overlap_sg.cu +++ b/cpp/src/link_prediction/overlap_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/overlap_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/similarity_impl.cuh b/cpp/src/link_prediction/similarity_impl.cuh index 7ac294d7719..4344262e453 100644 --- a/cpp/src/link_prediction/similarity_impl.cuh +++ b/cpp/src/link_prediction/similarity_impl.cuh @@ -15,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include "prims/count_if_e.cuh" +#include "prims/per_v_pair_transform_dst_nbr_intersection.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "utilities/error_check_utils.cuh" #include #include diff --git a/cpp/src/link_prediction/sorensen_impl.cuh b/cpp/src/link_prediction/sorensen_impl.cuh index 00c9a8107f3..994d824b849 100644 --- a/cpp/src/link_prediction/sorensen_impl.cuh +++ b/cpp/src/link_prediction/sorensen_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,8 +15,9 @@ */ #pragma once +#include "link_prediction/similarity_impl.cuh" + #include -#include #include diff --git a/cpp/src/link_prediction/sorensen_mg.cu b/cpp/src/link_prediction/sorensen_mg.cu index 68e976fb114..0a67a871b87 100644 --- a/cpp/src/link_prediction/sorensen_mg.cu +++ b/cpp/src/link_prediction/sorensen_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/sorensen_impl.cuh" namespace cugraph { diff --git a/cpp/src/link_prediction/sorensen_sg.cu b/cpp/src/link_prediction/sorensen_sg.cu index 3eaf1d7c84f..2edfb92bb0f 100644 --- a/cpp/src/link_prediction/sorensen_sg.cu +++ b/cpp/src/link_prediction/sorensen_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "link_prediction/sorensen_impl.cuh" namespace cugraph { diff --git a/cpp/src/mtmg/vertex_result.cu b/cpp/src/mtmg/vertex_result.cu index 414f1bdfa88..0339ff10d0a 100644 --- a/cpp/src/mtmg/vertex_result.cu +++ b/cpp/src/mtmg/vertex_result.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "detail/graph_partition_utils.cuh" + #include #include #include #include -#include - #include #include diff --git a/cpp/src/prims/count_if_e.cuh b/cpp/src/prims/count_if_e.cuh index 9cff4f5eceb..8034c3e07eb 100644 --- a/cpp/src/prims/count_if_e.cuh +++ b/cpp/src/prims/count_if_e.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "prims/property_op_utils.cuh" +#include "prims/transform_reduce_e.cuh" #include diff --git a/cpp/src/prims/count_if_v.cuh b/cpp/src/prims/count_if_v.cuh index 6d40a32b582..410bea44c24 100644 --- a/cpp/src/prims/count_if_v.cuh +++ b/cpp/src/prims/count_if_v.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/detail/extract_transform_v_frontier_e.cuh b/cpp/src/prims/detail/extract_transform_v_frontier_e.cuh index 608a824c57e..fc3da3cac07 100644 --- a/cpp/src/prims/detail/extract_transform_v_frontier_e.cuh +++ b/cpp/src/prims/detail/extract_transform_v_frontier_e.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "prims/detail/optional_dataframe_buffer.hpp" +#include "prims/detail/prim_functors.cuh" +#include "prims/property_op_utils.cuh" #include #include @@ -33,6 +33,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/detail/nbr_intersection.cuh b/cpp/src/prims/detail/nbr_intersection.cuh index e3453ffdec5..e0a04eb59da 100644 --- a/cpp/src/prims/detail/nbr_intersection.cuh +++ b/cpp/src/prims/detail/nbr_intersection.cuh @@ -15,9 +15,10 @@ */ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/detail/optional_dataframe_buffer.hpp" +#include "prims/kv_store.cuh" +#include "utilities/error_check_utils.cuh" #include #include @@ -31,6 +32,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/edge_bucket.cuh b/cpp/src/prims/edge_bucket.cuh index e23ffb22bc5..9fbf47c3288 100644 --- a/cpp/src/prims/edge_bucket.cuh +++ b/cpp/src/prims/edge_bucket.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/extract_transform_e.cuh b/cpp/src/prims/extract_transform_e.cuh index 25e04fff83a..5741c98d90e 100644 --- a/cpp/src/prims/extract_transform_e.cuh +++ b/cpp/src/prims/extract_transform_e.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "prims/detail/extract_transform_v_frontier_e.cuh" +#include "prims/property_op_utils.cuh" +#include "prims/vertex_frontier.cuh" #include #include diff --git a/cpp/src/prims/extract_transform_v_frontier_outgoing_e.cuh b/cpp/src/prims/extract_transform_v_frontier_outgoing_e.cuh index f3b85da53ea..b9c63481420 100644 --- a/cpp/src/prims/extract_transform_v_frontier_outgoing_e.cuh +++ b/cpp/src/prims/extract_transform_v_frontier_outgoing_e.cuh @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include "prims/detail/extract_transform_v_frontier_e.cuh" +#include "prims/property_op_utils.cuh" #include #include diff --git a/cpp/src/prims/fill_edge_property.cuh b/cpp/src/prims/fill_edge_property.cuh index e6875576044..161ec623287 100644 --- a/cpp/src/prims/fill_edge_property.cuh +++ b/cpp/src/prims/fill_edge_property.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/fill_edge_src_dst_property.cuh b/cpp/src/prims/fill_edge_src_dst_property.cuh index 5a7fe6b5044..152de3f8d4a 100644 --- a/cpp/src/prims/fill_edge_src_dst_property.cuh +++ b/cpp/src/prims/fill_edge_src_dst_property.cuh @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/key_store.cuh b/cpp/src/prims/key_store.cuh index 907ca36ef4a..faa7e99bfcd 100644 --- a/cpp/src/prims/key_store.cuh +++ b/cpp/src/prims/key_store.cuh @@ -15,7 +15,6 @@ */ #pragma once -#include #include #include @@ -26,6 +25,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/src/prims/kv_store.cuh b/cpp/src/prims/kv_store.cuh index be4fde2fbff..4c728d58930 100644 --- a/cpp/src/prims/kv_store.cuh +++ b/cpp/src/prims/kv_store.cuh @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -35,6 +34,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/src/prims/per_v_pair_transform_dst_nbr_intersection.cuh b/cpp/src/prims/per_v_pair_transform_dst_nbr_intersection.cuh index 469bfcb4e47..ce5e5d3e8cf 100644 --- a/cpp/src/prims/per_v_pair_transform_dst_nbr_intersection.cuh +++ b/cpp/src/prims/per_v_pair_transform_dst_nbr_intersection.cuh @@ -15,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/detail/nbr_intersection.cuh" +#include "prims/property_op_utils.cuh" +#include "utilities/collect_comm.cuh" +#include "utilities/error_check_utils.cuh" #include #include @@ -29,6 +29,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/per_v_random_select_transform_outgoing_e.cuh b/cpp/src/prims/per_v_random_select_transform_outgoing_e.cuh index 4c5c43c7d1e..46106a5b670 100644 --- a/cpp/src/prims/per_v_random_select_transform_outgoing_e.cuh +++ b/cpp/src/prims/per_v_random_select_transform_outgoing_e.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,7 @@ */ #pragma once -#include +#include "prims/property_op_utils.cuh" #include #include @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -44,8 +45,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh b/cpp/src/prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh index d4f8606257e..8e627392555 100644 --- a/cpp/src/prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh +++ b/cpp/src/prims/per_v_transform_reduce_dst_key_aggregated_outgoing_e.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" +#include "utilities/collect_comm.cuh" #include #include @@ -34,6 +34,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/per_v_transform_reduce_incoming_outgoing_e.cuh b/cpp/src/prims/per_v_transform_reduce_incoming_outgoing_e.cuh index c519d8aefed..083487fa5b4 100644 --- a/cpp/src/prims/per_v_transform_reduce_incoming_outgoing_e.cuh +++ b/cpp/src/prims/per_v_transform_reduce_incoming_outgoing_e.cuh @@ -15,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/detail/prim_functors.cuh" +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/property_op_utils.cuh" +#include "prims/reduce_op.cuh" #include #include @@ -36,9 +36,11 @@ #include #include #include + #include #include +#include #include #include #include @@ -52,8 +54,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/prims/reduce_op.cuh b/cpp/src/prims/reduce_op.cuh index 922f2d7be0d..0612223a545 100644 --- a/cpp/src/prims/reduce_op.cuh +++ b/cpp/src/prims/reduce_op.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "prims/property_op_utils.cuh" #include #include diff --git a/cpp/src/prims/reduce_v.cuh b/cpp/src/prims/reduce_v.cuh index 89e474e76c3..19ca5f09e4c 100644 --- a/cpp/src/prims/reduce_v.cuh +++ b/cpp/src/prims/reduce_v.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,14 +15,15 @@ */ #pragma once -#include -#include +#include "prims/property_op_utils.cuh" +#include "prims/reduce_op.cuh" #include #include #include #include + #include #include diff --git a/cpp/src/prims/transform_e.cuh b/cpp/src/prims/transform_e.cuh index c4b4b8d3745..a34a5a04b49 100644 --- a/cpp/src/prims/transform_e.cuh +++ b/cpp/src/prims/transform_e.cuh @@ -25,6 +25,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh b/cpp/src/prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh index bcf7606c423..b63b014ed05 100644 --- a/cpp/src/prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh +++ b/cpp/src/prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/detail/nbr_intersection.cuh" +#include "prims/property_op_utils.cuh" #include #include @@ -28,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/transform_reduce_e.cuh b/cpp/src/prims/transform_reduce_e.cuh index 109d10a8b1c..e5855b105ee 100644 --- a/cpp/src/prims/transform_reduce_e.cuh +++ b/cpp/src/prims/transform_reduce_e.cuh @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include "prims/detail/prim_functors.cuh" +#include "prims/property_op_utils.cuh" #include #include @@ -32,6 +32,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/transform_reduce_e_by_src_dst_key.cuh b/cpp/src/prims/transform_reduce_e_by_src_dst_key.cuh index 77bf195b4d7..42203085077 100644 --- a/cpp/src/prims/transform_reduce_e_by_src_dst_key.cuh +++ b/cpp/src/prims/transform_reduce_e_by_src_dst_key.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/property_op_utils.cuh" #include #include diff --git a/cpp/src/prims/transform_reduce_v.cuh b/cpp/src/prims/transform_reduce_v.cuh index 2172bc697e3..08764dabe8a 100644 --- a/cpp/src/prims/transform_reduce_v.cuh +++ b/cpp/src/prims/transform_reduce_v.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "prims/property_op_utils.cuh" +#include "prims/reduce_v.cuh" #include #include diff --git a/cpp/src/prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh b/cpp/src/prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh index 0315b3808e0..70787abeffb 100644 --- a/cpp/src/prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh +++ b/cpp/src/prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh @@ -15,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/detail/extract_transform_v_frontier_e.cuh" +#include "prims/property_op_utils.cuh" +#include "prims/reduce_op.cuh" #include #include @@ -35,6 +35,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/update_edge_src_dst_property.cuh b/cpp/src/prims/update_edge_src_dst_property.cuh index 0c7058cccb4..dfac04ce848 100644 --- a/cpp/src/prims/update_edge_src_dst_property.cuh +++ b/cpp/src/prims/update_edge_src_dst_property.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,7 @@ */ #pragma once -#include +#include "detail/graph_partition_utils.cuh" #include #include @@ -29,8 +29,10 @@ #include #include + #include +#include #include #include #include @@ -44,8 +46,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/prims/update_v_frontier.cuh b/cpp/src/prims/update_v_frontier.cuh index fb94748b7e4..0e739bb4c65 100644 --- a/cpp/src/prims/update_v_frontier.cuh +++ b/cpp/src/prims/update_v_frontier.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include + #include #include diff --git a/cpp/src/prims/vertex_frontier.cuh b/cpp/src/prims/vertex_frontier.cuh index 9a2c96de068..08aadf9fa18 100644 --- a/cpp/src/prims/vertex_frontier.cuh +++ b/cpp/src/prims/vertex_frontier.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/cpp/src/sampling/detail/gather_one_hop_edgelist_impl.cuh b/cpp/src/sampling/detail/gather_one_hop_edgelist_impl.cuh index cac648079b0..d2047883349 100644 --- a/cpp/src/sampling/detail/gather_one_hop_edgelist_impl.cuh +++ b/cpp/src/sampling/detail/gather_one_hop_edgelist_impl.cuh @@ -16,10 +16,10 @@ #pragma once -#include -#include -#include -#include +#include "prims/extract_transform_v_frontier_outgoing_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/vertex_frontier.cuh" +#include "structure/detail/structure_utils.cuh" #include #include @@ -28,11 +28,11 @@ #include +#include + #include #include -#include - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/gather_one_hop_edgelist_mg.cu b/cpp/src/sampling/detail/gather_one_hop_edgelist_mg.cu index ab9f3d00fae..fa9e3b4fb51 100644 --- a/cpp/src/sampling/detail/gather_one_hop_edgelist_mg.cu +++ b/cpp/src/sampling/detail/gather_one_hop_edgelist_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/gather_one_hop_edgelist_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/gather_one_hop_edgelist_sg.cu b/cpp/src/sampling/detail/gather_one_hop_edgelist_sg.cu index 9f2629e8631..32bf3f4a30f 100644 --- a/cpp/src/sampling/detail/gather_one_hop_edgelist_sg.cu +++ b/cpp/src/sampling/detail/gather_one_hop_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/gather_one_hop_edgelist_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/prepare_next_frontier_impl.cuh b/cpp/src/sampling/detail/prepare_next_frontier_impl.cuh index a0e09225a5b..8ad5114eda6 100644 --- a/cpp/src/sampling/detail/prepare_next_frontier_impl.cuh +++ b/cpp/src/sampling/detail/prepare_next_frontier_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ #pragma once +#include "sampling/detail/sampling_utils.hpp" + #include #include #include @@ -23,17 +25,15 @@ #include #include -#include - #include +#include + #include #include #include #include -#include - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/prepare_next_frontier_mg.cu b/cpp/src/sampling/detail/prepare_next_frontier_mg.cu index 60b4f49a1f7..8a32a010f75 100644 --- a/cpp/src/sampling/detail/prepare_next_frontier_mg.cu +++ b/cpp/src/sampling/detail/prepare_next_frontier_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/prepare_next_frontier_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/prepare_next_frontier_sg.cu b/cpp/src/sampling/detail/prepare_next_frontier_sg.cu index 2c2d28e6843..eae134488a1 100644 --- a/cpp/src/sampling/detail/prepare_next_frontier_sg.cu +++ b/cpp/src/sampling/detail/prepare_next_frontier_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/prepare_next_frontier_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/remove_visited_vertices_from_frontier.cu b/cpp/src/sampling/detail/remove_visited_vertices_from_frontier.cu index a3b224498ed..82d16959f0f 100644 --- a/cpp/src/sampling/detail/remove_visited_vertices_from_frontier.cu +++ b/cpp/src/sampling/detail/remove_visited_vertices_from_frontier.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,13 +17,13 @@ #include #include +#include + #include #include #include #include -#include - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/sample_edges.cuh b/cpp/src/sampling/detail/sample_edges.cuh index 3137d56c234..9b49f6a5b49 100644 --- a/cpp/src/sampling/detail/sample_edges.cuh +++ b/cpp/src/sampling/detail/sample_edges.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ #pragma once -#include -#include // ?? -#include -#include +#include "prims/per_v_random_select_transform_outgoing_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" // ?? +#include "prims/vertex_frontier.cuh" +#include "structure/detail/structure_utils.cuh" #include #include @@ -28,12 +28,12 @@ #include +#include + #include #include #include -#include - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/sample_edges_mg.cu b/cpp/src/sampling/detail/sample_edges_mg.cu index 4f42f68b1c4..3e5591f82b5 100644 --- a/cpp/src/sampling/detail/sample_edges_mg.cu +++ b/cpp/src/sampling/detail/sample_edges_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/sample_edges.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/sample_edges_sg.cu b/cpp/src/sampling/detail/sample_edges_sg.cu index f415789434a..103d1f02473 100644 --- a/cpp/src/sampling/detail/sample_edges_sg.cu +++ b/cpp/src/sampling/detail/sample_edges_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/sample_edges.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/sampling_utils.hpp b/cpp/src/sampling/detail/sampling_utils.hpp index 2ece35c06fe..e56da2053d5 100644 --- a/cpp/src/sampling/detail/sampling_utils.hpp +++ b/cpp/src/sampling/detail/sampling_utils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,12 @@ #pragma once +#include + #include + +#include + #include namespace cugraph { diff --git a/cpp/src/sampling/detail/shuffle_and_organize_output_impl.cuh b/cpp/src/sampling/detail/shuffle_and_organize_output_impl.cuh index 5197ea7f872..e4942d0860c 100644 --- a/cpp/src/sampling/detail/shuffle_and_organize_output_impl.cuh +++ b/cpp/src/sampling/detail/shuffle_and_organize_output_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ #pragma once -#include // ?? -#include -#include +#include "prims/update_edge_src_dst_property.cuh" // ?? +#include "prims/vertex_frontier.cuh" +#include "structure/detail/structure_utils.cuh" #include #include @@ -30,12 +30,12 @@ #include +#include + #include #include #include -#include - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/detail/shuffle_and_organize_output_mg.cu b/cpp/src/sampling/detail/shuffle_and_organize_output_mg.cu index 9b7613e2c19..966223bf5b1 100644 --- a/cpp/src/sampling/detail/shuffle_and_organize_output_mg.cu +++ b/cpp/src/sampling/detail/shuffle_and_organize_output_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "sampling/detail/shuffle_and_organize_output_impl.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/neighborhood.cu b/cpp/src/sampling/neighborhood.cu index 2f7b203a319..e75b08136ea 100644 --- a/cpp/src/sampling/neighborhood.cu +++ b/cpp/src/sampling/neighborhood.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,10 @@ * limitations under the License. */ -#include - -#include +#include "utilities/cugraph_ops_utils.hpp" #include +#include #include diff --git a/cpp/src/sampling/random_walks.cuh b/cpp/src/sampling/random_walks.cuh index 5a9ded02009..3b0bc15df93 100644 --- a/cpp/src/sampling/random_walks.cuh +++ b/cpp/src/sampling/random_walks.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,18 +18,19 @@ // #pragma once +#include "utilities/graph_utils.cuh" + #include #include #include #include -#include - #include #include #include +#include #include #include #include @@ -52,18 +53,16 @@ #include #include -#include - #include #include // FIXME: requirement for temporary std::getenv() #include // +#include "rw_traversals.hpp" + #include #include #include -#include "rw_traversals.hpp" - namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/random_walks_impl.cuh b/cpp/src/sampling/random_walks_impl.cuh index ec595105782..d582893d756 100644 --- a/cpp/src/sampling/random_walks_impl.cuh +++ b/cpp/src/sampling/random_walks_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,15 @@ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/per_v_random_select_transform_outgoing_e.cuh" +#include "prims/vertex_frontier.cuh" +#include #include #include #include +#include #include #include #include diff --git a/cpp/src/sampling/random_walks_mg.cu b/cpp/src/sampling/random_walks_mg.cu index 61da5559474..5352f3822b8 100644 --- a/cpp/src/sampling/random_walks_mg.cu +++ b/cpp/src/sampling/random_walks_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "sampling/random_walks_impl.cuh" -#include +#include namespace cugraph { diff --git a/cpp/src/sampling/random_walks_sg.cu b/cpp/src/sampling/random_walks_sg.cu index d37717f7485..e91b369508e 100644 --- a/cpp/src/sampling/random_walks_sg.cu +++ b/cpp/src/sampling/random_walks_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "sampling/random_walks_impl.cuh" -#include +#include namespace cugraph { diff --git a/cpp/src/sampling/renumber_sampled_edgelist_impl.cuh b/cpp/src/sampling/renumber_sampled_edgelist_impl.cuh index 50f42851a1f..0f128eb8410 100644 --- a/cpp/src/sampling/renumber_sampled_edgelist_impl.cuh +++ b/cpp/src/sampling/renumber_sampled_edgelist_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,14 @@ #pragma once -#include +#include "prims/kv_store.cuh" #include #include #include #include + #include #include diff --git a/cpp/src/sampling/renumber_sampled_edgelist_sg.cu b/cpp/src/sampling/renumber_sampled_edgelist_sg.cu index 9a5f0d357b2..c3aeb60e6bc 100644 --- a/cpp/src/sampling/renumber_sampled_edgelist_sg.cu +++ b/cpp/src/sampling/renumber_sampled_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "renumber_sampled_edgelist_impl.cuh" +#include + // FIXME: deprecated, to be deleted namespace cugraph { diff --git a/cpp/src/sampling/rw_traversals.hpp b/cpp/src/sampling/rw_traversals.hpp index 40b7109937c..45cc1e54cb4 100644 --- a/cpp/src/sampling/rw_traversals.hpp +++ b/cpp/src/sampling/rw_traversals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,18 +18,17 @@ // #pragma once +#include "utilities/graph_utils.cuh" + #include #include -#include - -#include - #include #include #include +#include #include #include #include diff --git a/cpp/src/sampling/sampling_post_processing_impl.cuh b/cpp/src/sampling/sampling_post_processing_impl.cuh index 852d82e78ab..f506e4bd04c 100644 --- a/cpp/src/sampling/sampling_post_processing_impl.cuh +++ b/cpp/src/sampling/sampling_post_processing_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,19 @@ #pragma once -#include +#include "prims/kv_store.cuh" +#include #include #include #include #include + #include #include +#include #include #include #include @@ -40,8 +43,6 @@ #include #include -#include - #include namespace cugraph { diff --git a/cpp/src/sampling/sampling_post_processing_sg.cu b/cpp/src/sampling/sampling_post_processing_sg.cu index 75e3c5f005a..5a243c9cb6b 100644 --- a/cpp/src/sampling/sampling_post_processing_sg.cu +++ b/cpp/src/sampling/sampling_post_processing_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "sampling_post_processing_impl.cuh" +#include + namespace cugraph { template std::tuple>, diff --git a/cpp/src/sampling/uniform_neighbor_sampling_impl.hpp b/cpp/src/sampling/uniform_neighbor_sampling_impl.hpp index d9ffbcf56d5..21033783508 100644 --- a/cpp/src/sampling/uniform_neighbor_sampling_impl.hpp +++ b/cpp/src/sampling/uniform_neighbor_sampling_impl.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "sampling/detail/sampling_utils.hpp" #include #include diff --git a/cpp/src/sampling/uniform_neighbor_sampling_mg.cpp b/cpp/src/sampling/uniform_neighbor_sampling_mg.cpp index 7f105a2a11e..6e0c15c70dd 100644 --- a/cpp/src/sampling/uniform_neighbor_sampling_mg.cpp +++ b/cpp/src/sampling/uniform_neighbor_sampling_mg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "uniform_neighbor_sampling_impl.hpp" +#include + namespace cugraph { template std::tuple, diff --git a/cpp/src/sampling/uniform_neighbor_sampling_sg.cpp b/cpp/src/sampling/uniform_neighbor_sampling_sg.cpp index 92f33cc7af2..d069cecfb5c 100644 --- a/cpp/src/sampling/uniform_neighbor_sampling_sg.cpp +++ b/cpp/src/sampling/uniform_neighbor_sampling_sg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "uniform_neighbor_sampling_impl.hpp" +#include + namespace cugraph { template std::tuple, diff --git a/cpp/src/structure/coarsen_graph_impl.cuh b/cpp/src/structure/coarsen_graph_impl.cuh index 0704bc6f23b..9e999854dfe 100644 --- a/cpp/src/structure/coarsen_graph_impl.cuh +++ b/cpp/src/structure/coarsen_graph_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include @@ -30,6 +30,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/coarsen_graph_mg.cu b/cpp/src/structure/coarsen_graph_mg.cu index 39bdb58084f..776c3f603f3 100644 --- a/cpp/src/structure/coarsen_graph_mg.cu +++ b/cpp/src/structure/coarsen_graph_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/coarsen_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/coarsen_graph_sg.cu b/cpp/src/structure/coarsen_graph_sg.cu index 7ddbecc33c5..fcd64276891 100644 --- a/cpp/src/structure/coarsen_graph_sg.cu +++ b/cpp/src/structure/coarsen_graph_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/coarsen_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/create_graph_from_edgelist_impl.cuh b/cpp/src/structure/create_graph_from_edgelist_impl.cuh index 8dd587e1661..1c15842982b 100644 --- a/cpp/src/structure/create_graph_from_edgelist_impl.cuh +++ b/cpp/src/structure/create_graph_from_edgelist_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "structure/detail/structure_utils.cuh" #include #include diff --git a/cpp/src/structure/create_graph_from_edgelist_mg.cu b/cpp/src/structure/create_graph_from_edgelist_mg.cu index 79ffcfdb659..8fb0272cef4 100644 --- a/cpp/src/structure/create_graph_from_edgelist_mg.cu +++ b/cpp/src/structure/create_graph_from_edgelist_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/create_graph_from_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/create_graph_from_edgelist_sg.cu b/cpp/src/structure/create_graph_from_edgelist_sg.cu index 1c051cd8168..61ae77ccecd 100644 --- a/cpp/src/structure/create_graph_from_edgelist_sg.cu +++ b/cpp/src/structure/create_graph_from_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/create_graph_from_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/decompress_to_edgelist_impl.cuh b/cpp/src/structure/decompress_to_edgelist_impl.cuh index e9e84f5bf15..55230c0a05a 100644 --- a/cpp/src/structure/decompress_to_edgelist_impl.cuh +++ b/cpp/src/structure/decompress_to_edgelist_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "detail/graph_partition_utils.cuh" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/decompress_to_edgelist_mg.cu b/cpp/src/structure/decompress_to_edgelist_mg.cu index fbe56ca9b04..8321477d0a0 100644 --- a/cpp/src/structure/decompress_to_edgelist_mg.cu +++ b/cpp/src/structure/decompress_to_edgelist_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/decompress_to_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/decompress_to_edgelist_sg.cu b/cpp/src/structure/decompress_to_edgelist_sg.cu index 5b8e410e087..09f42750f50 100644 --- a/cpp/src/structure/decompress_to_edgelist_sg.cu +++ b/cpp/src/structure/decompress_to_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/decompress_to_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/detail/structure_utils.cuh b/cpp/src/structure/detail/structure_utils.cuh index f0f729bce18..a96467ce06b 100644 --- a/cpp/src/structure/detail/structure_utils.cuh +++ b/cpp/src/structure/detail/structure_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/graph_impl.cuh b/cpp/src/structure/graph_impl.cuh index 6568b5e3b9e..ef43b7b13ec 100644 --- a/cpp/src/structure/graph_impl.cuh +++ b/cpp/src/structure/graph_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "structure/detail/structure_utils.cuh" #include #include @@ -30,6 +30,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/graph_mg.cu b/cpp/src/structure/graph_mg.cu index 293e464fd19..b68e3fad719 100644 --- a/cpp/src/structure/graph_mg.cu +++ b/cpp/src/structure/graph_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/graph_sg.cu b/cpp/src/structure/graph_sg.cu index bac0b3f0be9..93170690414 100644 --- a/cpp/src/structure/graph_sg.cu +++ b/cpp/src/structure/graph_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/graph_view_impl.cuh b/cpp/src/structure/graph_view_impl.cuh index 7928c61cf7b..623e795d5be 100644 --- a/cpp/src/structure/graph_view_impl.cuh +++ b/cpp/src/structure/graph_view_impl.cuh @@ -16,11 +16,11 @@ #pragma once -#include -#include -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/count_if_e.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "utilities/error_check_utils.cuh" #include #include @@ -33,9 +33,11 @@ #include #include + #include #include +#include #include #include #include @@ -52,8 +54,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/structure/graph_view_mg.cu b/cpp/src/structure/graph_view_mg.cu index 6ccd0150fe0..ce30ec285b9 100644 --- a/cpp/src/structure/graph_view_mg.cu +++ b/cpp/src/structure/graph_view_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_view_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/graph_view_sg.cu b/cpp/src/structure/graph_view_sg.cu index 0472d918d23..a671526ba9f 100644 --- a/cpp/src/structure/graph_view_sg.cu +++ b/cpp/src/structure/graph_view_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_view_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/graph_weight_utils_impl.cuh b/cpp/src/structure/graph_weight_utils_impl.cuh index 173b4df207b..e52d829b62d 100644 --- a/cpp/src/structure/graph_weight_utils_impl.cuh +++ b/cpp/src/structure/graph_weight_utils_impl.cuh @@ -16,9 +16,9 @@ #pragma once -#include -#include -#include +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_e.cuh" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/graph_weight_utils_mg.cu b/cpp/src/structure/graph_weight_utils_mg.cu index 3e433cb41c0..76e5f4b92fe 100644 --- a/cpp/src/structure/graph_weight_utils_mg.cu +++ b/cpp/src/structure/graph_weight_utils_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_weight_utils_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/graph_weight_utils_sg.cu b/cpp/src/structure/graph_weight_utils_sg.cu index 1b076f08af6..b2c55cff87f 100644 --- a/cpp/src/structure/graph_weight_utils_sg.cu +++ b/cpp/src/structure/graph_weight_utils_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/graph_weight_utils_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/induced_subgraph_impl.cuh b/cpp/src/structure/induced_subgraph_impl.cuh index fa4c5e0f6f2..2e774497b78 100644 --- a/cpp/src/structure/induced_subgraph_impl.cuh +++ b/cpp/src/structure/induced_subgraph_impl.cuh @@ -17,10 +17,10 @@ // #define TIMING -#include -#include -#include -#include +#include "prims/extract_transform_v_frontier_outgoing_e.cuh" +#include "prims/vertex_frontier.cuh" +#include "structure/detail/structure_utils.cuh" +#include "utilities/collect_comm.cuh" #include #include @@ -36,6 +36,7 @@ #endif #include + #include #include diff --git a/cpp/src/structure/induced_subgraph_mg.cu b/cpp/src/structure/induced_subgraph_mg.cu index c7b11ea38d3..67ce627f769 100644 --- a/cpp/src/structure/induced_subgraph_mg.cu +++ b/cpp/src/structure/induced_subgraph_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/induced_subgraph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/induced_subgraph_sg.cu b/cpp/src/structure/induced_subgraph_sg.cu index 2011a237790..ee0aa0c91c1 100644 --- a/cpp/src/structure/induced_subgraph_sg.cu +++ b/cpp/src/structure/induced_subgraph_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/induced_subgraph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/legacy/graph.cu b/cpp/src/structure/legacy/graph.cu index 69f3307f4e5..7e1238e1558 100644 --- a/cpp/src/structure/legacy/graph.cu +++ b/cpp/src/structure/legacy/graph.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,13 @@ * limitations under the License. */ +#include "utilities/graph_utils.cuh" + #include #include -#include #include + #include #include @@ -150,5 +152,6 @@ void GraphCompressedSparseBaseView::degree(ET* degree, DegreeDirecti } // namespace legacy } // namespace cugraph +#include "utilities/eidir_graph_utils.hpp" + #include -#include diff --git a/cpp/src/structure/relabel_impl.cuh b/cpp/src/structure/relabel_impl.cuh index 192120e6b4c..ce18ec893d9 100644 --- a/cpp/src/structure/relabel_impl.cuh +++ b/cpp/src/structure/relabel_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" #include #include @@ -25,6 +25,7 @@ #include #include + #include #include #include diff --git a/cpp/src/structure/relabel_mg.cu b/cpp/src/structure/relabel_mg.cu index c0848fa33a2..2c039d9d3d6 100644 --- a/cpp/src/structure/relabel_mg.cu +++ b/cpp/src/structure/relabel_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/relabel_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/relabel_sg.cu b/cpp/src/structure/relabel_sg.cu index ab412bd919a..f7416e723b8 100644 --- a/cpp/src/structure/relabel_sg.cu +++ b/cpp/src/structure/relabel_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/relabel_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/remove_multi_edges.cu b/cpp/src/structure/remove_multi_edges.cu index 54403f0b034..ae621a030bf 100644 --- a/cpp/src/structure/remove_multi_edges.cu +++ b/cpp/src/structure/remove_multi_edges.cu @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/remove_multi_edges_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/remove_multi_edges_impl.cuh b/cpp/src/structure/remove_multi_edges_impl.cuh index 651876ac8b1..ce83fdcb66a 100644 --- a/cpp/src/structure/remove_multi_edges_impl.cuh +++ b/cpp/src/structure/remove_multi_edges_impl.cuh @@ -15,17 +15,17 @@ */ #pragma once -#include +#include "structure/detail/structure_utils.cuh" #include // FIXME: mem_frugal_partition should probably not be in shuffle_comm.hpp // It's used here without any notion of shuffling #include -#include #include #include #include + #include #include @@ -35,6 +35,8 @@ #include #include +#include + #include #include diff --git a/cpp/src/structure/remove_self_loops.cu b/cpp/src/structure/remove_self_loops.cu index 8a66c1e05e3..35375ea8603 100644 --- a/cpp/src/structure/remove_self_loops.cu +++ b/cpp/src/structure/remove_self_loops.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/remove_self_loops_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/remove_self_loops_impl.cuh b/cpp/src/structure/remove_self_loops_impl.cuh index dafe26cd1c5..b8647a8966d 100644 --- a/cpp/src/structure/remove_self_loops_impl.cuh +++ b/cpp/src/structure/remove_self_loops_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,9 +15,10 @@ */ #pragma once -#include +#include "structure/detail/structure_utils.cuh" #include + #include #include diff --git a/cpp/src/structure/renumber_edgelist_impl.cuh b/cpp/src/structure/renumber_edgelist_impl.cuh index 09a4dae6c64..41f81d72ab1 100644 --- a/cpp/src/structure/renumber_edgelist_impl.cuh +++ b/cpp/src/structure/renumber_edgelist_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" #include #include @@ -28,6 +28,7 @@ #include #include + #include #include #include diff --git a/cpp/src/structure/renumber_edgelist_mg.cu b/cpp/src/structure/renumber_edgelist_mg.cu index 00ad6b4128e..75b43056d26 100644 --- a/cpp/src/structure/renumber_edgelist_mg.cu +++ b/cpp/src/structure/renumber_edgelist_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/renumber_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/renumber_edgelist_sg.cu b/cpp/src/structure/renumber_edgelist_sg.cu index bb9e216224a..974a5cd3e7e 100644 --- a/cpp/src/structure/renumber_edgelist_sg.cu +++ b/cpp/src/structure/renumber_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/renumber_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/renumber_utils_impl.cuh b/cpp/src/structure/renumber_utils_impl.cuh index df4196cf13d..3efa58d9632 100644 --- a/cpp/src/structure/renumber_utils_impl.cuh +++ b/cpp/src/structure/renumber_utils_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" +#include "utilities/collect_comm.cuh" #include #include diff --git a/cpp/src/structure/renumber_utils_mg.cu b/cpp/src/structure/renumber_utils_mg.cu index 1c111a30cd9..32fdafe280f 100644 --- a/cpp/src/structure/renumber_utils_mg.cu +++ b/cpp/src/structure/renumber_utils_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/renumber_utils_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/renumber_utils_sg.cu b/cpp/src/structure/renumber_utils_sg.cu index ba977563d24..e39bb30a960 100644 --- a/cpp/src/structure/renumber_utils_sg.cu +++ b/cpp/src/structure/renumber_utils_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/renumber_utils_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/select_random_vertices_impl.hpp b/cpp/src/structure/select_random_vertices_impl.hpp index b6a0c364848..e6857a5beda 100644 --- a/cpp/src/structure/select_random_vertices_impl.hpp +++ b/cpp/src/structure/select_random_vertices_impl.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, 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,6 +15,8 @@ */ #pragma once +#include "detail/graph_partition_utils.cuh" + #include #include #include @@ -22,9 +24,9 @@ #include #include #include -#include #include + #include #include diff --git a/cpp/src/structure/select_random_vertices_mg.cu b/cpp/src/structure/select_random_vertices_mg.cu index 595da12f678..79777be7b3d 100644 --- a/cpp/src/structure/select_random_vertices_mg.cu +++ b/cpp/src/structure/select_random_vertices_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/select_random_vertices_impl.hpp" namespace cugraph { diff --git a/cpp/src/structure/select_random_vertices_sg.cu b/cpp/src/structure/select_random_vertices_sg.cu index 1ca1878c9db..701852a5111 100644 --- a/cpp/src/structure/select_random_vertices_sg.cu +++ b/cpp/src/structure/select_random_vertices_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "structure/select_random_vertices_impl.hpp" namespace cugraph { diff --git a/cpp/src/structure/symmetrize_edgelist_impl.cuh b/cpp/src/structure/symmetrize_edgelist_impl.cuh index 41d61a5a02b..a6a4c0947c7 100644 --- a/cpp/src/structure/symmetrize_edgelist_impl.cuh +++ b/cpp/src/structure/symmetrize_edgelist_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ #pragma once #include - #include #include + #include #include diff --git a/cpp/src/structure/symmetrize_edgelist_mg.cu b/cpp/src/structure/symmetrize_edgelist_mg.cu index ad75c8a450e..657da529483 100644 --- a/cpp/src/structure/symmetrize_edgelist_mg.cu +++ b/cpp/src/structure/symmetrize_edgelist_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/symmetrize_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/symmetrize_edgelist_sg.cu b/cpp/src/structure/symmetrize_edgelist_sg.cu index 3dab0d801c7..6b446627b3f 100644 --- a/cpp/src/structure/symmetrize_edgelist_sg.cu +++ b/cpp/src/structure/symmetrize_edgelist_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/symmetrize_edgelist_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/symmetrize_graph_impl.cuh b/cpp/src/structure/symmetrize_graph_impl.cuh index 3334e089ba3..baddc5f1da1 100644 --- a/cpp/src/structure/symmetrize_graph_impl.cuh +++ b/cpp/src/structure/symmetrize_graph_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/symmetrize_graph_mg.cu b/cpp/src/structure/symmetrize_graph_mg.cu index 02f0c23805d..f4d81b3f144 100644 --- a/cpp/src/structure/symmetrize_graph_mg.cu +++ b/cpp/src/structure/symmetrize_graph_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/symmetrize_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/symmetrize_graph_sg.cu b/cpp/src/structure/symmetrize_graph_sg.cu index 4b903e8bbb2..def1ab9f0c0 100644 --- a/cpp/src/structure/symmetrize_graph_sg.cu +++ b/cpp/src/structure/symmetrize_graph_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/symmetrize_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/transpose_graph_impl.cuh b/cpp/src/structure/transpose_graph_impl.cuh index 5b418a15478..710d222ad61 100644 --- a/cpp/src/structure/transpose_graph_impl.cuh +++ b/cpp/src/structure/transpose_graph_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/transpose_graph_mg.cu b/cpp/src/structure/transpose_graph_mg.cu index ce4c0e6edbc..075ce63f3d7 100644 --- a/cpp/src/structure/transpose_graph_mg.cu +++ b/cpp/src/structure/transpose_graph_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/transpose_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/transpose_graph_sg.cu b/cpp/src/structure/transpose_graph_sg.cu index 7360746211a..82a980736e3 100644 --- a/cpp/src/structure/transpose_graph_sg.cu +++ b/cpp/src/structure/transpose_graph_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/transpose_graph_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/transpose_graph_storage_impl.cuh b/cpp/src/structure/transpose_graph_storage_impl.cuh index 980c9b10c53..53285b47d3a 100644 --- a/cpp/src/structure/transpose_graph_storage_impl.cuh +++ b/cpp/src/structure/transpose_graph_storage_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include #include + #include #include diff --git a/cpp/src/structure/transpose_graph_storage_mg.cu b/cpp/src/structure/transpose_graph_storage_mg.cu index 5e5766130b7..c9c4dc89374 100644 --- a/cpp/src/structure/transpose_graph_storage_mg.cu +++ b/cpp/src/structure/transpose_graph_storage_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/transpose_graph_storage_impl.cuh" namespace cugraph { diff --git a/cpp/src/structure/transpose_graph_storage_sg.cu b/cpp/src/structure/transpose_graph_storage_sg.cu index f352a8c8d28..d4691847570 100644 --- a/cpp/src/structure/transpose_graph_storage_sg.cu +++ b/cpp/src/structure/transpose_graph_storage_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "structure/transpose_graph_storage_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/bfs_impl.cuh b/cpp/src/traversal/bfs_impl.cuh index 437071569bf..6e851ff08b4 100644 --- a/cpp/src/traversal/bfs_impl.cuh +++ b/cpp/src/traversal/bfs_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,12 +15,12 @@ */ #pragma once -#include -#include -#include -#include -#include -#include +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include @@ -30,6 +30,7 @@ #include #include + #include #include diff --git a/cpp/src/traversal/bfs_mg.cu b/cpp/src/traversal/bfs_mg.cu index 3a28487ad71..9a8b724b4a4 100644 --- a/cpp/src/traversal/bfs_mg.cu +++ b/cpp/src/traversal/bfs_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "traversal/bfs_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/bfs_sg.cu b/cpp/src/traversal/bfs_sg.cu index f9ef4f24d30..b56a62aa762 100644 --- a/cpp/src/traversal/bfs_sg.cu +++ b/cpp/src/traversal/bfs_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "traversal/bfs_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/extract_bfs_paths_impl.cuh b/cpp/src/traversal/extract_bfs_paths_impl.cuh index 8cc6fceac5c..19c935a00a2 100644 --- a/cpp/src/traversal/extract_bfs_paths_impl.cuh +++ b/cpp/src/traversal/extract_bfs_paths_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "utilities/collect_comm.cuh" +#include "utilities/graph_utils.cuh" #include #include @@ -28,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/src/traversal/extract_bfs_paths_mg.cu b/cpp/src/traversal/extract_bfs_paths_mg.cu index 931ead71be0..ee3237b4773 100644 --- a/cpp/src/traversal/extract_bfs_paths_mg.cu +++ b/cpp/src/traversal/extract_bfs_paths_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "traversal/extract_bfs_paths_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/extract_bfs_paths_sg.cu b/cpp/src/traversal/extract_bfs_paths_sg.cu index c51dfc1f5c0..d4c8a5fd404 100644 --- a/cpp/src/traversal/extract_bfs_paths_sg.cu +++ b/cpp/src/traversal/extract_bfs_paths_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "traversal/extract_bfs_paths_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/k_hop_nbrs_impl.cuh b/cpp/src/traversal/k_hop_nbrs_impl.cuh index 92af693ddd4..a80b44095d9 100644 --- a/cpp/src/traversal/k_hop_nbrs_impl.cuh +++ b/cpp/src/traversal/k_hop_nbrs_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/vertex_frontier.cuh" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/src/traversal/k_hop_nbrs_mg.cu b/cpp/src/traversal/k_hop_nbrs_mg.cu index 15b3f1c3b7d..200d943a477 100644 --- a/cpp/src/traversal/k_hop_nbrs_mg.cu +++ b/cpp/src/traversal/k_hop_nbrs_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "traversal/k_hop_nbrs_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/k_hop_nbrs_sg.cu b/cpp/src/traversal/k_hop_nbrs_sg.cu index 3436594a8c9..2a57224b188 100644 --- a/cpp/src/traversal/k_hop_nbrs_sg.cu +++ b/cpp/src/traversal/k_hop_nbrs_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "traversal/k_hop_nbrs_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/od_shortest_distances_impl.cuh b/cpp/src/traversal/od_shortest_distances_impl.cuh index 58fae83bca0..c2a3f1160ca 100644 --- a/cpp/src/traversal/od_shortest_distances_impl.cuh +++ b/cpp/src/traversal/od_shortest_distances_impl.cuh @@ -15,16 +15,16 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_e.cuh" +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/key_store.cuh" +#include "prims/kv_store.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_e.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include diff --git a/cpp/src/traversal/od_shortest_distances_sg.cu b/cpp/src/traversal/od_shortest_distances_sg.cu index 43c6f516374..a22793a2fad 100644 --- a/cpp/src/traversal/od_shortest_distances_sg.cu +++ b/cpp/src/traversal/od_shortest_distances_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "traversal/od_shortest_distances_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/sssp_impl.cuh b/cpp/src/traversal/sssp_impl.cuh index 5a6d536c6f5..be55d8f5570 100644 --- a/cpp/src/traversal/sssp_impl.cuh +++ b/cpp/src/traversal/sssp_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,14 +15,14 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "prims/count_if_e.cuh" +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/reduce_op.cuh" +#include "prims/transform_reduce_e.cuh" +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/update_v_frontier.cuh" +#include "prims/vertex_frontier.cuh" #include #include diff --git a/cpp/src/traversal/sssp_mg.cu b/cpp/src/traversal/sssp_mg.cu index 0a67eb8c422..a89902059bf 100644 --- a/cpp/src/traversal/sssp_mg.cu +++ b/cpp/src/traversal/sssp_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "traversal/sssp_impl.cuh" namespace cugraph { diff --git a/cpp/src/traversal/sssp_sg.cu b/cpp/src/traversal/sssp_sg.cu index 83b457050fc..3dd4bc5c6ca 100644 --- a/cpp/src/traversal/sssp_sg.cu +++ b/cpp/src/traversal/sssp_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "traversal/sssp_impl.cuh" namespace cugraph { diff --git a/cpp/src/tree/legacy/mst.cu b/cpp/src/tree/legacy/mst.cu index aff51806693..a7fdd45c4eb 100644 --- a/cpp/src/tree/legacy/mst.cu +++ b/cpp/src/tree/legacy/mst.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,18 +15,19 @@ */ #include -#include -#include - -#include -#include -#include - #include #include #include +#include + +#include + +#include +#include +#include + namespace cugraph { namespace detail { diff --git a/cpp/src/utilities/collect_comm.cuh b/cpp/src/utilities/collect_comm.cuh index 1a05cc27833..4bc2150588e 100644 --- a/cpp/src/utilities/collect_comm.cuh +++ b/cpp/src/utilities/collect_comm.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,8 +15,8 @@ */ #pragma once -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "prims/kv_store.cuh" #include #include @@ -24,6 +24,7 @@ #include #include + #include #include #include diff --git a/cpp/src/utilities/cugraph_ops_utils.hpp b/cpp/src/utilities/cugraph_ops_utils.hpp index 880a2c8d104..bb014b9d7d6 100644 --- a/cpp/src/utilities/cugraph_ops_utils.hpp +++ b/cpp/src/utilities/cugraph_ops_utils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,8 @@ #pragma once -#include - #include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/utilities/error_check_utils.cuh b/cpp/src/utilities/error_check_utils.cuh index baaf513d93d..9c5823315a7 100644 --- a/cpp/src/utilities/error_check_utils.cuh +++ b/cpp/src/utilities/error_check_utils.cuh @@ -23,6 +23,7 @@ #include #include #include + #include #include diff --git a/cpp/src/utilities/graph_utils.cuh b/cpp/src/utilities/graph_utils.cuh index 1def024e1e5..2d542956531 100644 --- a/cpp/src/utilities/graph_utils.cuh +++ b/cpp/src/utilities/graph_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -17,11 +17,10 @@ #include #include + #include #include -#include -#include #include #include #include @@ -38,6 +37,9 @@ #include #include +#include +#include + namespace cugraph { namespace detail { diff --git a/cpp/src/utilities/path_retrieval.cu b/cpp/src/utilities/path_retrieval.cu index 00c70bdbfd5..e37ce3a3ced 100644 --- a/cpp/src/utilities/path_retrieval.cu +++ b/cpp/src/utilities/path_retrieval.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/c_api/mg_test_utils.cpp b/cpp/tests/c_api/mg_test_utils.cpp index 6eec436e77d..956f7872b5d 100644 --- a/cpp/tests/c_api/mg_test_utils.cpp +++ b/cpp/tests/c_api/mg_test_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include +#include "c_api/mg_test_utils.h" -#include -#include -#include -#include +#include "c_api/array.hpp" +#include "c_api/c_test_utils.h" +#include "c_api/resource_handle.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -354,8 +354,7 @@ extern "C" int create_mg_test_graph_with_edge_ids(const cugraph_resource_handle_ cugraph_type_erased_device_array_create(handle, num_edges, vertex_tid, &dst, ret_error); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "dst create failed."); - ret_code = - cugraph_type_erased_device_array_create(handle, num_edges, edge_tid, &idx, ret_error); + ret_code = cugraph_type_erased_device_array_create(handle, num_edges, edge_tid, &idx, ret_error); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "idx create failed."); src_view = cugraph_type_erased_device_array_view(src); @@ -423,16 +422,16 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl data_type_id_t type_tid = INT32; data_type_id_t weight_tid = FLOAT32; - cugraph_type_erased_device_array_t* src = NULL; - cugraph_type_erased_device_array_t* dst = NULL; - cugraph_type_erased_device_array_t* idx = NULL; - cugraph_type_erased_device_array_t* type = NULL; - cugraph_type_erased_device_array_t* wgt = NULL; - cugraph_type_erased_device_array_view_t* src_view = NULL; - cugraph_type_erased_device_array_view_t* dst_view = NULL; - cugraph_type_erased_device_array_view_t* idx_view = NULL; + cugraph_type_erased_device_array_t* src = NULL; + cugraph_type_erased_device_array_t* dst = NULL; + cugraph_type_erased_device_array_t* idx = NULL; + cugraph_type_erased_device_array_t* type = NULL; + cugraph_type_erased_device_array_t* wgt = NULL; + cugraph_type_erased_device_array_view_t* src_view = NULL; + cugraph_type_erased_device_array_view_t* dst_view = NULL; + cugraph_type_erased_device_array_view_t* idx_view = NULL; cugraph_type_erased_device_array_view_t* type_view = NULL; - cugraph_type_erased_device_array_view_t* wgt_view = NULL; + cugraph_type_erased_device_array_view_t* wgt_view = NULL; int rank = 0; @@ -450,8 +449,8 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl cugraph_type_erased_device_array_create(handle, num_edges, vertex_tid, &dst, ret_error); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "dst create failed."); - src_view = cugraph_type_erased_device_array_view(src); - dst_view = cugraph_type_erased_device_array_view(dst); + src_view = cugraph_type_erased_device_array_view(src); + dst_view = cugraph_type_erased_device_array_view(dst); ret_code = cugraph_type_erased_device_array_view_copy_from_host( handle, src_view, (byte_t*)h_src, ret_error); @@ -466,7 +465,7 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl cugraph_type_erased_device_array_create(handle, num_edges, index_tid, &idx, ret_error); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "index create failed."); - idx_view = cugraph_type_erased_device_array_view(idx); + idx_view = cugraph_type_erased_device_array_view(idx); ret_code = cugraph_type_erased_device_array_view_copy_from_host( handle, idx_view, (byte_t*)h_idx, ret_error); @@ -490,7 +489,7 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl cugraph_type_erased_device_array_create(handle, num_edges, weight_tid, &wgt, ret_error); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "wgt create failed."); - wgt_view = cugraph_type_erased_device_array_view(wgt); + wgt_view = cugraph_type_erased_device_array_view(wgt); ret_code = cugraph_type_erased_device_array_view_copy_from_host( handle, wgt_view, (byte_t*)h_wgt, ret_error); @@ -663,9 +662,9 @@ int create_mg_test_graph_new(const cugraph_resource_handle_t* handle, return test_ret_value; } -extern "C" size_t cugraph_test_device_gatherv_size(const cugraph_resource_handle_t* handle, - const cugraph_type_erased_device_array_view_t *array) { - +extern "C" size_t cugraph_test_device_gatherv_size( + const cugraph_resource_handle_t* handle, const cugraph_type_erased_device_array_view_t* array) +{ auto internal_array = reinterpret_cast(array); @@ -686,9 +685,8 @@ extern "C" size_t cugraph_test_device_gatherv_size(const cugraph_resource_handle return (comm.get_rank() == 0) ? ret_value : 0; } -extern "C" size_t cugraph_test_scalar_reduce(const cugraph_resource_handle_t* handle, - size_t value) { - +extern "C" size_t cugraph_test_scalar_reduce(const cugraph_resource_handle_t* handle, size_t value) +{ auto raft_handle = reinterpret_cast(handle)->handle_; auto& comm = raft_handle->get_comms(); @@ -705,40 +703,55 @@ extern "C" size_t cugraph_test_scalar_reduce(const cugraph_resource_handle_t* ha } extern "C" int cugraph_test_host_gatherv_fill(const cugraph_resource_handle_t* handle, - void *input, + void* input, size_t input_size, cugraph_data_type_id_t input_type, - void *output) { - + void* output) +{ auto raft_handle = reinterpret_cast(handle)->handle_; auto& comm = raft_handle->get_comms(); switch (input_type) { case cugraph_data_type_id_t::INT32: { - auto tmp = cugraph::test::to_device(*raft_handle, raft::host_span{reinterpret_cast(input), input_size}); + auto tmp = cugraph::test::to_device( + *raft_handle, + raft::host_span{reinterpret_cast(input), input_size}); tmp = cugraph::test::device_gatherv(*raft_handle, tmp.data(), tmp.size()); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::INT64: { - auto tmp = cugraph::test::to_device(*raft_handle, raft::host_span{reinterpret_cast(input), input_size}); + auto tmp = cugraph::test::to_device( + *raft_handle, + raft::host_span{reinterpret_cast(input), input_size}); tmp = cugraph::test::device_gatherv(*raft_handle, tmp.data(), tmp.size()); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::FLOAT32: { - auto tmp = cugraph::test::to_device(*raft_handle, raft::host_span{reinterpret_cast(input), input_size}); + auto tmp = cugraph::test::to_device( + *raft_handle, + raft::host_span{reinterpret_cast(input), input_size}); tmp = cugraph::test::device_gatherv(*raft_handle, tmp.data(), tmp.size()); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::FLOAT64: { - auto tmp = cugraph::test::to_device(*raft_handle, raft::host_span{reinterpret_cast(input), input_size}); + auto tmp = cugraph::test::to_device( + *raft_handle, + raft::host_span{reinterpret_cast(input), input_size}); tmp = cugraph::test::device_gatherv(*raft_handle, tmp.data(), tmp.size()); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::SIZE_T: { - auto tmp = cugraph::test::to_device(*raft_handle, raft::host_span{reinterpret_cast(input), input_size}); + auto tmp = cugraph::test::to_device( + *raft_handle, + raft::host_span{reinterpret_cast(input), input_size}); tmp = cugraph::test::device_gatherv(*raft_handle, tmp.data(), tmp.size()); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; default: { return CUGRAPH_UNKNOWN_ERROR; @@ -748,10 +761,11 @@ extern "C" int cugraph_test_host_gatherv_fill(const cugraph_resource_handle_t* h return CUGRAPH_SUCCESS; } -extern "C" int cugraph_test_device_gatherv_fill(const cugraph_resource_handle_t* handle, - const cugraph_type_erased_device_array_view_t *input, - void *output) { - +extern "C" int cugraph_test_device_gatherv_fill( + const cugraph_resource_handle_t* handle, + const cugraph_type_erased_device_array_view_t* input, + void* output) +{ auto internal_array = reinterpret_cast(input); auto raft_handle = @@ -761,28 +775,43 @@ extern "C" int cugraph_test_device_gatherv_fill(const cugraph_resource_handle_t* switch (internal_array->type_) { case cugraph_data_type_id_t::INT32: { auto tmp = cugraph::test::device_gatherv( - *raft_handle, raft::device_span{internal_array->as_type(), internal_array->size_}); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + *raft_handle, + raft::device_span{internal_array->as_type(), + internal_array->size_}); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::INT64: { auto tmp = cugraph::test::device_gatherv( - *raft_handle, raft::device_span{internal_array->as_type(), internal_array->size_}); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + *raft_handle, + raft::device_span{internal_array->as_type(), + internal_array->size_}); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::FLOAT32: { auto tmp = cugraph::test::device_gatherv( - *raft_handle, raft::device_span{internal_array->as_type(), internal_array->size_}); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + *raft_handle, + raft::device_span{internal_array->as_type(), + internal_array->size_}); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::FLOAT64: { auto tmp = cugraph::test::device_gatherv( - *raft_handle, raft::device_span{internal_array->as_type(), internal_array->size_}); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + *raft_handle, + raft::device_span{internal_array->as_type(), + internal_array->size_}); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; case cugraph_data_type_id_t::SIZE_T: { auto tmp = cugraph::test::device_gatherv( - *raft_handle, raft::device_span{internal_array->as_type(), internal_array->size_}); - raft::update_host(reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); + *raft_handle, + raft::device_span{internal_array->as_type(), + internal_array->size_}); + raft::update_host( + reinterpret_cast(output), tmp.data(), tmp.size(), raft_handle->get_stream()); } break; default: { return CUGRAPH_UNKNOWN_ERROR; @@ -791,4 +820,3 @@ extern "C" int cugraph_test_device_gatherv_fill(const cugraph_resource_handle_t* return CUGRAPH_SUCCESS; } - diff --git a/cpp/tests/centrality/betweenness_centrality_reference.hpp b/cpp/tests/centrality/betweenness_centrality_reference.hpp index 0f1a4d6adf3..cf197d19312 100644 --- a/cpp/tests/centrality/betweenness_centrality_reference.hpp +++ b/cpp/tests/centrality/betweenness_centrality_reference.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "utilities/test_utilities.hpp" #include diff --git a/cpp/tests/centrality/betweenness_centrality_test.cpp b/cpp/tests/centrality/betweenness_centrality_test.cpp index d98ee38cf81..8f4b45516fd 100644 --- a/cpp/tests/centrality/betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/betweenness_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include -#include - -#include -#include -#include -#include +#include "betweenness_centrality_reference.hpp" +#include "betweenness_centrality_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/betweenness_centrality_validate.cu b/cpp/tests/centrality/betweenness_centrality_validate.cu index 08237479f67..3983c3b004c 100644 --- a/cpp/tests/centrality/betweenness_centrality_validate.cu +++ b/cpp/tests/centrality/betweenness_centrality_validate.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "betweenness_centrality_validate.hpp" +#include "utilities/test_utilities.hpp" #include diff --git a/cpp/tests/centrality/edge_betweenness_centrality_test.cpp b/cpp/tests/centrality/edge_betweenness_centrality_test.cpp index be153bb41f8..f2f40e1d4cb 100644 --- a/cpp/tests/centrality/edge_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/edge_betweenness_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include -#include - -#include -#include -#include -#include +#include "centrality/betweenness_centrality_reference.hpp" +#include "centrality/betweenness_centrality_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/eigenvector_centrality_test.cpp b/cpp/tests/centrality/eigenvector_centrality_test.cpp index 6c3bd510abd..b3e6d148237 100644 --- a/cpp/tests/centrality/eigenvector_centrality_test.cpp +++ b/cpp/tests/centrality/eigenvector_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/katz_centrality_test.cpp b/cpp/tests/centrality/katz_centrality_test.cpp index 70b44d6e52e..b3ffd2f053b 100644 --- a/cpp/tests/centrality/katz_centrality_test.cpp +++ b/cpp/tests/centrality/katz_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/mg_betweenness_centrality_test.cpp b/cpp/tests/centrality/mg_betweenness_centrality_test.cpp index 75bac28d105..c9ebd192d6c 100644 --- a/cpp/tests/centrality/mg_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/mg_betweenness_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include - -#include -#include -#include -#include -#include +#include "centrality/betweenness_centrality_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp b/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp index ebc49e4a3e4..ae4a02e537f 100644 --- a/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include - -#include -#include -#include -#include -#include +#include "centrality/betweenness_centrality_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +28,7 @@ #include #include + #include #include diff --git a/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp b/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp index 8f06817a807..4bd93bf87df 100644 --- a/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp +++ b/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #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 beba1bcc76d..e8a3b2024d4 100644 --- a/cpp/tests/centrality/mg_katz_centrality_test.cpp +++ b/cpp/tests/centrality/mg_katz_centrality_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/community/balanced_edge_test.cpp b/cpp/tests/community/balanced_edge_test.cpp index 7119827fce1..c4488dc9b9e 100644 --- a/cpp/tests/community/balanced_edge_test.cpp +++ b/cpp/tests/community/balanced_edge_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -8,7 +8,7 @@ * license agreement from NVIDIA CORPORATION is strictly prohibited. * */ -#include +#include "utilities/base_fixture.hpp" #include diff --git a/cpp/tests/community/ecg_test.cpp b/cpp/tests/community/ecg_test.cpp index 262e2bd23af..66950b97787 100644 --- a/cpp/tests/community/ecg_test.cpp +++ b/cpp/tests/community/ecg_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -8,7 +8,7 @@ * license agreement from NVIDIA CORPORATION is strictly prohibited. * */ -#include +#include "utilities/base_fixture.hpp" #include #include diff --git a/cpp/tests/community/egonet_test.cpp b/cpp/tests/community/egonet_test.cpp index 5e8207af07b..848626d3df9 100644 --- a/cpp/tests/community/egonet_test.cpp +++ b/cpp/tests/community/egonet_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include - -#include -#include -#include +#include "community/egonet_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -27,6 +26,7 @@ #include #include + #include #include diff --git a/cpp/tests/community/egonet_validate.cu b/cpp/tests/community/egonet_validate.cu index 5fc94c5c07d..ec7b5386cd5 100644 --- a/cpp/tests/community/egonet_validate.cu +++ b/cpp/tests/community/egonet_validate.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,10 @@ * limitations under the License. */ -#include - -#include -#include +#include "community/egonet_validate.hpp" +#include "utilities/test_utilities.hpp" -#include +#include #include #include @@ -28,6 +26,8 @@ #include #include +#include + namespace cugraph { namespace test { diff --git a/cpp/tests/community/leiden_test.cpp b/cpp/tests/community/leiden_test.cpp index 36e850683bd..0594fa39f9b 100644 --- a/cpp/tests/community/leiden_test.cpp +++ b/cpp/tests/community/leiden_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -8,16 +8,17 @@ * license agreement from NVIDIA CORPORATION is strictly prohibited. * */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" #include #include +#include #include #include + #include #include diff --git a/cpp/tests/community/louvain_test.cpp b/cpp/tests/community/louvain_test.cpp index a39793994d1..b4445119367 100644 --- a/cpp/tests/community/louvain_test.cpp +++ b/cpp/tests/community/louvain_test.cpp @@ -8,9 +8,9 @@ * license agreement from NVIDIA CORPORATION is strictly prohibited. * */ -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -18,6 +18,7 @@ #include #include + #include #include diff --git a/cpp/tests/community/mg_ecg_test.cpp b/cpp/tests/community/mg_ecg_test.cpp index 81cee1370f0..e021d381ee6 100644 --- a/cpp/tests/community/mg_ecg_test.cpp +++ b/cpp/tests/community/mg_ecg_test.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -32,9 +32,10 @@ #include #include -#include #include +#include + //////////////////////////////////////////////////////////////////////////////// // Test param object. This defines the input and expected output for a test, and // will be instantiated as the parameter to the tests defined below using diff --git a/cpp/tests/community/mg_egonet_test.cu b/cpp/tests/community/mg_egonet_test.cu index 6660eac3cad..4f4a3cec925 100644 --- a/cpp/tests/community/mg_egonet_test.cu +++ b/cpp/tests/community/mg_egonet_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,13 +15,11 @@ */ #include "egonet_validate.hpp" - -#include - -#include -#include -#include -#include +#include "structure/detail/structure_utils.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/community/mg_leiden_test.cpp b/cpp/tests/community/mg_leiden_test.cpp index 23f34e1001b..ff5b315f4a1 100644 --- a/cpp/tests/community/mg_leiden_test.cpp +++ b/cpp/tests/community/mg_leiden_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -32,9 +32,10 @@ #include #include -#include #include +#include + //////////////////////////////////////////////////////////////////////////////// // Test param object. This defines the input and expected output for a test, and // will be instantiated as the parameter to the tests defined below using diff --git a/cpp/tests/community/mg_louvain_test.cpp b/cpp/tests/community/mg_louvain_test.cpp index 011426606fd..53117d7823c 100644 --- a/cpp/tests/community/mg_louvain_test.cpp +++ b/cpp/tests/community/mg_louvain_test.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/community/mg_mis_test.cu b/cpp/tests/community/mg_mis_test.cu index b107e413e5d..1240cf812f9 100644 --- a/cpp/tests/community/mg_mis_test.cu +++ b/cpp/tests/community/mg_mis_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,37 +14,33 @@ * limitations under the License. */ -#include - -#include -#include -#include -#include +#include "prims/fill_edge_src_dst_property.cuh" +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/property_generator.cuh" +#include "prims/reduce_op.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include +#include #include #include #include #include -#include - -#include -#include -#include - -#include -#include -#include #include #include +#include #include +#include + #include #include #include -#include - struct MaximalIndependentSet_Usecase { bool check_correctness{true}; }; diff --git a/cpp/tests/community/mg_triangle_count_test.cpp b/cpp/tests/community/mg_triangle_count_test.cpp index e2162d32209..70a3b38f09d 100644 --- a/cpp/tests/community/mg_triangle_count_test.cpp +++ b/cpp/tests/community/mg_triangle_count_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/community/triangle_count_test.cpp b/cpp/tests/community/triangle_count_test.cpp index 592924c3c47..ae41df072ca 100644 --- a/cpp/tests/community/triangle_count_test.cpp +++ b/cpp/tests/community/triangle_count_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #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 08140eba895..88ffcdd5793 100644 --- a/cpp/tests/components/mg_weakly_connected_components_test.cpp +++ b/cpp/tests/components/mg_weakly_connected_components_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +29,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/components/scc_test.cu b/cpp/tests/components/scc_test.cu index 9cb2868faa5..914e7bb5004 100644 --- a/cpp/tests/components/scc_test.cu +++ b/cpp/tests/components/scc_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -12,11 +12,10 @@ // strongly connected components tests // Author: Andrei Schaffer aschaffer@nvidia.com -#include -#include - -#include -#include +#include "components/legacy/scc_matrix.cuh" +#include "converters/legacy/COOtoCSR.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -24,8 +23,6 @@ #include -#include - #include #include #include @@ -36,6 +33,8 @@ #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 baa0c0b9ba9..747b49346e6 100644 --- a/cpp/tests/components/weakly_connected_components_test.cpp +++ b/cpp/tests/components/weakly_connected_components_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -26,6 +26,7 @@ #include #include + #include #include diff --git a/cpp/tests/cores/core_number_test.cpp b/cpp/tests/cores/core_number_test.cpp index 7c329a02cc7..026a4a5f0df 100644 --- a/cpp/tests/cores/core_number_test.cpp +++ b/cpp/tests/cores/core_number_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include #include diff --git a/cpp/tests/cores/k_core_test.cpp b/cpp/tests/cores/k_core_test.cpp index beb756ad7d5..ce5637a49f8 100644 --- a/cpp/tests/cores/k_core_test.cpp +++ b/cpp/tests/cores/k_core_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,11 +15,10 @@ */ #include "k_core_validate.hpp" - -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +28,7 @@ #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 6f9e7a6136b..ed6e9b86111 100644 --- a/cpp/tests/cores/mg_core_number_test.cpp +++ b/cpp/tests/cores/mg_core_number_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/cores/mg_k_core_test.cpp b/cpp/tests/cores/mg_k_core_test.cpp index a7ad6d47287..1a30fff2d5b 100644 --- a/cpp/tests/cores/mg_k_core_test.cpp +++ b/cpp/tests/cores/mg_k_core_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,12 +15,11 @@ */ #include "k_core_validate.hpp" - -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +29,7 @@ #include #include + #include #include #include diff --git a/cpp/tests/generators/erdos_renyi_test.cpp b/cpp/tests/generators/erdos_renyi_test.cpp index 4b78cee2923..af38a2796b8 100644 --- a/cpp/tests/generators/erdos_renyi_test.cpp +++ b/cpp/tests/generators/erdos_renyi_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/generators/generate_bipartite_rmat_test.cpp b/cpp/tests/generators/generate_bipartite_rmat_test.cpp index b97c0a7483c..3fbc5df794d 100644 --- a/cpp/tests/generators/generate_bipartite_rmat_test.cpp +++ b/cpp/tests/generators/generate_bipartite_rmat_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -24,6 +23,7 @@ #include #include + #include #include @@ -31,6 +31,7 @@ #include #include +#include #include // this function assumes that vertex IDs are not scrambled diff --git a/cpp/tests/generators/generate_rmat_test.cpp b/cpp/tests/generators/generate_rmat_test.cpp index bdf79fd5962..d821fd51e07 100644 --- a/cpp/tests/generators/generate_rmat_test.cpp +++ b/cpp/tests/generators/generate_rmat_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -24,6 +23,7 @@ #include #include + #include #include @@ -31,6 +31,7 @@ #include #include +#include #include // this function assumes that vertex IDs are not scrambled diff --git a/cpp/tests/generators/generators_test.cpp b/cpp/tests/generators/generators_test.cpp index b5dbf54b265..97e873b136b 100644 --- a/cpp/tests/generators/generators_test.cpp +++ b/cpp/tests/generators/generators_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" -#include -#include +#include #include #include diff --git a/cpp/tests/layout/legacy/force_atlas2_test.cu b/cpp/tests/layout/legacy/force_atlas2_test.cu index 13985dc040b..fa19d092cb9 100644 --- a/cpp/tests/layout/legacy/force_atlas2_test.cu +++ b/cpp/tests/layout/legacy/force_atlas2_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -12,15 +12,16 @@ // Force_Atlas2 tests // Author: Hugo Linsenmaier hlinsenmaier@nvidia.com -#include -#include -#include +#include "layout/legacy/trust_worthiness.h" +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include #include #include + #include #include diff --git a/cpp/tests/linear_assignment/hungarian_test.cu b/cpp/tests/linear_assignment/hungarian_test.cu index 5079074da97..6c812d8f995 100644 --- a/cpp/tests/linear_assignment/hungarian_test.cu +++ b/cpp/tests/linear_assignment/hungarian_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -9,7 +9,9 @@ * */ -#include +#include "cuda_profiler_api.h" +#include "gtest/gtest.h" +#include "utilities/test_utilities.hpp" #include #include @@ -17,18 +19,15 @@ #include -#include - #include -#include "cuda_profiler_api.h" -#include "gtest/gtest.h" - #include #include #include #include +#include + __global__ void setup_generator(curandState* state) { int id = threadIdx.x + blockIdx.x * blockDim.x; diff --git a/cpp/tests/link_analysis/hits_test.cpp b/cpp/tests/link_analysis/hits_test.cpp index cf35356bb76..c67259697d9 100644 --- a/cpp/tests/link_analysis/hits_test.cpp +++ b/cpp/tests/link_analysis/hits_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,9 +27,15 @@ #include #include + #include #include +#include +#include +#include +#include + #include #include @@ -37,10 +43,6 @@ #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 5c89bafd08e..31e495ae682 100644 --- a/cpp/tests/link_analysis/mg_hits_test.cpp +++ b/cpp/tests/link_analysis/mg_hits_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #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 922a6ff2781..c8392916872 100644 --- a/cpp/tests/link_analysis/mg_pagerank_test.cpp +++ b/cpp/tests/link_analysis/mg_pagerank_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -29,6 +29,7 @@ #include #include + #include #include diff --git a/cpp/tests/link_analysis/pagerank_test.cpp b/cpp/tests/link_analysis/pagerank_test.cpp index 0354b69b8a8..40788be6a05 100644 --- a/cpp/tests/link_analysis/pagerank_test.cpp +++ b/cpp/tests/link_analysis/pagerank_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/link_prediction/mg_similarity_test.cpp b/cpp/tests/link_prediction/mg_similarity_test.cpp index c2a0b23c6d7..a450c5ce2d5 100644 --- a/cpp/tests/link_prediction/mg_similarity_test.cpp +++ b/cpp/tests/link_prediction/mg_similarity_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "link_prediction/similarity_compare.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include #include -#include - struct Similarity_Usecase { bool use_weights{false}; bool check_correctness{true}; diff --git a/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp b/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp index cf3179d51a3..92dcb3b9096 100644 --- a/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp +++ b/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "link_prediction/similarity_compare.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include #include -#include - struct Weighted_Similarity_Usecase { bool use_weights{true}; size_t max_seeds{std::numeric_limits::max()}; diff --git a/cpp/tests/link_prediction/similarity_compare.cpp b/cpp/tests/link_prediction/similarity_compare.cpp index b39ee983fa7..d2b1c4d203b 100644 --- a/cpp/tests/link_prediction/similarity_compare.cpp +++ b/cpp/tests/link_prediction/similarity_compare.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,9 @@ * limitations under the License. */ -#include -#include +#include "link_prediction/similarity_compare.hpp" + +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/link_prediction/similarity_compare.hpp b/cpp/tests/link_prediction/similarity_compare.hpp index 5c312a768d0..bbd942e2664 100644 --- a/cpp/tests/link_prediction/similarity_compare.hpp +++ b/cpp/tests/link_prediction/similarity_compare.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ #include #include + #include #include diff --git a/cpp/tests/link_prediction/similarity_test.cpp b/cpp/tests/link_prediction/similarity_test.cpp index be3761af2c7..cd58d400627 100644 --- a/cpp/tests/link_prediction/similarity_test.cpp +++ b/cpp/tests/link_prediction/similarity_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,12 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "link_prediction/similarity_compare.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/link_prediction/weighted_similarity_test.cpp b/cpp/tests/link_prediction/weighted_similarity_test.cpp index 99e752c0b02..694b0fa625c 100644 --- a/cpp/tests/link_prediction/weighted_similarity_test.cpp +++ b/cpp/tests/link_prediction/weighted_similarity_test.cpp @@ -13,12 +13,12 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "link_prediction/similarity_compare.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/mtmg/multi_node_threaded_test.cu b/cpp/tests/mtmg/multi_node_threaded_test.cu index 17aed4fdecf..0ac8c56bc46 100644 --- a/cpp/tests/mtmg/multi_node_threaded_test.cu +++ b/cpp/tests/mtmg/multi_node_threaded_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -34,15 +34,15 @@ #include +#include +#include + #include #include #include #include -#include -#include - struct Multithreaded_Usecase { bool test_weighted{false}; bool check_correctness{true}; diff --git a/cpp/tests/mtmg/threaded_test.cu b/cpp/tests/mtmg/threaded_test.cu index a5df0199cac..5d902e35dfa 100644 --- a/cpp/tests/mtmg/threaded_test.cu +++ b/cpp/tests/mtmg/threaded_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -33,15 +33,14 @@ #include -#include +#include +#include +#include #include #include -#include -#include - struct Multithreaded_Usecase { bool test_weighted{false}; bool check_correctness{true}; diff --git a/cpp/tests/mtmg/threaded_test_louvain.cu b/cpp/tests/mtmg/threaded_test_louvain.cu index c1395037646..d1e12057230 100644 --- a/cpp/tests/mtmg/threaded_test_louvain.cu +++ b/cpp/tests/mtmg/threaded_test_louvain.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -34,15 +34,14 @@ #include -#include +#include +#include +#include #include #include -#include -#include - struct Multithreaded_Usecase { bool test_weighted{false}; bool check_correctness{true}; diff --git a/cpp/tests/prims/mg_count_if_e.cu b/cpp/tests/prims/mg_count_if_e.cu index 03bf8ae0ae5..c3a1f08475f 100644 --- a/cpp/tests/prims/mg_count_if_e.cu +++ b/cpp/tests/prims/mg_count_if_e.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,15 @@ * limitations under the License. */ +#include "prims/count_if_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -33,13 +31,13 @@ #include #include -#include - #include #include #include + #include #include + #include #include #include @@ -48,6 +46,8 @@ #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 3d745708401..e4e6c9051f3 100644 --- a/cpp/tests/prims/mg_count_if_v.cu +++ b/cpp/tests/prims/mg_count_if_v.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,30 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include - -#include +#include "prims/count_if_v.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include #include -#include - #include #include #include + #include #include + #include #include +#include + #include #include diff --git a/cpp/tests/prims/mg_extract_transform_e.cu b/cpp/tests/prims/mg_extract_transform_e.cu index caa00e13640..ef50a6e025b 100644 --- a/cpp/tests/prims/mg_extract_transform_e.cu +++ b/cpp/tests/prims/mg_extract_transform_e.cu @@ -15,18 +15,16 @@ * limitations under the License. */ +#include "prims/extract_transform_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/vertex_frontier.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -35,14 +33,13 @@ #include #include -#include - #include #include #include + #include #include -#include + #include #include #include @@ -54,9 +51,12 @@ #include #include +#include + #include #include +#include #include template diff --git a/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu b/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu index 09c2fc0b2cb..1b90619bbc9 100644 --- a/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu +++ b/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu @@ -14,18 +14,16 @@ * limitations under the License. */ +#include "prims/extract_transform_v_frontier_outgoing_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/vertex_frontier.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -34,14 +32,13 @@ #include #include -#include - #include #include #include + #include #include -#include + #include #include #include @@ -53,9 +50,12 @@ #include #include +#include + #include #include +#include #include template diff --git a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu index ac73c446d89..0a519e30b9c 100644 --- a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu +++ b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,15 @@ * limitations under the License. */ +#include "prims/per_v_pair_transform_dst_nbr_intersection.cuh" +#include "prims/transform_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include - -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -40,6 +38,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu index 3e59bf3bf20..84186908b1d 100644 --- a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu +++ b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu @@ -14,20 +14,18 @@ * limitations under the License. */ +#include "prims/per_v_pair_transform_dst_nbr_intersection.cuh" #include "property_generator.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" -#include -#include -#include -#include -#include - -#include - +#include #include #include - -#include #include #include #include @@ -39,12 +37,12 @@ #include #include #include + #include #include #include #include -#include #include diff --git a/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu b/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu index 80aa34b68ae..94feecf2038 100644 --- a/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu +++ b/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,15 @@ * limitations under the License. */ +#include "prims/per_v_random_select_transform_outgoing_e.cuh" +#include "prims/vertex_frontier.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -38,6 +36,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu b/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu index fc8114a4652..efab53f89e6 100644 --- a/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu +++ b/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu @@ -14,18 +14,16 @@ * limitations under the License. */ +#include "prims/per_v_transform_reduce_incoming_outgoing_e.cuh" +#include "prims/reduce_op.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -35,14 +33,13 @@ #include #include -#include - #include #include #include + #include #include -#include + #include #include #include @@ -52,9 +49,12 @@ #include #include +#include + #include #include +#include template struct e_op_t { diff --git a/cpp/tests/prims/mg_reduce_v.cu b/cpp/tests/prims/mg_reduce_v.cu index b6f8da48ef4..da3354b77d9 100644 --- a/cpp/tests/prims/mg_reduce_v.cu +++ b/cpp/tests/prims/mg_reduce_v.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,27 @@ * limitations under the License. */ +#include "prims/property_op_utils.cuh" +#include "prims/reduce_v.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include #include -#include - #include #include #include + #include #include + #include #include #include @@ -45,6 +43,8 @@ #include #include +#include + #include #include diff --git a/cpp/tests/prims/mg_transform_e.cu b/cpp/tests/prims/mg_transform_e.cu index e9be80f1f7d..c569636f0e1 100644 --- a/cpp/tests/prims/mg_transform_e.cu +++ b/cpp/tests/prims/mg_transform_e.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,17 @@ * limitations under the License. */ +#include "prims/count_if_e.cuh" +#include "prims/edge_bucket.cuh" +#include "prims/fill_edge_property.cuh" +#include "prims/transform_e.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -34,18 +32,20 @@ #include #include -#include - #include #include #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 c4ae11ab7c9..c8ce9fc3a47 100644 --- a/cpp/tests/prims/mg_transform_reduce_e.cu +++ b/cpp/tests/prims/mg_transform_reduce_e.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,15 @@ * limitations under the License. */ +#include "prims/transform_reduce_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -33,13 +31,13 @@ #include #include -#include - #include #include #include + #include #include + #include #include #include @@ -48,6 +46,8 @@ #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 c9fc138ae1b..c0d44bc94f1 100644 --- a/cpp/tests/prims/mg_transform_reduce_v.cu +++ b/cpp/tests/prims/mg_transform_reduce_v.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,33 +14,33 @@ * limitations under the License. */ +#include "prims/transform_reduce_v.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include #include -#include - #include #include #include + #include #include + #include #include #include #include +#include + #include #include diff --git a/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_dst.cu b/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_dst.cu index 7d1b2dd9412..99161df2cb4 100644 --- a/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_dst.cu +++ b/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_dst.cu @@ -14,18 +14,16 @@ * limitations under the License. */ +#include "prims/transform_reduce_v_frontier_outgoing_e_by_dst.cuh" +#include "prims/update_edge_src_dst_property.cuh" +#include "prims/vertex_frontier.cuh" #include "property_generator.cuh" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -34,14 +32,13 @@ #include #include -#include - #include #include #include + #include #include -#include + #include #include #include @@ -53,9 +50,12 @@ #include #include +#include + #include #include +#include template struct e_op_t { diff --git a/cpp/tests/prims/property_generator.cuh b/cpp/tests/prims/property_generator.cuh index 680455eda79..0ac1f84c79b 100644 --- a/cpp/tests/prims/property_generator.cuh +++ b/cpp/tests/prims/property_generator.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,16 +15,15 @@ */ #pragma once -#include -#include +#include "prims/transform_e.cuh" +#include "prims/update_edge_src_dst_property.cuh" #include #include #include -#include - #include + #include #include @@ -33,6 +32,8 @@ #include #include +#include + #include #include diff --git a/cpp/tests/sampling/detail/nbr_sampling_utils.cuh b/cpp/tests/sampling/detail/nbr_sampling_utils.cuh index 8221073f556..b248723403a 100644 --- a/cpp/tests/sampling/detail/nbr_sampling_utils.cuh +++ b/cpp/tests/sampling/detail/nbr_sampling_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ // #pragma once -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -31,8 +31,6 @@ #include #include -#include - #include #include @@ -51,6 +49,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/tests/sampling/mg_random_walks_test.cpp b/cpp/tests/sampling/mg_random_walks_test.cpp index 29c929c8403..046fab141ea 100644 --- a/cpp/tests/sampling/mg_random_walks_test.cpp +++ b/cpp/tests/sampling/mg_random_walks_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,12 @@ * limitations under the License. */ -#include - -#include -#include -#include -#include -#include +#include "sampling/random_walks_check.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu index 57f85a212b1..22c1a4a7edf 100644 --- a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu +++ b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,8 +15,7 @@ */ #include "detail/nbr_sampling_utils.cuh" - -#include +#include "utilities/mg_utilities.hpp" #include diff --git a/cpp/tests/sampling/random_walks_check.cuh b/cpp/tests/sampling/random_walks_check.cuh index f73891a1537..399bf991785 100644 --- a/cpp/tests/sampling/random_walks_check.cuh +++ b/cpp/tests/sampling/random_walks_check.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "sampling/random_walks_check.hpp" +#include "utilities/device_comm_wrapper.hpp" #include #include -#include - #include #include diff --git a/cpp/tests/sampling/random_walks_check_mg.cu b/cpp/tests/sampling/random_walks_check_mg.cu index eb712075b42..49897b1267f 100644 --- a/cpp/tests/sampling/random_walks_check_mg.cu +++ b/cpp/tests/sampling/random_walks_check_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "sampling/random_walks_check.cuh" namespace cugraph { namespace test { diff --git a/cpp/tests/sampling/random_walks_check_sg.cu b/cpp/tests/sampling/random_walks_check_sg.cu index ca0b1168fb3..f9f14e30627 100644 --- a/cpp/tests/sampling/random_walks_check_sg.cu +++ b/cpp/tests/sampling/random_walks_check_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "sampling/random_walks_check.cuh" namespace cugraph { namespace test { diff --git a/cpp/tests/sampling/random_walks_utils.cuh b/cpp/tests/sampling/random_walks_utils.cuh index d87dd2414af..7e192262984 100644 --- a/cpp/tests/sampling/random_walks_utils.cuh +++ b/cpp/tests/sampling/random_walks_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,11 +15,12 @@ */ #pragma once -#include -#include +#include "sampling/random_walks.cuh" #include +#include + #include #include #include diff --git a/cpp/tests/sampling/sampling_post_processing_test.cu b/cpp/tests/sampling/sampling_post_processing_test.cu index 6be735c3482..c93994ddfad 100644 --- a/cpp/tests/sampling/sampling_post_processing_test.cu +++ b/cpp/tests/sampling/sampling_post_processing_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "utilities/base_fixture.hpp" #include #include @@ -24,10 +24,10 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -38,7 +38,7 @@ #include #include -#include +#include struct SamplingPostProcessing_Usecase { size_t num_labels{}; diff --git a/cpp/tests/sampling/sg_random_walks_test.cpp b/cpp/tests/sampling/sg_random_walks_test.cpp index 53b92446b14..b40ac2d66af 100644 --- a/cpp/tests/sampling/sg_random_walks_test.cpp +++ b/cpp/tests/sampling/sg_random_walks_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -#include - -#include -#include -#include -#include +#include "sampling/random_walks_check.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu b/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu index f795c11437f..1b038e2b6c4 100644 --- a/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu +++ b/cpp/tests/sampling/sg_uniform_neighbor_sampling.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ #include -#include - #include #include #include +#include + struct Uniform_Neighbor_Sampling_Usecase { std::vector fanout{{-1}}; int32_t batch_size{10}; diff --git a/cpp/tests/structure/coarsen_graph_test.cpp b/cpp/tests/structure/coarsen_graph_test.cpp index f326ddb20ee..e4969334d5a 100644 --- a/cpp/tests/structure/coarsen_graph_test.cpp +++ b/cpp/tests/structure/coarsen_graph_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -25,6 +25,7 @@ #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 b7f1dce2023..202dcecbc59 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,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/degree_test.cpp b/cpp/tests/structure/degree_test.cpp index 553149dc959..29bb9df50d5 100644 --- a/cpp/tests/structure/degree_test.cpp +++ b/cpp/tests/structure/degree_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -23,6 +23,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp b/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp index 3ad6953ca03..7138cee9579 100644 --- a/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp +++ b/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/induced_subgraph_test.cpp b/cpp/tests/structure/induced_subgraph_test.cpp index 05ca917e68e..31b1cd055a3 100644 --- a/cpp/tests/structure/induced_subgraph_test.cpp +++ b/cpp/tests/structure/induced_subgraph_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,9 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include - -#include -#include +#include "structure/induced_subgraph_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" #include #include @@ -26,6 +25,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/induced_subgraph_validate.cu b/cpp/tests/structure/induced_subgraph_validate.cu index f8f872e7e67..0b000010e48 100644 --- a/cpp/tests/structure/induced_subgraph_validate.cu +++ b/cpp/tests/structure/induced_subgraph_validate.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,20 +13,20 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include +#include "structure/induced_subgraph_validate.hpp" #include #include -#include - #include #include #include #include #include +#include + template void induced_subgraph_validate( raft::handle_t const& handle, 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 e62c62819f4..0fe76d93068 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp b/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp index 8079de7ebfe..ad3abbc5d8f 100644 --- a/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp +++ b/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -31,6 +31,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/mg_induced_subgraph_test.cu b/cpp/tests/structure/mg_induced_subgraph_test.cu index b7bd22dfa63..d1e242b1980 100644 --- a/cpp/tests/structure/mg_induced_subgraph_test.cu +++ b/cpp/tests/structure/mg_induced_subgraph_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include - -#include -#include -#include -#include +#include "structure/detail/structure_utils.cuh" +#include "structure/induced_subgraph_validate.hpp" +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" #include #include @@ -30,6 +29,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/mg_select_random_vertices_test.cpp b/cpp/tests/structure/mg_select_random_vertices_test.cpp index 8392a6831ca..47440522d32 100644 --- a/cpp/tests/structure/mg_select_random_vertices_test.cpp +++ b/cpp/tests/structure/mg_select_random_vertices_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,17 @@ * limitations under the License. */ +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" + #include -#include -#include -#include + +#include #include #include -#include - struct SelectRandomVertices_Usecase { size_t select_count{std::numeric_limits::max()}; bool check_correctness{true}; diff --git a/cpp/tests/structure/mg_symmetrize_test.cpp b/cpp/tests/structure/mg_symmetrize_test.cpp index f2d37170f76..3d1238c5751 100644 --- a/cpp/tests/structure/mg_symmetrize_test.cpp +++ b/cpp/tests/structure/mg_symmetrize_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -28,6 +28,7 @@ #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 1adce8d102e..f2f735685e6 100644 --- a/cpp/tests/structure/mg_transpose_storage_test.cpp +++ b/cpp/tests/structure/mg_transpose_storage_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -28,6 +28,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/mg_transpose_test.cpp b/cpp/tests/structure/mg_transpose_test.cpp index 03a31e14ca9..3da44c9159c 100644 --- a/cpp/tests/structure/mg_transpose_test.cpp +++ b/cpp/tests/structure/mg_transpose_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -28,6 +28,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/structure/renumbering_test.cpp b/cpp/tests/structure/renumbering_test.cpp index 25a2c227375..05b0df4805d 100644 --- a/cpp/tests/structure/renumbering_test.cpp +++ b/cpp/tests/structure/renumbering_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/streams.cu b/cpp/tests/structure/streams.cu index 44f8dab3b67..c0b6d80ed55 100644 --- a/cpp/tests/structure/streams.cu +++ b/cpp/tests/structure/streams.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,11 +15,14 @@ */ #include "gtest/gtest.h" + #include #include + #include #include #include + #include #include diff --git a/cpp/tests/structure/symmetrize_test.cpp b/cpp/tests/structure/symmetrize_test.cpp index 89ff9ed139a..5b065272565 100644 --- a/cpp/tests/structure/symmetrize_test.cpp +++ b/cpp/tests/structure/symmetrize_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -23,6 +23,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/transpose_storage_test.cpp b/cpp/tests/structure/transpose_storage_test.cpp index a713abf7dae..4a4b23f4a63 100644 --- a/cpp/tests/structure/transpose_storage_test.cpp +++ b/cpp/tests/structure/transpose_storage_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -23,6 +23,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/transpose_test.cpp b/cpp/tests/structure/transpose_test.cpp index 1cbefa21fcc..0bfa6742667 100644 --- a/cpp/tests/structure/transpose_test.cpp +++ b/cpp/tests/structure/transpose_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -23,6 +23,7 @@ #include #include + #include #include diff --git a/cpp/tests/structure/weight_sum_test.cpp b/cpp/tests/structure/weight_sum_test.cpp index 30de0092a5a..9148f57b8f4 100644 --- a/cpp/tests/structure/weight_sum_test.cpp +++ b/cpp/tests/structure/weight_sum_test.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -25,6 +25,7 @@ #include #include + #include #include diff --git a/cpp/tests/traversal/bfs_test.cpp b/cpp/tests/traversal/bfs_test.cpp index 7f084c49902..68aa8dc0cd4 100644 --- a/cpp/tests/traversal/bfs_test.cpp +++ b/cpp/tests/traversal/bfs_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #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 793ee309b7a..e6a5ad6f525 100644 --- a/cpp/tests/traversal/extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/extract_bfs_paths_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include #include diff --git a/cpp/tests/traversal/k_hop_nbrs_test.cpp b/cpp/tests/traversal/k_hop_nbrs_test.cpp index cd66ed6e7cc..c2bea204779 100644 --- a/cpp/tests/traversal/k_hop_nbrs_test.cpp +++ b/cpp/tests/traversal/k_hop_nbrs_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include #include diff --git a/cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/traversal/mg_bfs_test.cpp index aac231f633f..33fd3319551 100644 --- a/cpp/tests/traversal/mg_bfs_test.cpp +++ b/cpp/tests/traversal/mg_bfs_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #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 fc77c11ca3e..f51282b639f 100644 --- a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp b/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp index 8ea7427a2b2..ae4a65cfb53 100644 --- a/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp +++ b/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/traversal/mg_sssp_test.cpp b/cpp/tests/traversal/mg_sssp_test.cpp index ea0353c3743..18a36f43da3 100644 --- a/cpp/tests/traversal/mg_sssp_test.cpp +++ b/cpp/tests/traversal/mg_sssp_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -30,6 +30,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/traversal/ms_bfs_test.cu b/cpp/tests/traversal/ms_bfs_test.cu index d010b113fe2..ffaf1dc18a9 100644 --- a/cpp/tests/traversal/ms_bfs_test.cu +++ b/cpp/tests/traversal/ms_bfs_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,9 @@ * limitations under the License. */ -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -25,12 +26,12 @@ #include #include + #include #include #include #include -#include #include #include #include @@ -39,13 +40,14 @@ #include #include +#include + #include #include #include #include #include -#include #include struct MsBfs_Usecase { diff --git a/cpp/tests/traversal/od_shortest_distances_test.cpp b/cpp/tests/traversal/od_shortest_distances_test.cpp index cc283f24dfd..638124e4ef7 100644 --- a/cpp/tests/traversal/od_shortest_distances_test.cpp +++ b/cpp/tests/traversal/od_shortest_distances_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -27,6 +27,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/traversal/sssp_test.cpp b/cpp/tests/traversal/sssp_test.cpp index ab73d02c912..2e5bc09a6a4 100644 --- a/cpp/tests/traversal/sssp_test.cpp +++ b/cpp/tests/traversal/sssp_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include "utilities/base_fixture.hpp" +#include "utilities/test_graphs.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include @@ -27,6 +27,7 @@ #include #include + #include #include diff --git a/cpp/tests/tree/mst_test.cu b/cpp/tests/tree/mst_test.cu index d3998ad65e8..b7b104190cd 100644 --- a/cpp/tests/tree/mst_test.cu +++ b/cpp/tests/tree/mst_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, 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,8 +17,9 @@ // Mst solver tests // Author: Alex Fender afender@nvidia.com -#include -#include +#include "../src/converters/legacy/COOtoCSR.cuh" +#include "utilities/base_fixture.hpp" +#include "utilities/test_utilities.hpp" #include #include @@ -27,15 +28,14 @@ #include #include -#include - -#include - -#include "../src/converters/legacy/COOtoCSR.cuh" #include #include #include +#include + +#include + typedef struct Mst_Usecase_t { std::string matrix_file; Mst_Usecase_t(const std::string& a) diff --git a/cpp/tests/utilities/base_fixture.hpp b/cpp/tests/utilities/base_fixture.hpp index 7471e005ca0..5c984d7979b 100644 --- a/cpp/tests/utilities/base_fixture.hpp +++ b/cpp/tests/utilities/base_fixture.hpp @@ -16,9 +16,9 @@ #pragma once -#include -#include -#include +#include "utilities/cxxopts.hpp" +#include "utilities/mg_utilities.hpp" +#include "utilities/test_graphs.hpp" #include diff --git a/cpp/tests/utilities/csv_file_utilities.cu b/cpp/tests/utilities/csv_file_utilities.cu index cf6aeaf4436..d801b18cf02 100644 --- a/cpp/tests/utilities/csv_file_utilities.cu +++ b/cpp/tests/utilities/csv_file_utilities.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include - -#include +#include "detail/graph_partition_utils.cuh" +#include "utilities/test_utilities.hpp" #include #include #include + #include #include diff --git a/cpp/tests/utilities/matrix_market_file_utilities.cu b/cpp/tests/utilities/matrix_market_file_utilities.cu index 5b5c281943e..b76e9fdf8cf 100644 --- a/cpp/tests/utilities/matrix_market_file_utilities.cu +++ b/cpp/tests/utilities/matrix_market_file_utilities.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ -#include -#include +#include "detail/graph_partition_utils.cuh" +#include "utilities/test_utilities.hpp" #include #include #include #include + #include #include diff --git a/cpp/tests/utilities/mg_utilities.cpp b/cpp/tests/utilities/mg_utilities.cpp index 9cac26da435..86ccdccd49a 100644 --- a/cpp/tests/utilities/mg_utilities.cpp +++ b/cpp/tests/utilities/mg_utilities.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/utilities/misc_utilities.cpp b/cpp/tests/utilities/misc_utilities.cpp index 85949416ad6..842b2fdd7db 100644 --- a/cpp/tests/utilities/misc_utilities.cpp +++ b/cpp/tests/utilities/misc_utilities.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "utilities/test_utilities.hpp" #include #include diff --git a/cpp/tests/utilities/test_graphs.hpp b/cpp/tests/utilities/test_graphs.hpp index 5a9dc9c90d4..9b7ffe74e85 100644 --- a/cpp/tests/utilities/test_graphs.hpp +++ b/cpp/tests/utilities/test_graphs.hpp @@ -15,6 +15,9 @@ */ #pragma once +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" + #include #include #include @@ -23,9 +26,6 @@ #include -#include -#include - #include namespace cugraph { diff --git a/cpp/tests/utilities/test_utilities.hpp b/cpp/tests/utilities/test_utilities.hpp index 3fa6ae089d3..8bf606e5753 100644 --- a/cpp/tests/utilities/test_utilities.hpp +++ b/cpp/tests/utilities/test_utilities.hpp @@ -21,7 +21,9 @@ #include #include + #include + #include #include diff --git a/cpp/tests/utilities/test_utilities_impl.cuh b/cpp/tests/utilities/test_utilities_impl.cuh index 856c50ad35f..a50a1a89663 100644 --- a/cpp/tests/utilities/test_utilities_impl.cuh +++ b/cpp/tests/utilities/test_utilities_impl.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, 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,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include "structure/detail/structure_utils.cuh" +#include "utilities/device_comm_wrapper.hpp" +#include "utilities/test_utilities.hpp" +#include "utilities/thrust_wrapper.hpp" #include #include diff --git a/cpp/tests/utilities/test_utilities_mg.cu b/cpp/tests/utilities/test_utilities_mg.cu index 7366a8376a4..2d7fb2072e2 100644 --- a/cpp/tests/utilities/test_utilities_mg.cu +++ b/cpp/tests/utilities/test_utilities_mg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include +#include "utilities/test_utilities_impl.cuh" namespace cugraph { namespace test { diff --git a/cpp/tests/utilities/test_utilities_sg.cu b/cpp/tests/utilities/test_utilities_sg.cu index aceff526f21..8fa32c7ac63 100644 --- a/cpp/tests/utilities/test_utilities_sg.cu +++ b/cpp/tests/utilities/test_utilities_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governin_from_mtxg permissions and * limitations under the License. */ -#include +#include "utilities/test_utilities_impl.cuh" namespace cugraph { namespace test { diff --git a/cpp/tests/utilities/thrust_wrapper.cu b/cpp/tests/utilities/thrust_wrapper.cu index 2daf250b4a2..7d485dd5ab3 100644 --- a/cpp/tests/utilities/thrust_wrapper.cu +++ b/cpp/tests/utilities/thrust_wrapper.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,12 @@ * limitations under the License. */ +#include "utilities/thrust_wrapper.hpp" + #include -#include #include + #include #include diff --git a/cpp/tests/utilities/thrust_wrapper.hpp b/cpp/tests/utilities/thrust_wrapper.hpp index fb82d781198..ae2f5f2fdf7 100644 --- a/cpp/tests/utilities/thrust_wrapper.hpp +++ b/cpp/tests/utilities/thrust_wrapper.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, 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,6 +17,7 @@ #include #include + #include #include