From a5fd9af7d54fda46727a8850a6654c7fdeb569ec Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 13:43:39 -0500 Subject: [PATCH 1/8] move public headers into include/cugraph dir --- cpp/include/{ => cugraph}/algorithms.hpp | 0 cpp/include/{ => cugraph}/compute_partition.cuh | 0 cpp/include/{ => cugraph}/dendrogram.hpp | 0 cpp/include/{ => cugraph}/eidecl_graph.hpp | 0 cpp/include/{ => cugraph}/eidir_graph.hpp | 0 cpp/include/{ => cugraph}/experimental/detail/graph_utils.cuh | 0 cpp/include/{ => cugraph}/experimental/eidecl_graph.hpp | 0 cpp/include/{ => cugraph}/experimental/eidir_graph.hpp | 0 cpp/include/{ => cugraph}/experimental/graph.hpp | 0 cpp/include/{ => cugraph}/experimental/graph_functions.hpp | 0 cpp/include/{ => cugraph}/experimental/graph_generator.hpp | 0 cpp/include/{ => cugraph}/experimental/graph_view.hpp | 0 .../{ => cugraph}/experimental/include_cuco_static_map.cuh | 0 cpp/include/{ => cugraph}/functions.hpp | 0 cpp/include/{ => cugraph}/graph.hpp | 0 cpp/include/{ => cugraph}/internals.hpp | 0 cpp/include/{ => cugraph}/matrix_partition_device.cuh | 0 cpp/include/{ => cugraph}/partition_manager.hpp | 0 cpp/include/{ => cugraph}/patterns/any_of_adj_matrix_row.cuh | 0 cpp/include/{ => cugraph}/patterns/copy_to_adj_matrix_row_col.cuh | 0 .../{ => cugraph}/patterns/copy_v_transform_reduce_in_out_nbr.cuh | 0 .../patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh | 0 cpp/include/{ => cugraph}/patterns/count_if_e.cuh | 0 cpp/include/{ => cugraph}/patterns/count_if_v.cuh | 0 cpp/include/{ => cugraph}/patterns/edge_op_utils.cuh | 0 cpp/include/{ => cugraph}/patterns/reduce_op.cuh | 0 cpp/include/{ => cugraph}/patterns/reduce_v.cuh | 0 .../patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh | 0 cpp/include/{ => cugraph}/patterns/transform_reduce_e.cuh | 0 cpp/include/{ => cugraph}/patterns/transform_reduce_v.cuh | 0 .../patterns/transform_reduce_v_with_adj_matrix_row.cuh | 0 .../{ => cugraph}/patterns/update_frontier_v_push_if_out_nbr.cuh | 0 cpp/include/{ => cugraph}/patterns/vertex_frontier.cuh | 0 cpp/include/{ => cugraph}/utilities/collect_comm.cuh | 0 cpp/include/{ => cugraph}/utilities/cython.hpp | 0 cpp/include/{ => cugraph}/utilities/dataframe_buffer.cuh | 0 cpp/include/{ => cugraph}/utilities/device_comm.cuh | 0 cpp/include/{ => cugraph}/utilities/error.hpp | 0 cpp/include/{ => cugraph}/utilities/graph_traits.hpp | 0 cpp/include/{ => cugraph}/utilities/host_barrier.hpp | 0 cpp/include/{ => cugraph}/utilities/host_scalar_comm.cuh | 0 cpp/include/{ => cugraph}/utilities/path_retrieval.hpp | 0 cpp/include/{ => cugraph}/utilities/shuffle_comm.cuh | 0 cpp/include/{ => cugraph}/utilities/thrust_tuple_utils.cuh | 0 cpp/include/{ => cugraph}/vertex_partition_device.cuh | 0 45 files changed, 0 insertions(+), 0 deletions(-) rename cpp/include/{ => cugraph}/algorithms.hpp (100%) rename cpp/include/{ => cugraph}/compute_partition.cuh (100%) rename cpp/include/{ => cugraph}/dendrogram.hpp (100%) rename cpp/include/{ => cugraph}/eidecl_graph.hpp (100%) rename cpp/include/{ => cugraph}/eidir_graph.hpp (100%) rename cpp/include/{ => cugraph}/experimental/detail/graph_utils.cuh (100%) rename cpp/include/{ => cugraph}/experimental/eidecl_graph.hpp (100%) rename cpp/include/{ => cugraph}/experimental/eidir_graph.hpp (100%) rename cpp/include/{ => cugraph}/experimental/graph.hpp (100%) rename cpp/include/{ => cugraph}/experimental/graph_functions.hpp (100%) rename cpp/include/{ => cugraph}/experimental/graph_generator.hpp (100%) rename cpp/include/{ => cugraph}/experimental/graph_view.hpp (100%) rename cpp/include/{ => cugraph}/experimental/include_cuco_static_map.cuh (100%) rename cpp/include/{ => cugraph}/functions.hpp (100%) rename cpp/include/{ => cugraph}/graph.hpp (100%) rename cpp/include/{ => cugraph}/internals.hpp (100%) rename cpp/include/{ => cugraph}/matrix_partition_device.cuh (100%) rename cpp/include/{ => cugraph}/partition_manager.hpp (100%) rename cpp/include/{ => cugraph}/patterns/any_of_adj_matrix_row.cuh (100%) rename cpp/include/{ => cugraph}/patterns/copy_to_adj_matrix_row_col.cuh (100%) rename cpp/include/{ => cugraph}/patterns/copy_v_transform_reduce_in_out_nbr.cuh (100%) rename cpp/include/{ => cugraph}/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh (100%) rename cpp/include/{ => cugraph}/patterns/count_if_e.cuh (100%) rename cpp/include/{ => cugraph}/patterns/count_if_v.cuh (100%) rename cpp/include/{ => cugraph}/patterns/edge_op_utils.cuh (100%) rename cpp/include/{ => cugraph}/patterns/reduce_op.cuh (100%) rename cpp/include/{ => cugraph}/patterns/reduce_v.cuh (100%) rename cpp/include/{ => cugraph}/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh (100%) rename cpp/include/{ => cugraph}/patterns/transform_reduce_e.cuh (100%) rename cpp/include/{ => cugraph}/patterns/transform_reduce_v.cuh (100%) rename cpp/include/{ => cugraph}/patterns/transform_reduce_v_with_adj_matrix_row.cuh (100%) rename cpp/include/{ => cugraph}/patterns/update_frontier_v_push_if_out_nbr.cuh (100%) rename cpp/include/{ => cugraph}/patterns/vertex_frontier.cuh (100%) rename cpp/include/{ => cugraph}/utilities/collect_comm.cuh (100%) rename cpp/include/{ => cugraph}/utilities/cython.hpp (100%) rename cpp/include/{ => cugraph}/utilities/dataframe_buffer.cuh (100%) rename cpp/include/{ => cugraph}/utilities/device_comm.cuh (100%) rename cpp/include/{ => cugraph}/utilities/error.hpp (100%) rename cpp/include/{ => cugraph}/utilities/graph_traits.hpp (100%) rename cpp/include/{ => cugraph}/utilities/host_barrier.hpp (100%) rename cpp/include/{ => cugraph}/utilities/host_scalar_comm.cuh (100%) rename cpp/include/{ => cugraph}/utilities/path_retrieval.hpp (100%) rename cpp/include/{ => cugraph}/utilities/shuffle_comm.cuh (100%) rename cpp/include/{ => cugraph}/utilities/thrust_tuple_utils.cuh (100%) rename cpp/include/{ => cugraph}/vertex_partition_device.cuh (100%) diff --git a/cpp/include/algorithms.hpp b/cpp/include/cugraph/algorithms.hpp similarity index 100% rename from cpp/include/algorithms.hpp rename to cpp/include/cugraph/algorithms.hpp diff --git a/cpp/include/compute_partition.cuh b/cpp/include/cugraph/compute_partition.cuh similarity index 100% rename from cpp/include/compute_partition.cuh rename to cpp/include/cugraph/compute_partition.cuh diff --git a/cpp/include/dendrogram.hpp b/cpp/include/cugraph/dendrogram.hpp similarity index 100% rename from cpp/include/dendrogram.hpp rename to cpp/include/cugraph/dendrogram.hpp diff --git a/cpp/include/eidecl_graph.hpp b/cpp/include/cugraph/eidecl_graph.hpp similarity index 100% rename from cpp/include/eidecl_graph.hpp rename to cpp/include/cugraph/eidecl_graph.hpp diff --git a/cpp/include/eidir_graph.hpp b/cpp/include/cugraph/eidir_graph.hpp similarity index 100% rename from cpp/include/eidir_graph.hpp rename to cpp/include/cugraph/eidir_graph.hpp diff --git a/cpp/include/experimental/detail/graph_utils.cuh b/cpp/include/cugraph/experimental/detail/graph_utils.cuh similarity index 100% rename from cpp/include/experimental/detail/graph_utils.cuh rename to cpp/include/cugraph/experimental/detail/graph_utils.cuh diff --git a/cpp/include/experimental/eidecl_graph.hpp b/cpp/include/cugraph/experimental/eidecl_graph.hpp similarity index 100% rename from cpp/include/experimental/eidecl_graph.hpp rename to cpp/include/cugraph/experimental/eidecl_graph.hpp diff --git a/cpp/include/experimental/eidir_graph.hpp b/cpp/include/cugraph/experimental/eidir_graph.hpp similarity index 100% rename from cpp/include/experimental/eidir_graph.hpp rename to cpp/include/cugraph/experimental/eidir_graph.hpp diff --git a/cpp/include/experimental/graph.hpp b/cpp/include/cugraph/experimental/graph.hpp similarity index 100% rename from cpp/include/experimental/graph.hpp rename to cpp/include/cugraph/experimental/graph.hpp diff --git a/cpp/include/experimental/graph_functions.hpp b/cpp/include/cugraph/experimental/graph_functions.hpp similarity index 100% rename from cpp/include/experimental/graph_functions.hpp rename to cpp/include/cugraph/experimental/graph_functions.hpp diff --git a/cpp/include/experimental/graph_generator.hpp b/cpp/include/cugraph/experimental/graph_generator.hpp similarity index 100% rename from cpp/include/experimental/graph_generator.hpp rename to cpp/include/cugraph/experimental/graph_generator.hpp diff --git a/cpp/include/experimental/graph_view.hpp b/cpp/include/cugraph/experimental/graph_view.hpp similarity index 100% rename from cpp/include/experimental/graph_view.hpp rename to cpp/include/cugraph/experimental/graph_view.hpp diff --git a/cpp/include/experimental/include_cuco_static_map.cuh b/cpp/include/cugraph/experimental/include_cuco_static_map.cuh similarity index 100% rename from cpp/include/experimental/include_cuco_static_map.cuh rename to cpp/include/cugraph/experimental/include_cuco_static_map.cuh diff --git a/cpp/include/functions.hpp b/cpp/include/cugraph/functions.hpp similarity index 100% rename from cpp/include/functions.hpp rename to cpp/include/cugraph/functions.hpp diff --git a/cpp/include/graph.hpp b/cpp/include/cugraph/graph.hpp similarity index 100% rename from cpp/include/graph.hpp rename to cpp/include/cugraph/graph.hpp diff --git a/cpp/include/internals.hpp b/cpp/include/cugraph/internals.hpp similarity index 100% rename from cpp/include/internals.hpp rename to cpp/include/cugraph/internals.hpp diff --git a/cpp/include/matrix_partition_device.cuh b/cpp/include/cugraph/matrix_partition_device.cuh similarity index 100% rename from cpp/include/matrix_partition_device.cuh rename to cpp/include/cugraph/matrix_partition_device.cuh diff --git a/cpp/include/partition_manager.hpp b/cpp/include/cugraph/partition_manager.hpp similarity index 100% rename from cpp/include/partition_manager.hpp rename to cpp/include/cugraph/partition_manager.hpp diff --git a/cpp/include/patterns/any_of_adj_matrix_row.cuh b/cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh similarity index 100% rename from cpp/include/patterns/any_of_adj_matrix_row.cuh rename to cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh diff --git a/cpp/include/patterns/copy_to_adj_matrix_row_col.cuh b/cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh similarity index 100% rename from cpp/include/patterns/copy_to_adj_matrix_row_col.cuh rename to cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh diff --git a/cpp/include/patterns/copy_v_transform_reduce_in_out_nbr.cuh b/cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh similarity index 100% rename from cpp/include/patterns/copy_v_transform_reduce_in_out_nbr.cuh rename to cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh diff --git a/cpp/include/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh b/cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh similarity index 100% rename from cpp/include/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh rename to cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh diff --git a/cpp/include/patterns/count_if_e.cuh b/cpp/include/cugraph/patterns/count_if_e.cuh similarity index 100% rename from cpp/include/patterns/count_if_e.cuh rename to cpp/include/cugraph/patterns/count_if_e.cuh diff --git a/cpp/include/patterns/count_if_v.cuh b/cpp/include/cugraph/patterns/count_if_v.cuh similarity index 100% rename from cpp/include/patterns/count_if_v.cuh rename to cpp/include/cugraph/patterns/count_if_v.cuh diff --git a/cpp/include/patterns/edge_op_utils.cuh b/cpp/include/cugraph/patterns/edge_op_utils.cuh similarity index 100% rename from cpp/include/patterns/edge_op_utils.cuh rename to cpp/include/cugraph/patterns/edge_op_utils.cuh diff --git a/cpp/include/patterns/reduce_op.cuh b/cpp/include/cugraph/patterns/reduce_op.cuh similarity index 100% rename from cpp/include/patterns/reduce_op.cuh rename to cpp/include/cugraph/patterns/reduce_op.cuh diff --git a/cpp/include/patterns/reduce_v.cuh b/cpp/include/cugraph/patterns/reduce_v.cuh similarity index 100% rename from cpp/include/patterns/reduce_v.cuh rename to cpp/include/cugraph/patterns/reduce_v.cuh diff --git a/cpp/include/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh b/cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh similarity index 100% rename from cpp/include/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh rename to cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh diff --git a/cpp/include/patterns/transform_reduce_e.cuh b/cpp/include/cugraph/patterns/transform_reduce_e.cuh similarity index 100% rename from cpp/include/patterns/transform_reduce_e.cuh rename to cpp/include/cugraph/patterns/transform_reduce_e.cuh diff --git a/cpp/include/patterns/transform_reduce_v.cuh b/cpp/include/cugraph/patterns/transform_reduce_v.cuh similarity index 100% rename from cpp/include/patterns/transform_reduce_v.cuh rename to cpp/include/cugraph/patterns/transform_reduce_v.cuh diff --git a/cpp/include/patterns/transform_reduce_v_with_adj_matrix_row.cuh b/cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh similarity index 100% rename from cpp/include/patterns/transform_reduce_v_with_adj_matrix_row.cuh rename to cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh diff --git a/cpp/include/patterns/update_frontier_v_push_if_out_nbr.cuh b/cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh similarity index 100% rename from cpp/include/patterns/update_frontier_v_push_if_out_nbr.cuh rename to cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh diff --git a/cpp/include/patterns/vertex_frontier.cuh b/cpp/include/cugraph/patterns/vertex_frontier.cuh similarity index 100% rename from cpp/include/patterns/vertex_frontier.cuh rename to cpp/include/cugraph/patterns/vertex_frontier.cuh diff --git a/cpp/include/utilities/collect_comm.cuh b/cpp/include/cugraph/utilities/collect_comm.cuh similarity index 100% rename from cpp/include/utilities/collect_comm.cuh rename to cpp/include/cugraph/utilities/collect_comm.cuh diff --git a/cpp/include/utilities/cython.hpp b/cpp/include/cugraph/utilities/cython.hpp similarity index 100% rename from cpp/include/utilities/cython.hpp rename to cpp/include/cugraph/utilities/cython.hpp diff --git a/cpp/include/utilities/dataframe_buffer.cuh b/cpp/include/cugraph/utilities/dataframe_buffer.cuh similarity index 100% rename from cpp/include/utilities/dataframe_buffer.cuh rename to cpp/include/cugraph/utilities/dataframe_buffer.cuh diff --git a/cpp/include/utilities/device_comm.cuh b/cpp/include/cugraph/utilities/device_comm.cuh similarity index 100% rename from cpp/include/utilities/device_comm.cuh rename to cpp/include/cugraph/utilities/device_comm.cuh diff --git a/cpp/include/utilities/error.hpp b/cpp/include/cugraph/utilities/error.hpp similarity index 100% rename from cpp/include/utilities/error.hpp rename to cpp/include/cugraph/utilities/error.hpp diff --git a/cpp/include/utilities/graph_traits.hpp b/cpp/include/cugraph/utilities/graph_traits.hpp similarity index 100% rename from cpp/include/utilities/graph_traits.hpp rename to cpp/include/cugraph/utilities/graph_traits.hpp diff --git a/cpp/include/utilities/host_barrier.hpp b/cpp/include/cugraph/utilities/host_barrier.hpp similarity index 100% rename from cpp/include/utilities/host_barrier.hpp rename to cpp/include/cugraph/utilities/host_barrier.hpp diff --git a/cpp/include/utilities/host_scalar_comm.cuh b/cpp/include/cugraph/utilities/host_scalar_comm.cuh similarity index 100% rename from cpp/include/utilities/host_scalar_comm.cuh rename to cpp/include/cugraph/utilities/host_scalar_comm.cuh diff --git a/cpp/include/utilities/path_retrieval.hpp b/cpp/include/cugraph/utilities/path_retrieval.hpp similarity index 100% rename from cpp/include/utilities/path_retrieval.hpp rename to cpp/include/cugraph/utilities/path_retrieval.hpp diff --git a/cpp/include/utilities/shuffle_comm.cuh b/cpp/include/cugraph/utilities/shuffle_comm.cuh similarity index 100% rename from cpp/include/utilities/shuffle_comm.cuh rename to cpp/include/cugraph/utilities/shuffle_comm.cuh diff --git a/cpp/include/utilities/thrust_tuple_utils.cuh b/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh similarity index 100% rename from cpp/include/utilities/thrust_tuple_utils.cuh rename to cpp/include/cugraph/utilities/thrust_tuple_utils.cuh diff --git a/cpp/include/vertex_partition_device.cuh b/cpp/include/cugraph/vertex_partition_device.cuh similarity index 100% rename from cpp/include/vertex_partition_device.cuh rename to cpp/include/cugraph/vertex_partition_device.cuh From f872cc1f5e6e71782ddddd14e7a4c23df47d8cb7 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 15:20:01 -0500 Subject: [PATCH 2/8] update include paths --- cpp/include/cugraph/algorithms.hpp | 10 +++---- cpp/include/cugraph/compute_partition.cuh | 2 +- cpp/include/cugraph/eidecl_graph.hpp | 2 +- cpp/include/cugraph/eidir_graph.hpp | 2 +- .../experimental/detail/graph_utils.cuh | 8 +++--- .../cugraph/experimental/eidecl_graph.hpp | 2 +- .../cugraph/experimental/eidir_graph.hpp | 2 +- cpp/include/cugraph/experimental/graph.hpp | 4 +-- .../cugraph/experimental/graph_functions.hpp | 4 +-- .../cugraph/experimental/graph_view.hpp | 2 +- cpp/include/cugraph/functions.hpp | 4 +-- cpp/include/cugraph/internals.hpp | 2 +- .../cugraph/matrix_partition_device.cuh | 4 +-- cpp/include/cugraph/partition_manager.hpp | 2 +- .../patterns/any_of_adj_matrix_row.cuh | 6 ++--- .../patterns/copy_to_adj_matrix_row_col.cuh | 20 +++++++------- .../copy_v_transform_reduce_in_out_nbr.cuh | 16 ++++++------ ...ransform_reduce_key_aggregated_out_nbr.cuh | 24 ++++++++--------- cpp/include/cugraph/patterns/count_if_e.cuh | 6 ++--- cpp/include/cugraph/patterns/count_if_v.cuh | 6 ++--- .../cugraph/patterns/edge_op_utils.cuh | 2 +- cpp/include/cugraph/patterns/reduce_v.cuh | 6 ++--- ...orm_reduce_by_adj_matrix_row_col_key_e.cuh | 14 +++++----- .../cugraph/patterns/transform_reduce_e.cuh | 10 +++---- .../cugraph/patterns/transform_reduce_v.cuh | 6 ++--- ...transform_reduce_v_with_adj_matrix_row.cuh | 6 ++--- .../update_frontier_v_push_if_out_nbr.cuh | 26 +++++++++---------- .../cugraph/patterns/vertex_frontier.cuh | 6 ++--- .../cugraph/utilities/collect_comm.cuh | 8 +++--- cpp/include/cugraph/utilities/cython.hpp | 6 ++--- .../cugraph/utilities/dataframe_buffer.cuh | 2 +- cpp/include/cugraph/utilities/device_comm.cuh | 2 +- .../cugraph/utilities/host_scalar_comm.cuh | 2 +- .../cugraph/utilities/shuffle_comm.cuh | 4 +-- .../cugraph/vertex_partition_device.cuh | 6 ++--- cpp/src/centrality/README.md | 4 +-- cpp/src/centrality/betweenness_centrality.cu | 6 ++--- cpp/src/centrality/katz_centrality.cu | 4 +-- cpp/src/community/README.md | 4 +-- cpp/src/community/ecg.cu | 4 +-- cpp/src/community/egonet.cu | 14 +++++----- .../community/extract_subgraph_by_vertex.cu | 6 ++--- cpp/src/community/flatten_dendrogram.cuh | 4 +-- cpp/src/community/ktruss.cu | 4 +-- cpp/src/community/louvain.cu | 4 +-- cpp/src/community/louvain.cuh | 4 +-- cpp/src/community/spectral_clustering.cu | 8 +++--- cpp/src/community/triangles_counting.cu | 6 ++--- cpp/src/components/connectivity.cu | 8 +++--- cpp/src/components/utils.h | 2 +- cpp/src/converters/COOtoCSR.cu | 4 +-- cpp/src/converters/COOtoCSR.cuh | 6 ++--- cpp/src/converters/permute_graph.cuh | 6 ++--- cpp/src/converters/renumber.cuh | 4 +-- cpp/src/cores/core_number.cu | 4 +-- cpp/src/experimental/bfs.cu | 14 +++++----- cpp/src/experimental/coarsen_graph.cu | 16 ++++++------ .../experimental/generate_rmat_edgelist.cu | 4 +-- cpp/src/experimental/graph.cu | 12 ++++----- cpp/src/experimental/graph_view.cu | 12 ++++----- cpp/src/experimental/induced_subgraph.cu | 10 +++---- cpp/src/experimental/katz_centrality.cu | 14 +++++----- cpp/src/experimental/louvain.cuh | 24 ++++++++--------- cpp/src/experimental/pagerank.cu | 22 ++++++++-------- cpp/src/experimental/relabel.cu | 18 ++++++------- cpp/src/experimental/renumber_edgelist.cu | 20 +++++++------- cpp/src/experimental/renumber_utils.cu | 12 ++++----- cpp/src/experimental/sssp.cu | 20 +++++++------- cpp/src/layout/barnes_hut.hpp | 10 +++---- cpp/src/layout/exact_fa2.hpp | 8 +++--- cpp/src/layout/fa2_kernels.hpp | 4 +-- cpp/src/linear_assignment/hungarian.cu | 4 +-- cpp/src/link_analysis/gunrock_hits.cpp | 6 ++--- cpp/src/link_prediction/jaccard.cu | 6 ++--- cpp/src/link_prediction/overlap.cu | 6 ++--- cpp/src/sampling/random_walks.cu | 2 +- cpp/src/sampling/random_walks.cuh | 2 +- cpp/src/sort/bitonic.cuh | 2 +- cpp/src/structure/graph.cu | 8 +++--- cpp/src/traversal/README.md | 4 +-- cpp/src/traversal/bfs.cu | 6 ++--- cpp/src/traversal/bfs_kernels.cuh | 2 +- cpp/src/traversal/mg/frontier_expand.cuh | 4 +-- .../traversal/mg/frontier_expand_kernels.cuh | 4 +-- cpp/src/traversal/sssp.cu | 4 +-- cpp/src/traversal/sssp_kernels.cuh | 2 +- cpp/src/traversal/traversal_common.cuh | 2 +- cpp/src/traversal/tsp.hpp | 2 +- cpp/src/traversal/two_hop_neighbors.cu | 6 ++--- cpp/src/tree/mst.cu | 8 +++--- cpp/src/utilities/cython.cu | 20 +++++++------- cpp/src/utilities/graph_utils.cuh | 2 +- cpp/src/utilities/host_barrier.cpp | 2 +- cpp/src/utilities/path_retrieval.cu | 4 +-- cpp/src/utilities/spmv_1D.cuh | 4 +-- .../centrality/betweenness_centrality_test.cu | 4 +-- .../edge_betweenness_centrality_test.cu | 4 +-- cpp/tests/centrality/katz_centrality_test.cu | 4 +-- cpp/tests/community/balanced_edge_test.cpp | 2 +- cpp/tests/community/ecg_test.cpp | 4 +-- cpp/tests/community/egonet_test.cu | 6 ++--- cpp/tests/community/leiden_test.cpp | 4 +-- cpp/tests/community/louvain_test.cpp | 4 +-- cpp/tests/community/mg_louvain_helper.cu | 8 +++--- cpp/tests/community/mg_louvain_helper.hpp | 2 +- cpp/tests/community/mg_louvain_test.cpp | 4 +-- cpp/tests/community/triangle_test.cu | 4 +-- cpp/tests/components/con_comp_test.cu | 4 +-- cpp/tests/components/scc_test.cu | 4 +-- cpp/tests/components/wcc_graphs.hpp | 2 +- cpp/tests/components/wcc_test.cpp | 4 +-- cpp/tests/experimental/bfs_test.cpp | 8 +++--- cpp/tests/experimental/coarsen_graph_test.cpp | 8 +++--- cpp/tests/experimental/degree_test.cpp | 6 ++--- cpp/tests/experimental/generate_rmat_test.cpp | 4 +-- cpp/tests/experimental/graph_test.cpp | 4 +-- .../experimental/induced_subgraph_test.cpp | 6 ++--- .../experimental/katz_centrality_test.cpp | 8 +++--- cpp/tests/experimental/mg_bfs_test.cpp | 10 +++---- .../experimental/mg_katz_centrality_test.cpp | 4 +-- cpp/tests/experimental/mg_sssp_test.cpp | 10 +++---- cpp/tests/experimental/ms_bfs_test.cpp | 8 +++--- cpp/tests/experimental/pagerank_test.cpp | 8 +++--- cpp/tests/experimental/sssp_test.cpp | 8 +++--- cpp/tests/experimental/weight_sum_test.cpp | 6 ++--- cpp/tests/layout/force_atlas2_test.cu | 4 +-- cpp/tests/linear_assignment/hungarian_test.cu | 16 ++++++------ cpp/tests/pagerank/mg_pagerank_test.cpp | 10 +++---- cpp/tests/sampling/random_walks_profiling.cu | 4 +-- cpp/tests/sampling/random_walks_test.cu | 4 +-- cpp/tests/sampling/random_walks_utils.cuh | 2 +- cpp/tests/sampling/rw_low_level_test.cu | 4 +-- cpp/tests/traversal/bfs_test.cu | 2 +- cpp/tests/traversal/sssp_test.cu | 4 +-- cpp/tests/traversal/tsp_test.cu | 4 +-- cpp/tests/tree/mst_test.cu | 4 +-- cpp/tests/utilities/base_fixture.hpp | 2 +- .../utilities/generate_graph_from_edgelist.cu | 8 +++--- .../utilities/matrix_market_file_utilities.cu | 8 +++--- cpp/tests/utilities/rmat_utilities.cu | 10 +++---- cpp/tests/utilities/test_utilities.hpp | 4 +-- .../centrality/betweenness_centrality.pxd | 4 +-- python/cugraph/centrality/katz_centrality.pxd | 2 +- python/cugraph/comms/comms.pxd | 2 +- python/cugraph/community/ecg.pxd | 2 +- python/cugraph/community/egonet.pxd | 2 +- python/cugraph/community/ktruss_subgraph.pxd | 2 +- python/cugraph/community/leiden.pxd | 2 +- python/cugraph/community/louvain.pxd | 2 +- .../cugraph/community/spectral_clustering.pxd | 2 +- .../cugraph/community/subgraph_extraction.pxd | 2 +- python/cugraph/community/triangle_count.pxd | 2 +- python/cugraph/components/connectivity.pxd | 2 +- python/cugraph/cores/core_number.pxd | 2 +- python/cugraph/cores/k_core.pxd | 2 +- .../dask/centrality/mg_katz_centrality.pxd | 2 +- python/cugraph/dask/community/louvain.pxd | 2 +- .../dask/link_analysis/mg_pagerank.pxd | 2 +- python/cugraph/dask/traversal/mg_bfs.pxd | 2 +- python/cugraph/dask/traversal/mg_sssp.pxd | 2 +- python/cugraph/layout/force_atlas2.pxd | 6 ++--- .../cugraph/layout/force_atlas2_wrapper.pyx | 2 +- python/cugraph/linear_assignment/lap.pxd | 4 +-- python/cugraph/link_analysis/hits.pxd | 4 +-- python/cugraph/link_analysis/pagerank.pxd | 2 +- python/cugraph/link_prediction/jaccard.pxd | 2 +- python/cugraph/link_prediction/overlap.pxd | 2 +- python/cugraph/sampling/random_walks.pxd | 2 +- python/cugraph/structure/graph_primtypes.pxd | 6 ++--- python/cugraph/structure/graph_utilities.pxd | 20 +++++++------- python/cugraph/structure/utils.pxd | 2 +- python/cugraph/traversal/bfs.pxd | 2 +- python/cugraph/traversal/sssp.pxd | 2 +- .../traversal/traveling_salesperson.pxd | 3 +-- python/cugraph/tree/minimum_spanning_tree.pxd | 2 +- python/cugraph/utilities/path_retrieval.pxd | 3 +-- 176 files changed, 513 insertions(+), 515 deletions(-) diff --git a/cpp/include/cugraph/algorithms.hpp b/cpp/include/cugraph/algorithms.hpp index 9f1cb02df0c..e5bba7bd5ce 100644 --- a/cpp/include/cugraph/algorithms.hpp +++ b/cpp/include/cugraph/algorithms.hpp @@ -15,12 +15,12 @@ */ #pragma once -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include diff --git a/cpp/include/cugraph/compute_partition.cuh b/cpp/include/cugraph/compute_partition.cuh index 5c03b0971f2..6405d239adc 100644 --- a/cpp/include/cugraph/compute_partition.cuh +++ b/cpp/include/cugraph/compute_partition.cuh @@ -17,7 +17,7 @@ #include -#include +#include #include diff --git a/cpp/include/cugraph/eidecl_graph.hpp b/cpp/include/cugraph/eidecl_graph.hpp index 03f6a675597..3e3d9ac5b31 100644 --- a/cpp/include/cugraph/eidecl_graph.hpp +++ b/cpp/include/cugraph/eidecl_graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/eidir_graph.hpp b/cpp/include/cugraph/eidir_graph.hpp index d7273b9ea37..5bd6c233641 100644 --- a/cpp/include/cugraph/eidir_graph.hpp +++ b/cpp/include/cugraph/eidir_graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/experimental/detail/graph_utils.cuh b/cpp/include/cugraph/experimental/detail/graph_utils.cuh index d79788e59ce..e9f86eb9d62 100644 --- a/cpp/include/cugraph/experimental/detail/graph_utils.cuh +++ b/cpp/include/cugraph/experimental/detail/graph_utils.cuh @@ -15,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/experimental/eidecl_graph.hpp b/cpp/include/cugraph/experimental/eidecl_graph.hpp index b8ac201008a..18e617c0993 100644 --- a/cpp/include/cugraph/experimental/eidecl_graph.hpp +++ b/cpp/include/cugraph/experimental/eidecl_graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/experimental/eidir_graph.hpp b/cpp/include/cugraph/experimental/eidir_graph.hpp index 8998943ec16..93aa333dc5b 100644 --- a/cpp/include/cugraph/experimental/eidir_graph.hpp +++ b/cpp/include/cugraph/experimental/eidir_graph.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/experimental/graph.hpp b/cpp/include/cugraph/experimental/graph.hpp index 27f766b8593..963631dcc19 100644 --- a/cpp/include/cugraph/experimental/graph.hpp +++ b/cpp/include/cugraph/experimental/graph.hpp @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/cpp/include/cugraph/experimental/graph_functions.hpp b/cpp/include/cugraph/experimental/graph_functions.hpp index b48dc6da136..cb1b90a6e8e 100644 --- a/cpp/include/cugraph/experimental/graph_functions.hpp +++ b/cpp/include/cugraph/experimental/graph_functions.hpp @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/cpp/include/cugraph/experimental/graph_view.hpp b/cpp/include/cugraph/experimental/graph_view.hpp index e9593b70ddb..c61cf4a5935 100644 --- a/cpp/include/cugraph/experimental/graph_view.hpp +++ b/cpp/include/cugraph/experimental/graph_view.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/cpp/include/cugraph/functions.hpp b/cpp/include/cugraph/functions.hpp index ede1be3767f..00e8648b156 100644 --- a/cpp/include/cugraph/functions.hpp +++ b/cpp/include/cugraph/functions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ #include #include -#include +#include namespace cugraph { diff --git a/cpp/include/cugraph/internals.hpp b/cpp/include/cugraph/internals.hpp index f71426491e3..cc6b3031079 100644 --- a/cpp/include/cugraph/internals.hpp +++ b/cpp/include/cugraph/internals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/matrix_partition_device.cuh b/cpp/include/cugraph/matrix_partition_device.cuh index 30d6540bcfe..3c9736b7ca6 100644 --- a/cpp/include/cugraph/matrix_partition_device.cuh +++ b/cpp/include/cugraph/matrix_partition_device.cuh @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include diff --git a/cpp/include/cugraph/partition_manager.hpp b/cpp/include/cugraph/partition_manager.hpp index 431655e5642..c7657d459b2 100644 --- a/cpp/include/cugraph/partition_manager.hpp +++ b/cpp/include/cugraph/partition_manager.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh b/cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh index a367ec2a50c..94cdae1ec95 100644 --- a/cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh +++ b/cpp/include/cugraph/patterns/any_of_adj_matrix_row.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh b/cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh index 26a4eed4213..e2ab135691e 100644 --- a/cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh +++ b/cpp/include/cugraph/patterns/copy_to_adj_matrix_row_col.cuh @@ -15,16 +15,16 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh b/cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh index 6aded0eccf0..16a9870d380 100644 --- a/cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh +++ b/cpp/include/cugraph/patterns/copy_v_transform_reduce_in_out_nbr.cuh @@ -15,14 +15,14 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh b/cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh index 9a1d9fea24c..eca0b9eed4a 100644 --- a/cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh +++ b/cpp/include/cugraph/patterns/copy_v_transform_reduce_key_aggregated_out_nbr.cuh @@ -15,21 +15,21 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include diff --git a/cpp/include/cugraph/patterns/count_if_e.cuh b/cpp/include/cugraph/patterns/count_if_e.cuh index 4eb3fea24c4..1aa695bf5a9 100644 --- a/cpp/include/cugraph/patterns/count_if_e.cuh +++ b/cpp/include/cugraph/patterns/count_if_e.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/include/cugraph/patterns/count_if_v.cuh b/cpp/include/cugraph/patterns/count_if_v.cuh index 6b28cd7ae12..ef49a3e463b 100644 --- a/cpp/include/cugraph/patterns/count_if_v.cuh +++ b/cpp/include/cugraph/patterns/count_if_v.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/edge_op_utils.cuh b/cpp/include/cugraph/patterns/edge_op_utils.cuh index 198c1880ff4..98b2a12f31b 100644 --- a/cpp/include/cugraph/patterns/edge_op_utils.cuh +++ b/cpp/include/cugraph/patterns/edge_op_utils.cuh @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include diff --git a/cpp/include/cugraph/patterns/reduce_v.cuh b/cpp/include/cugraph/patterns/reduce_v.cuh index b232d37b78d..d27a45e2737 100644 --- a/cpp/include/cugraph/patterns/reduce_v.cuh +++ b/cpp/include/cugraph/patterns/reduce_v.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh b/cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh index 9848aa21f88..e47bd6f1bbb 100644 --- a/cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh +++ b/cpp/include/cugraph/patterns/transform_reduce_by_adj_matrix_row_col_key_e.cuh @@ -15,13 +15,13 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/cpp/include/cugraph/patterns/transform_reduce_e.cuh b/cpp/include/cugraph/patterns/transform_reduce_e.cuh index b95e036d460..f210065043f 100644 --- a/cpp/include/cugraph/patterns/transform_reduce_e.cuh +++ b/cpp/include/cugraph/patterns/transform_reduce_e.cuh @@ -15,11 +15,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/transform_reduce_v.cuh b/cpp/include/cugraph/patterns/transform_reduce_v.cuh index 17ffb89206a..0d5b4f9cbb6 100644 --- a/cpp/include/cugraph/patterns/transform_reduce_v.cuh +++ b/cpp/include/cugraph/patterns/transform_reduce_v.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh b/cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh index 39aca7cacae..59830222a9c 100644 --- a/cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh +++ b/cpp/include/cugraph/patterns/transform_reduce_v_with_adj_matrix_row.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh b/cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh index 4f3925f7d4c..7bd66ec6755 100644 --- a/cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh +++ b/cpp/include/cugraph/patterns/update_frontier_v_push_if_out_nbr.cuh @@ -15,19 +15,19 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/patterns/vertex_frontier.cuh b/cpp/include/cugraph/patterns/vertex_frontier.cuh index 4758334e9fc..f86d56deb84 100644 --- a/cpp/include/cugraph/patterns/vertex_frontier.cuh +++ b/cpp/include/cugraph/patterns/vertex_frontier.cuh @@ -15,9 +15,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/utilities/collect_comm.cuh b/cpp/include/cugraph/utilities/collect_comm.cuh index f5a904ad875..6a8db5194be 100644 --- a/cpp/include/cugraph/utilities/collect_comm.cuh +++ b/cpp/include/cugraph/utilities/collect_comm.cuh @@ -15,10 +15,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cugraph/utilities/cython.hpp b/cpp/include/cugraph/utilities/cython.hpp index 0d6cb2f63d0..c2d562244fa 100644 --- a/cpp/include/cugraph/utilities/cython.hpp +++ b/cpp/include/cugraph/utilities/cython.hpp @@ -15,11 +15,11 @@ */ #pragma once -#include -#include +#include +#include +#include #include #include -#include namespace cugraph { namespace cython { diff --git a/cpp/include/cugraph/utilities/dataframe_buffer.cuh b/cpp/include/cugraph/utilities/dataframe_buffer.cuh index b0e9c1ebfec..b15bca4abd7 100644 --- a/cpp/include/cugraph/utilities/dataframe_buffer.cuh +++ b/cpp/include/cugraph/utilities/dataframe_buffer.cuh @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/cpp/include/cugraph/utilities/device_comm.cuh b/cpp/include/cugraph/utilities/device_comm.cuh index daf8524e25b..3c00c54b07d 100644 --- a/cpp/include/cugraph/utilities/device_comm.cuh +++ b/cpp/include/cugraph/utilities/device_comm.cuh @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/cpp/include/cugraph/utilities/host_scalar_comm.cuh b/cpp/include/cugraph/utilities/host_scalar_comm.cuh index 2ecfd913813..4505d35e011 100644 --- a/cpp/include/cugraph/utilities/host_scalar_comm.cuh +++ b/cpp/include/cugraph/utilities/host_scalar_comm.cuh @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/cpp/include/cugraph/utilities/shuffle_comm.cuh b/cpp/include/cugraph/utilities/shuffle_comm.cuh index b42b9ad06bb..56f55a31a14 100644 --- a/cpp/include/cugraph/utilities/shuffle_comm.cuh +++ b/cpp/include/cugraph/utilities/shuffle_comm.cuh @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/cpp/include/cugraph/vertex_partition_device.cuh b/cpp/include/cugraph/vertex_partition_device.cuh index a6a78ad3878..b57efd115eb 100644 --- a/cpp/include/cugraph/vertex_partition_device.cuh +++ b/cpp/include/cugraph/vertex_partition_device.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include diff --git a/cpp/src/centrality/README.md b/cpp/src/centrality/README.md index db7838fb0cc..31b5ed6720e 100644 --- a/cpp/src/centrality/README.md +++ b/cpp/src/centrality/README.md @@ -13,7 +13,7 @@ The unit test code is the best place to search for examples on calling pagerank. The example assumes that you create an SG or MG graph somehow. The caller must create the pageranks vector in device memory and pass in the raw pointer to that vector into the pagerank function. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate @@ -46,7 +46,7 @@ cugraph::experimental::pagerank(handle, graph_view, nullptr, nullptr, nullptr, v The example assumes that you create an SG or MG graph somehow. The caller must create the pageranks vector in device memory and pass in the raw pointer to that vector into the pagerank function. Additionally, the caller must create personalization_vertices and personalized_values vectors in device memory, populate them and pass in the raw pointers to those vectors. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate diff --git a/cpp/src/centrality/betweenness_centrality.cu b/cpp/src/centrality/betweenness_centrality.cu index c0a34de5f70..cdee2140382 100644 --- a/cpp/src/centrality/betweenness_centrality.cu +++ b/cpp/src/centrality/betweenness_centrality.cu @@ -20,10 +20,10 @@ #include -#include -#include +#include +#include +#include #include -#include #include #include "betweenness_centrality.cuh" diff --git a/cpp/src/centrality/katz_centrality.cu b/cpp/src/centrality/katz_centrality.cu index 0119a388680..8e499dac4b4 100644 --- a/cpp/src/centrality/katz_centrality.cu +++ b/cpp/src/centrality/katz_centrality.cu @@ -23,8 +23,8 @@ #include #include -#include -#include "utilities/error.hpp" +#include +#include namespace cugraph { diff --git a/cpp/src/community/README.md b/cpp/src/community/README.md index 4bff0a6e77e..9d635a6167f 100644 --- a/cpp/src/community/README.md +++ b/cpp/src/community/README.md @@ -31,7 +31,7 @@ The API itself is very simple. There are two variations: The example assumes that you create an SG or MG graph somehow. The caller must create the clustering vector in device memory and pass in the raw pointer to that vector into the louvain function. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate @@ -54,7 +54,7 @@ std::tie(level, modularity) = cugraph::louvain(handle, graph_view, clustering_v. The Dendrogram represents the levels of hierarchical clustering that the Louvain algorithm computes. There is a separate function that will flatten the clustering into the same result as above. Returning the Dendrogram, however, provides a finer level of detail on the intermediate results which can be helpful in more fully understanding the data. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate diff --git a/cpp/src/community/ecg.cu b/cpp/src/community/ecg.cu index a176dfbd1c8..ef171d127fe 100644 --- a/cpp/src/community/ecg.cu +++ b/cpp/src/community/ecg.cu @@ -14,10 +14,10 @@ * limitations under the License. */ -#include #include #include -#include +#include +#include #include #include diff --git a/cpp/src/community/egonet.cu b/cpp/src/community/egonet.cu index 85ee327edb2..6b93f561a45 100644 --- a/cpp/src/community/egonet.cu +++ b/cpp/src/community/egonet.cu @@ -15,8 +15,8 @@ */ // Alex Fender afender@nvida.com -#include #include +#include #include #include #include @@ -28,14 +28,14 @@ #include #include -#include +#include -#include -#include "experimental/graph.hpp" -#include "utilities/graph_utils.cuh" +#include +#include +#include -#include -#include +#include +#include #include diff --git a/cpp/src/community/extract_subgraph_by_vertex.cu b/cpp/src/community/extract_subgraph_by_vertex.cu index eb7b1d494a0..4bfe57c2c50 100644 --- a/cpp/src/community/extract_subgraph_by_vertex.cu +++ b/cpp/src/community/extract_subgraph_by_vertex.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/community/flatten_dendrogram.cuh b/cpp/src/community/flatten_dendrogram.cuh index 6d455a68192..3359fea87e5 100644 --- a/cpp/src/community/flatten_dendrogram.cuh +++ b/cpp/src/community/flatten_dendrogram.cuh @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/cpp/src/community/ktruss.cu b/cpp/src/community/ktruss.cu index 11a8ed6fbae..e807fd2772e 100644 --- a/cpp/src/community/ktruss.cu +++ b/cpp/src/community/ktruss.cu @@ -21,11 +21,11 @@ * @file ktruss.cu * --------------------------------------------------------------------------*/ -#include +#include #include #include -#include +#include #include "Static/KTruss/KTruss.cuh" using namespace hornets_nest; diff --git a/cpp/src/community/louvain.cu b/cpp/src/community/louvain.cu index 2affcf29805..0dc913ffaba 100644 --- a/cpp/src/community/louvain.cu +++ b/cpp/src/community/louvain.cu @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -297,4 +297,4 @@ template std::pair louvain( } // namespace cugraph -#include +#include diff --git a/cpp/src/community/louvain.cuh b/cpp/src/community/louvain.cuh index e3569d4c850..8fa2b81783a 100644 --- a/cpp/src/community/louvain.cuh +++ b/cpp/src/community/louvain.cuh @@ -15,12 +15,12 @@ */ #pragma once -#include +#include #include #include -#include +#include #include diff --git a/cpp/src/community/spectral_clustering.cu b/cpp/src/community/spectral_clustering.cu index f32739ddf29..06b62c5019d 100644 --- a/cpp/src/community/spectral_clustering.cu +++ b/cpp/src/community/spectral_clustering.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,14 @@ * @file spectral_clustering.cu * ---------------------------------------------------------------------------**/ -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/community/triangles_counting.cu b/cpp/src/community/triangles_counting.cu index f6670365652..2c210cbeca3 100644 --- a/cpp/src/community/triangles_counting.cu +++ b/cpp/src/community/triangles_counting.cu @@ -17,10 +17,10 @@ #include #include -#include -#include +#include +#include -#include +#include #include #include diff --git a/cpp/src/components/connectivity.cu b/cpp/src/components/connectivity.cu index 09412160b37..d5768c7f09f 100644 --- a/cpp/src/components/connectivity.cu +++ b/cpp/src/components/connectivity.cu @@ -19,13 +19,13 @@ #include -#include #include -#include +#include +#include +#include #include #include -#include "utilities/error.hpp" -#include "utilities/graph_utils.cuh" +#include #include "topology/topology.cuh" diff --git a/cpp/src/components/utils.h b/cpp/src/components/utils.h index c9ebb6ac4d1..8dfa3be3304 100644 --- a/cpp/src/components/utils.h +++ b/cpp/src/components/utils.h @@ -27,7 +27,7 @@ #include -#include +#include namespace MLCommon { diff --git a/cpp/src/converters/COOtoCSR.cu b/cpp/src/converters/COOtoCSR.cu index 787872742e9..9164d7b9562 100644 --- a/cpp/src/converters/COOtoCSR.cu +++ b/cpp/src/converters/COOtoCSR.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include "COOtoCSR.cuh" namespace cugraph { diff --git a/cpp/src/converters/COOtoCSR.cuh b/cpp/src/converters/COOtoCSR.cuh index b110e02a513..490a91bc995 100644 --- a/cpp/src/converters/COOtoCSR.cuh +++ b/cpp/src/converters/COOtoCSR.cuh @@ -31,14 +31,14 @@ #include #include -#include +#include #include #include -#include +#include -#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/converters/permute_graph.cuh b/cpp/src/converters/permute_graph.cuh index b5b2de83e9b..58e26f51dc2 100644 --- a/cpp/src/converters/permute_graph.cuh +++ b/cpp/src/converters/permute_graph.cuh @@ -14,10 +14,10 @@ * limitations under the License. */ #include -#include -#include +#include +#include +#include #include "converters/COOtoCSR.cuh" -#include "utilities/graph_utils.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/converters/renumber.cuh b/cpp/src/converters/renumber.cuh index 263d7199c10..3d26b03b371 100644 --- a/cpp/src/converters/renumber.cuh +++ b/cpp/src/converters/renumber.cuh @@ -30,9 +30,9 @@ #include #include -#include +#include +#include #include "sort/bitonic.cuh" -#include "utilities/graph_utils.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/cores/core_number.cu b/cpp/src/cores/core_number.cu index 091ba07ccc6..419232e8deb 100644 --- a/cpp/src/cores/core_number.cu +++ b/cpp/src/cores/core_number.cu @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include //#include namespace cugraph { diff --git a/cpp/src/experimental/bfs.cu b/cpp/src/experimental/bfs.cu index 2a703c1c85e..101faf43a6f 100644 --- a/cpp/src/experimental/bfs.cu +++ b/cpp/src/experimental/bfs.cu @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/coarsen_graph.cu b/cpp/src/experimental/coarsen_graph.cu index 6397f92e336..93894b07f07 100644 --- a/cpp/src/experimental/coarsen_graph.cu +++ b/cpp/src/experimental/coarsen_graph.cu @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/generate_rmat_edgelist.cu b/cpp/src/experimental/generate_rmat_edgelist.cu index f00443a0596..e0cccd70071 100644 --- a/cpp/src/experimental/generate_rmat_edgelist.cu +++ b/cpp/src/experimental/generate_rmat_edgelist.cu @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/experimental/graph.cu b/cpp/src/experimental/graph.cu index 18db57a737f..7793898def0 100644 --- a/cpp/src/experimental/graph.cu +++ b/cpp/src/experimental/graph.cu @@ -14,11 +14,11 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -516,4 +516,4 @@ template class graph_t; } // namespace experimental } // namespace cugraph -#include +#include diff --git a/cpp/src/experimental/graph_view.cu b/cpp/src/experimental/graph_view.cu index 67603ae260b..c22fde5f4c7 100644 --- a/cpp/src/experimental/graph_view.cu +++ b/cpp/src/experimental/graph_view.cu @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/induced_subgraph.cu b/cpp/src/experimental/induced_subgraph.cu index 5cda36ad7e2..062bf18cd95 100644 --- a/cpp/src/experimental/induced_subgraph.cu +++ b/cpp/src/experimental/induced_subgraph.cu @@ -14,11 +14,11 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/katz_centrality.cu b/cpp/src/experimental/katz_centrality.cu index 7ffef5053af..ad62f5e9d68 100644 --- a/cpp/src/experimental/katz_centrality.cu +++ b/cpp/src/experimental/katz_centrality.cu @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/louvain.cuh b/cpp/src/experimental/louvain.cuh index 24914fb028b..7292bb70ae3 100644 --- a/cpp/src/experimental/louvain.cuh +++ b/cpp/src/experimental/louvain.cuh @@ -15,18 +15,18 @@ */ #pragma once -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/pagerank.cu b/cpp/src/experimental/pagerank.cu index e5874acb04f..db54783453e 100644 --- a/cpp/src/experimental/pagerank.cu +++ b/cpp/src/experimental/pagerank.cu @@ -14,17 +14,17 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/relabel.cu b/cpp/src/experimental/relabel.cu index 918feeb7a10..eb257acf432 100644 --- a/cpp/src/experimental/relabel.cu +++ b/cpp/src/experimental/relabel.cu @@ -14,15 +14,15 @@ * limitations under the License. */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/renumber_edgelist.cu b/cpp/src/experimental/renumber_edgelist.cu index 01022e8fa6d..d93b9d18911 100644 --- a/cpp/src/experimental/renumber_edgelist.cu +++ b/cpp/src/experimental/renumber_edgelist.cu @@ -14,16 +14,16 @@ * limitations under the License. */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/renumber_utils.cu b/cpp/src/experimental/renumber_utils.cu index eef6ca88b3c..5e5e88ef8f7 100644 --- a/cpp/src/experimental/renumber_utils.cu +++ b/cpp/src/experimental/renumber_utils.cu @@ -14,13 +14,13 @@ * limitations under the License. */ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/experimental/sssp.cu b/cpp/src/experimental/sssp.cu index fc488794795..4b130668a0d 100644 --- a/cpp/src/experimental/sssp.cu +++ b/cpp/src/experimental/sssp.cu @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/layout/barnes_hut.hpp b/cpp/src/layout/barnes_hut.hpp index 437c98fce4b..ebef93e74fb 100644 --- a/cpp/src/layout/barnes_hut.hpp +++ b/cpp/src/layout/barnes_hut.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,16 +17,16 @@ #pragma once #include -#include +#include #include #include -#include -#include +#include +#include +#include #include "bh_kernels.hpp" #include "fa2_kernels.hpp" -#include "utilities/graph_utils.cuh" #include "utils.hpp" namespace cugraph { diff --git a/cpp/src/layout/exact_fa2.hpp b/cpp/src/layout/exact_fa2.hpp index 0b90e417968..abad5a5630f 100644 --- a/cpp/src/layout/exact_fa2.hpp +++ b/cpp/src/layout/exact_fa2.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ #pragma once #include -#include +#include #include #include -#include -#include +#include +#include #include "exact_repulsion.hpp" #include "fa2_kernels.hpp" diff --git a/cpp/src/layout/fa2_kernels.hpp b/cpp/src/layout/fa2_kernels.hpp index 0c7e9b1d193..9aec348cec5 100644 --- a/cpp/src/layout/fa2_kernels.hpp +++ b/cpp/src/layout/fa2_kernels.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ #pragma once #define restrict __restrict__ -#include "utilities/graph_utils.cuh" +#include namespace cugraph { namespace detail { diff --git a/cpp/src/linear_assignment/hungarian.cu b/cpp/src/linear_assignment/hungarian.cu index 40f7be52c90..dfa1e43edad 100644 --- a/cpp/src/linear_assignment/hungarian.cu +++ b/cpp/src/linear_assignment/hungarian.cu @@ -17,12 +17,12 @@ #include #include -#include +#include #include #include -#include +#include #include diff --git a/cpp/src/link_analysis/gunrock_hits.cpp b/cpp/src/link_analysis/gunrock_hits.cpp index 5ffaacfe7a6..ffaec16c6a8 100644 --- a/cpp/src/link_analysis/gunrock_hits.cpp +++ b/cpp/src/link_analysis/gunrock_hits.cpp @@ -19,10 +19,10 @@ * @brief wrapper calling gunrock's HITS analytic * --------------------------------------------------------------------------*/ -#include -#include +#include +#include -#include +#include #include diff --git a/cpp/src/link_prediction/jaccard.cu b/cpp/src/link_prediction/jaccard.cu index 83a4ec6e713..b93ad0bd0b3 100644 --- a/cpp/src/link_prediction/jaccard.cu +++ b/cpp/src/link_prediction/jaccard.cu @@ -20,9 +20,9 @@ * ---------------------------------------------------------------------------**/ #include -#include -#include "graph.hpp" -#include "utilities/graph_utils.cuh" +#include +#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/link_prediction/overlap.cu b/cpp/src/link_prediction/overlap.cu index 83fdc799649..915b2c8bd52 100644 --- a/cpp/src/link_prediction/overlap.cu +++ b/cpp/src/link_prediction/overlap.cu @@ -20,9 +20,9 @@ * ---------------------------------------------------------------------------**/ #include -#include -#include "graph.hpp" -#include "utilities/graph_utils.cuh" +#include +#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/sampling/random_walks.cu b/cpp/src/sampling/random_walks.cu index a5410d0e65e..1883535bf70 100644 --- a/cpp/src/sampling/random_walks.cu +++ b/cpp/src/sampling/random_walks.cu @@ -16,7 +16,7 @@ // Andrei Schaffer, aschaffer@nvidia.com // -#include +#include #include "random_walks.cuh" namespace cugraph { diff --git a/cpp/src/sampling/random_walks.cuh b/cpp/src/sampling/random_walks.cuh index 10a47318bcb..44a6e9e83aa 100644 --- a/cpp/src/sampling/random_walks.cuh +++ b/cpp/src/sampling/random_walks.cuh @@ -18,7 +18,7 @@ // #pragma once -#include +#include #include diff --git a/cpp/src/sort/bitonic.cuh b/cpp/src/sort/bitonic.cuh index e2922a58d39..3c1faea3b01 100644 --- a/cpp/src/sort/bitonic.cuh +++ b/cpp/src/sort/bitonic.cuh @@ -34,7 +34,7 @@ #include #include -#include +#include namespace cugraph { namespace sort { diff --git a/cpp/src/structure/graph.cu b/cpp/src/structure/graph.cu index 056ad39fefc..9f683af8209 100644 --- a/cpp/src/structure/graph.cu +++ b/cpp/src/structure/graph.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include -#include "utilities/error.hpp" -#include "utilities/graph_utils.cuh" +#include +#include +#include #include @@ -149,4 +149,4 @@ template class GraphCompressedSparseBaseView; template class GraphCompressedSparseBaseView; } // namespace cugraph -#include "utilities/eidir_graph_utils.hpp" +#include diff --git a/cpp/src/traversal/README.md b/cpp/src/traversal/README.md index 7f436926de8..429b58d441e 100644 --- a/cpp/src/traversal/README.md +++ b/cpp/src/traversal/README.md @@ -13,7 +13,7 @@ The unit test code is the best place to search for examples on calling SSSP. The example assumes that you create an SG or MG graph somehow. The caller must create the distances and predecessors vectors in device memory and pass in the raw pointers to those vectors into the SSSP function. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate @@ -40,7 +40,7 @@ The unit test code is the best place to search for examples on calling BFS. The example assumes that you create an SG or MG graph somehow. The caller must create the distances and predecessors vectors in device memory and pass in the raw pointers to those vectors into the BFS function. ```cpp -#include +#include ... using vertex_t = int32_t; // or int64_t, whichever is appropriate using weight_t = float; // or double, whichever is appropriate diff --git a/cpp/src/traversal/bfs.cu b/cpp/src/traversal/bfs.cu index 7c59010cab8..9cf51d83cf3 100644 --- a/cpp/src/traversal/bfs.cu +++ b/cpp/src/traversal/bfs.cu @@ -14,14 +14,14 @@ #include #include "bfs.cuh" -#include "graph.hpp" +#include -#include +#include +#include #include "bfs_kernels.cuh" #include "mg/bfs.cuh" #include "mg/common_utils.cuh" #include "traversal_common.cuh" -#include "utilities/graph_utils.cuh" namespace cugraph { namespace detail { diff --git a/cpp/src/traversal/bfs_kernels.cuh b/cpp/src/traversal/bfs_kernels.cuh index bf2ec2fc6ee..c8d5ebcf453 100644 --- a/cpp/src/traversal/bfs_kernels.cuh +++ b/cpp/src/traversal/bfs_kernels.cuh @@ -18,7 +18,7 @@ #include #include -#include "graph.hpp" +#include #include "traversal_common.cuh" namespace cugraph { diff --git a/cpp/src/traversal/mg/frontier_expand.cuh b/cpp/src/traversal/mg/frontier_expand.cuh index 2733c319087..5436c060e18 100644 --- a/cpp/src/traversal/mg/frontier_expand.cuh +++ b/cpp/src/traversal/mg/frontier_expand.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include #include "frontier_expand_kernels.cuh" #include "vertex_binning.cuh" diff --git a/cpp/src/traversal/mg/frontier_expand_kernels.cuh b/cpp/src/traversal/mg/frontier_expand_kernels.cuh index 625ec0d956f..00884e01755 100644 --- a/cpp/src/traversal/mg/frontier_expand_kernels.cuh +++ b/cpp/src/traversal/mg/frontier_expand_kernels.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include #include "vertex_binning.cuh" namespace cugraph { diff --git a/cpp/src/traversal/sssp.cu b/cpp/src/traversal/sssp.cu index 6ffbbbf462b..c79c4e5a127 100644 --- a/cpp/src/traversal/sssp.cu +++ b/cpp/src/traversal/sssp.cu @@ -17,9 +17,9 @@ // Author: Prasun Gera pgera@nvidia.com #include -#include +#include -#include "graph.hpp" +#include #include "sssp.cuh" #include "sssp_kernels.cuh" diff --git a/cpp/src/traversal/sssp_kernels.cuh b/cpp/src/traversal/sssp_kernels.cuh index d96540b22b9..a9aaa904a6d 100644 --- a/cpp/src/traversal/sssp_kernels.cuh +++ b/cpp/src/traversal/sssp_kernels.cuh @@ -19,8 +19,8 @@ #include #include +#include #include "traversal_common.cuh" -#include "utilities/error.hpp" namespace cugraph { namespace detail { namespace sssp_kernels { diff --git a/cpp/src/traversal/traversal_common.cuh b/cpp/src/traversal/traversal_common.cuh index 2802fb94be8..0d0caea2137 100644 --- a/cpp/src/traversal/traversal_common.cuh +++ b/cpp/src/traversal/traversal_common.cuh @@ -17,7 +17,7 @@ #pragma once #include -#include "utilities/error.hpp" +#include #define MAXBLOCKS 65535 #define WARP_SIZE 32 diff --git a/cpp/src/traversal/tsp.hpp b/cpp/src/traversal/tsp.hpp index 1208f8c8790..8c6948f218c 100644 --- a/cpp/src/traversal/tsp.hpp +++ b/cpp/src/traversal/tsp.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/cpp/src/traversal/two_hop_neighbors.cu b/cpp/src/traversal/two_hop_neighbors.cu index fb984dae0ad..b36ab28c0e6 100644 --- a/cpp/src/traversal/two_hop_neighbors.cu +++ b/cpp/src/traversal/two_hop_neighbors.cu @@ -20,9 +20,9 @@ * ---------------------------------------------------------------------------**/ #include -#include -#include -#include +#include +#include +#include #include "two_hop_neighbors.cuh" #include diff --git a/cpp/src/tree/mst.cu b/cpp/src/tree/mst.cu index cc3bdc64a2d..54698b588a4 100644 --- a/cpp/src/tree/mst.cu +++ b/cpp/src/tree/mst.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ * @file mst.cu * ---------------------------------------------------------------------------**/ -#include +#include #include #include @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/cpp/src/utilities/cython.cu b/cpp/src/utilities/cython.cu index b4dcd84a7e1..0c3dd37d6a6 100644 --- a/cpp/src/utilities/cython.cu +++ b/cpp/src/utilities/cython.cu @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/utilities/graph_utils.cuh b/cpp/src/utilities/graph_utils.cuh index ca0b5831c92..4ebc5e3bee6 100644 --- a/cpp/src/utilities/graph_utils.cuh +++ b/cpp/src/utilities/graph_utils.cuh @@ -13,7 +13,7 @@ // Author: Alex Fender afender@nvidia.com #pragma once -#include +#include #include #include diff --git a/cpp/src/utilities/host_barrier.cpp b/cpp/src/utilities/host_barrier.cpp index 1c018d624ed..659e4038c67 100644 --- a/cpp/src/utilities/host_barrier.cpp +++ b/cpp/src/utilities/host_barrier.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include diff --git a/cpp/src/utilities/path_retrieval.cu b/cpp/src/utilities/path_retrieval.cu index 93ead5898f8..2d862f659e5 100644 --- a/cpp/src/utilities/path_retrieval.cu +++ b/cpp/src/utilities/path_retrieval.cu @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace cugraph { namespace detail { diff --git a/cpp/src/utilities/spmv_1D.cuh b/cpp/src/utilities/spmv_1D.cuh index 81466595c19..31af0c75585 100644 --- a/cpp/src/utilities/spmv_1D.cuh +++ b/cpp/src/utilities/spmv_1D.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,8 @@ #pragma once #include +#include #include -#include "utilities/error.hpp" namespace cugraph { namespace mg { diff --git a/cpp/tests/centrality/betweenness_centrality_test.cu b/cpp/tests/centrality/betweenness_centrality_test.cu index 89168618b9c..4cafab68986 100644 --- a/cpp/tests/centrality/betweenness_centrality_test.cu +++ b/cpp/tests/centrality/betweenness_centrality_test.cu @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/centrality/edge_betweenness_centrality_test.cu b/cpp/tests/centrality/edge_betweenness_centrality_test.cu index 50cbef86e11..e31af4dba77 100644 --- a/cpp/tests/centrality/edge_betweenness_centrality_test.cu +++ b/cpp/tests/centrality/edge_betweenness_centrality_test.cu @@ -26,8 +26,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/centrality/katz_centrality_test.cu b/cpp/tests/centrality/katz_centrality_test.cu index 114a89858b8..44e52a7626f 100644 --- a/cpp/tests/centrality/katz_centrality_test.cu +++ b/cpp/tests/centrality/katz_centrality_test.cu @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/community/balanced_edge_test.cpp b/cpp/tests/community/balanced_edge_test.cpp index 81cee945821..90a302a860b 100644 --- a/cpp/tests/community/balanced_edge_test.cpp +++ b/cpp/tests/community/balanced_edge_test.cpp @@ -10,7 +10,7 @@ */ #include -#include +#include #include diff --git a/cpp/tests/community/ecg_test.cpp b/cpp/tests/community/ecg_test.cpp index a13ee2fe360..0f0960b0abb 100644 --- a/cpp/tests/community/ecg_test.cpp +++ b/cpp/tests/community/ecg_test.cpp @@ -10,8 +10,8 @@ */ #include -#include -#include +#include +#include #include diff --git a/cpp/tests/community/egonet_test.cu b/cpp/tests/community/egonet_test.cu index 27a235ee15b..6f1ca4eb374 100644 --- a/cpp/tests/community/egonet_test.cu +++ b/cpp/tests/community/egonet_test.cu @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/community/leiden_test.cpp b/cpp/tests/community/leiden_test.cpp index 9083400f85c..a586810b6b6 100644 --- a/cpp/tests/community/leiden_test.cpp +++ b/cpp/tests/community/leiden_test.cpp @@ -10,8 +10,8 @@ */ #include -#include -#include +#include +#include #include diff --git a/cpp/tests/community/louvain_test.cpp b/cpp/tests/community/louvain_test.cpp index 43d274e6723..821e8651d70 100644 --- a/cpp/tests/community/louvain_test.cpp +++ b/cpp/tests/community/louvain_test.cpp @@ -16,9 +16,9 @@ #include #include -#include +#include -#include +#include #include #include diff --git a/cpp/tests/community/mg_louvain_helper.cu b/cpp/tests/community/mg_louvain_helper.cu index d62eaa1ec55..1311970292a 100644 --- a/cpp/tests/community/mg_louvain_helper.cu +++ b/cpp/tests/community/mg_louvain_helper.cu @@ -16,11 +16,11 @@ #include "mg_louvain_helper.hpp" -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/community/mg_louvain_helper.hpp b/cpp/tests/community/mg_louvain_helper.hpp index 43eb294cd13..456301f4d7b 100644 --- a/cpp/tests/community/mg_louvain_helper.hpp +++ b/cpp/tests/community/mg_louvain_helper.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/cpp/tests/community/mg_louvain_test.cpp b/cpp/tests/community/mg_louvain_test.cpp index 4b398f0a4aa..e8cc94edf99 100644 --- a/cpp/tests/community/mg_louvain_test.cpp +++ b/cpp/tests/community/mg_louvain_test.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/community/triangle_test.cu b/cpp/tests/community/triangle_test.cu index 1c5c99261d2..e26e9af4ae9 100644 --- a/cpp/tests/community/triangle_test.cu +++ b/cpp/tests/community/triangle_test.cu @@ -10,8 +10,8 @@ */ #include -#include -#include +#include +#include #include diff --git a/cpp/tests/components/con_comp_test.cu b/cpp/tests/components/con_comp_test.cu index fdae77f2384..e394d5fc97c 100644 --- a/cpp/tests/components/con_comp_test.cu +++ b/cpp/tests/components/con_comp_test.cu @@ -18,9 +18,9 @@ #include -#include #include -#include +#include +#include #include #include diff --git a/cpp/tests/components/scc_test.cu b/cpp/tests/components/scc_test.cu index b875a459bd0..0d2e87c40a2 100644 --- a/cpp/tests/components/scc_test.cu +++ b/cpp/tests/components/scc_test.cu @@ -16,10 +16,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include diff --git a/cpp/tests/components/wcc_graphs.hpp b/cpp/tests/components/wcc_graphs.hpp index 2b5955c2b78..18989b9b46f 100644 --- a/cpp/tests/components/wcc_graphs.hpp +++ b/cpp/tests/components/wcc_graphs.hpp @@ -9,7 +9,7 @@ * */ -#include +#include #include diff --git a/cpp/tests/components/wcc_test.cpp b/cpp/tests/components/wcc_test.cpp index 962ecefe8f3..381757bc977 100644 --- a/cpp/tests/components/wcc_test.cpp +++ b/cpp/tests/components/wcc_test.cpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/experimental/bfs_test.cpp b/cpp/tests/experimental/bfs_test.cpp index 44b664c5b92..da4ef2f5dfb 100644 --- a/cpp/tests/experimental/bfs_test.cpp +++ b/cpp/tests/experimental/bfs_test.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/coarsen_graph_test.cpp b/cpp/tests/experimental/coarsen_graph_test.cpp index 5943a5cd286..7f76094fa0f 100644 --- a/cpp/tests/experimental/coarsen_graph_test.cpp +++ b/cpp/tests/experimental/coarsen_graph_test.cpp @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/degree_test.cpp b/cpp/tests/experimental/degree_test.cpp index ea7cc246df0..80f1b51f80c 100644 --- a/cpp/tests/experimental/degree_test.cpp +++ b/cpp/tests/experimental/degree_test.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/generate_rmat_test.cpp b/cpp/tests/experimental/generate_rmat_test.cpp index 60c3a322725..6d97628e83d 100644 --- a/cpp/tests/experimental/generate_rmat_test.cpp +++ b/cpp/tests/experimental/generate_rmat_test.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/experimental/graph_test.cpp b/cpp/tests/experimental/graph_test.cpp index bdf56ae7aff..ae899c3ba33 100644 --- a/cpp/tests/experimental/graph_test.cpp +++ b/cpp/tests/experimental/graph_test.cpp @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/experimental/induced_subgraph_test.cpp b/cpp/tests/experimental/induced_subgraph_test.cpp index 2d49c174d7e..8a69da1475a 100644 --- a/cpp/tests/experimental/induced_subgraph_test.cpp +++ b/cpp/tests/experimental/induced_subgraph_test.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/katz_centrality_test.cpp b/cpp/tests/experimental/katz_centrality_test.cpp index 232d82a1c91..35773073757 100644 --- a/cpp/tests/experimental/katz_centrality_test.cpp +++ b/cpp/tests/experimental/katz_centrality_test.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/mg_bfs_test.cpp b/cpp/tests/experimental/mg_bfs_test.cpp index f6e0a57e602..e498e403334 100644 --- a/cpp/tests/experimental/mg_bfs_test.cpp +++ b/cpp/tests/experimental/mg_bfs_test.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/mg_katz_centrality_test.cpp b/cpp/tests/experimental/mg_katz_centrality_test.cpp index 864b68caf33..eca04fb3241 100644 --- a/cpp/tests/experimental/mg_katz_centrality_test.cpp +++ b/cpp/tests/experimental/mg_katz_centrality_test.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/experimental/mg_sssp_test.cpp b/cpp/tests/experimental/mg_sssp_test.cpp index 70f1a95e1f4..d3da904afc9 100644 --- a/cpp/tests/experimental/mg_sssp_test.cpp +++ b/cpp/tests/experimental/mg_sssp_test.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/ms_bfs_test.cpp b/cpp/tests/experimental/ms_bfs_test.cpp index eec51f105ab..b8d1e43f81e 100644 --- a/cpp/tests/experimental/ms_bfs_test.cpp +++ b/cpp/tests/experimental/ms_bfs_test.cpp @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/pagerank_test.cpp b/cpp/tests/experimental/pagerank_test.cpp index 1e26245b74c..e1b7b121b1f 100644 --- a/cpp/tests/experimental/pagerank_test.cpp +++ b/cpp/tests/experimental/pagerank_test.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/sssp_test.cpp b/cpp/tests/experimental/sssp_test.cpp index d84c1c2fc6c..3095afad8fc 100644 --- a/cpp/tests/experimental/sssp_test.cpp +++ b/cpp/tests/experimental/sssp_test.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/weight_sum_test.cpp b/cpp/tests/experimental/weight_sum_test.cpp index d04cba2d132..0320438c9a6 100644 --- a/cpp/tests/experimental/weight_sum_test.cpp +++ b/cpp/tests/experimental/weight_sum_test.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/layout/force_atlas2_test.cu b/cpp/tests/layout/force_atlas2_test.cu index c6067407b70..c22c256ae02 100644 --- a/cpp/tests/layout/force_atlas2_test.cu +++ b/cpp/tests/layout/force_atlas2_test.cu @@ -17,8 +17,8 @@ #include #include -#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 656957a85eb..282524ffe0d 100644 --- a/cpp/tests/linear_assignment/hungarian_test.cu +++ b/cpp/tests/linear_assignment/hungarian_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include @@ -261,7 +261,7 @@ void random_test(int32_t num_rows, int32_t num_cols, int32_t upper_bound, int re int32_t *d_data = data_v.data().get(); //int64_t seed{85}; int64_t seed{time(nullptr)}; - + thrust::for_each(rmm::exec_policy(stream)->on(stream), thrust::make_counting_iterator(0), thrust::make_counting_iterator(num_rows * num_cols), @@ -287,8 +287,8 @@ void random_test(int32_t num_rows, int32_t num_cols, int32_t upper_bound, int re std::cout << "cost = " << r << std::endl; hr_timer.display(std::cout); - - for (int i = 0 ; i < num_cols ; ++i) + + for (int i = 0 ; i < num_cols ; ++i) validate[i] = 0; int32_t assignment_out_of_range{0}; @@ -303,8 +303,8 @@ void random_test(int32_t num_rows, int32_t num_cols, int32_t upper_bound, int re EXPECT_EQ(assignment_out_of_range, 0); - int32_t assignment_missed = 0; - + int32_t assignment_missed = 0; + for (int32_t i = 0 ; i < num_cols ; ++i) { if (validate[i] != 1) { ++assignment_missed; diff --git a/cpp/tests/pagerank/mg_pagerank_test.cpp b/cpp/tests/pagerank/mg_pagerank_test.cpp index 659a62a727c..adedfa2e3bc 100644 --- a/cpp/tests/pagerank/mg_pagerank_test.cpp +++ b/cpp/tests/pagerank/mg_pagerank_test.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/sampling/random_walks_profiling.cu b/cpp/tests/sampling/random_walks_profiling.cu index 397196c4c78..355d62e8141 100644 --- a/cpp/tests/sampling/random_walks_profiling.cu +++ b/cpp/tests/sampling/random_walks_profiling.cu @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/sampling/random_walks_test.cu b/cpp/tests/sampling/random_walks_test.cu index 9e4ecd0d024..186c45109e9 100644 --- a/cpp/tests/sampling/random_walks_test.cu +++ b/cpp/tests/sampling/random_walks_test.cu @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/sampling/random_walks_utils.cuh b/cpp/tests/sampling/random_walks_utils.cuh index 44a6f8d561b..f2db29eb23b 100644 --- a/cpp/tests/sampling/random_walks_utils.cuh +++ b/cpp/tests/sampling/random_walks_utils.cuh @@ -16,7 +16,7 @@ #pragma once #include -#include +#include #include #include diff --git a/cpp/tests/sampling/rw_low_level_test.cu b/cpp/tests/sampling/rw_low_level_test.cu index 29fd01fc7e0..f5b0db0ed3e 100644 --- a/cpp/tests/sampling/rw_low_level_test.cu +++ b/cpp/tests/sampling/rw_low_level_test.cu @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/traversal/bfs_test.cu b/cpp/tests/traversal/bfs_test.cu index 9027d73b83e..8cbfe0081d6 100644 --- a/cpp/tests/traversal/bfs_test.cu +++ b/cpp/tests/traversal/bfs_test.cu @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/cpp/tests/traversal/sssp_test.cu b/cpp/tests/traversal/sssp_test.cu index e151ab64e68..1903f9ad302 100644 --- a/cpp/tests/traversal/sssp_test.cu +++ b/cpp/tests/traversal/sssp_test.cu @@ -13,9 +13,9 @@ #include #include -#include #include -#include +#include +#include #include diff --git a/cpp/tests/traversal/tsp_test.cu b/cpp/tests/traversal/tsp_test.cu index 47a72757bd8..806d9dea51a 100644 --- a/cpp/tests/traversal/tsp_test.cu +++ b/cpp/tests/traversal/tsp_test.cu @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/cpp/tests/tree/mst_test.cu b/cpp/tests/tree/mst_test.cu index e3d7b70d51e..aee88d981c1 100644 --- a/cpp/tests/tree/mst_test.cu +++ b/cpp/tests/tree/mst_test.cu @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/utilities/base_fixture.hpp b/cpp/tests/utilities/base_fixture.hpp index 770fbc99397..a705ca10aaa 100644 --- a/cpp/tests/utilities/base_fixture.hpp +++ b/cpp/tests/utilities/base_fixture.hpp @@ -16,8 +16,8 @@ #pragma once +#include #include -#include #include diff --git a/cpp/tests/utilities/generate_graph_from_edgelist.cu b/cpp/tests/utilities/generate_graph_from_edgelist.cu index 5f41e0e5ce0..b15cf34188d 100644 --- a/cpp/tests/utilities/generate_graph_from_edgelist.cu +++ b/cpp/tests/utilities/generate_graph_from_edgelist.cu @@ -15,10 +15,10 @@ */ #include -#include -#include -#include -#include +#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 bf7539864be..c51aa69fe48 100644 --- a/cpp/tests/utilities/matrix_market_file_utilities.cu +++ b/cpp/tests/utilities/matrix_market_file_utilities.cu @@ -16,10 +16,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/utilities/rmat_utilities.cu b/cpp/tests/utilities/rmat_utilities.cu index 3f0bb0b4a1f..9b36867bf62 100644 --- a/cpp/tests/utilities/rmat_utilities.cu +++ b/cpp/tests/utilities/rmat_utilities.cu @@ -16,11 +16,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/utilities/test_utilities.hpp b/cpp/tests/utilities/test_utilities.hpp index 196128e37c0..d7e6d9f6ed8 100644 --- a/cpp/tests/utilities/test_utilities.hpp +++ b/cpp/tests/utilities/test_utilities.hpp @@ -15,8 +15,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/python/cugraph/centrality/betweenness_centrality.pxd b/python/cugraph/centrality/betweenness_centrality.pxd index 829d7be37d9..7abc9009cc8 100644 --- a/python/cugraph/centrality/betweenness_centrality.pxd +++ b/python/cugraph/centrality/betweenness_centrality.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * from libcpp cimport bool -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void betweenness_centrality[VT, ET, WT, result_t]( const handle_t &handle, diff --git a/python/cugraph/centrality/katz_centrality.pxd b/python/cugraph/centrality/katz_centrality.pxd index ce9ab5291f6..c48a90904da 100644 --- a/python/cugraph/centrality/katz_centrality.pxd +++ b/python/cugraph/centrality/katz_centrality.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_utilities cimport * from libcpp cimport bool -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_katz_centrality[VT,WT]( const handle_t &handle, diff --git a/python/cugraph/comms/comms.pxd b/python/cugraph/comms/comms.pxd index 3984ade9a9c..5bc24c0d639 100644 --- a/python/cugraph/comms/comms.pxd +++ b/python/cugraph/comms/comms.pxd @@ -19,7 +19,7 @@ from cugraph.raft.common.handle cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void init_subcomms(handle_t &handle, size_t row_comm_size) diff --git a/python/cugraph/community/ecg.pxd b/python/cugraph/community/ecg.pxd index 9f1dc269b6f..b370a368459 100644 --- a/python/cugraph/community/ecg.pxd +++ b/python/cugraph/community/ecg.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void ecg[VT,ET,WT]( const handle_t &handle, diff --git a/python/cugraph/community/egonet.pxd b/python/cugraph/community/egonet.pxd index cf1c84fb5f7..acf93330447 100644 --- a/python/cugraph/community/egonet.pxd +++ b/python/cugraph/community/egonet.pxd @@ -14,7 +14,7 @@ from cugraph.structure.graph_utilities cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef unique_ptr[cy_multi_edgelists_t] call_egonet[vertex_t, weight_t]( const handle_t &handle, const graph_container_t &g, diff --git a/python/cugraph/community/ktruss_subgraph.pxd b/python/cugraph/community/ktruss_subgraph.pxd index ab3a5189414..3ad0083ae90 100644 --- a/python/cugraph/community/ktruss_subgraph.pxd +++ b/python/cugraph/community/ktruss_subgraph.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef unique_ptr[GraphCOO[VT,ET,WT]] k_truss_subgraph[VT,ET,WT]( const GraphCOOView[VT,ET,WT] &graph, diff --git a/python/cugraph/community/leiden.pxd b/python/cugraph/community/leiden.pxd index 80e0e12f65a..dedb970bca5 100644 --- a/python/cugraph/community/leiden.pxd +++ b/python/cugraph/community/leiden.pxd @@ -21,7 +21,7 @@ from libcpp.utility cimport pair from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef pair[size_t, weight_t] leiden[vertex_t,edge_t,weight_t]( const handle_t &handle, diff --git a/python/cugraph/community/louvain.pxd b/python/cugraph/community/louvain.pxd index 1f75c13dbaf..08625047285 100644 --- a/python/cugraph/community/louvain.pxd +++ b/python/cugraph/community/louvain.pxd @@ -21,7 +21,7 @@ from libcpp.utility cimport pair from cugraph.structure.graph_utilities cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef pair[size_t, weight_t] call_louvain[weight_t]( const handle_t &handle, diff --git a/python/cugraph/community/spectral_clustering.pxd b/python/cugraph/community/spectral_clustering.pxd index 27ce6130b05..f71437e2cfa 100644 --- a/python/cugraph/community/spectral_clustering.pxd +++ b/python/cugraph/community/spectral_clustering.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph::ext_raft": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph::ext_raft": cdef void balancedCutClustering[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph, diff --git a/python/cugraph/community/subgraph_extraction.pxd b/python/cugraph/community/subgraph_extraction.pxd index 97a71056006..e57aa2d2a0b 100644 --- a/python/cugraph/community/subgraph_extraction.pxd +++ b/python/cugraph/community/subgraph_extraction.pxd @@ -20,7 +20,7 @@ from cugraph.structure.graph_primtypes cimport * from libcpp.memory cimport unique_ptr -cdef extern from "algorithms.hpp" namespace "cugraph::subgraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph::subgraph": cdef unique_ptr[GraphCOO[VT,ET,WT]] extract_subgraph_vertex[VT,ET,WT]( const GraphCOOView[VT,ET,WT] &graph, diff --git a/python/cugraph/community/triangle_count.pxd b/python/cugraph/community/triangle_count.pxd index 70795a3f43a..2ff9cdd8769 100644 --- a/python/cugraph/community/triangle_count.pxd +++ b/python/cugraph/community/triangle_count.pxd @@ -20,7 +20,7 @@ from cugraph.structure.graph_primtypes cimport * from libc.stdint cimport uint64_t -cdef extern from "algorithms.hpp" namespace "cugraph::triangle": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph::triangle": cdef uint64_t triangle_count[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph) except + diff --git a/python/cugraph/components/connectivity.pxd b/python/cugraph/components/connectivity.pxd index 94fa165969d..6ba473302ba 100644 --- a/python/cugraph/components/connectivity.pxd +++ b/python/cugraph/components/connectivity.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": ctypedef enum cugraph_cc_t: CUGRAPH_WEAK "cugraph::cugraph_cc_t::CUGRAPH_WEAK" diff --git a/python/cugraph/cores/core_number.pxd b/python/cugraph/cores/core_number.pxd index cf28720a3e8..f3021c03482 100644 --- a/python/cugraph/cores/core_number.pxd +++ b/python/cugraph/cores/core_number.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void core_number[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph, diff --git a/python/cugraph/cores/k_core.pxd b/python/cugraph/cores/k_core.pxd index 556dbc95ed9..06a6d60fbef 100644 --- a/python/cugraph/cores/k_core.pxd +++ b/python/cugraph/cores/k_core.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef unique_ptr[GraphCOO[VT,ET,WT]] k_core[VT,ET,WT]( const GraphCOOView[VT,ET,WT] &in_graph, diff --git a/python/cugraph/dask/centrality/mg_katz_centrality.pxd b/python/cugraph/dask/centrality/mg_katz_centrality.pxd index fb1730da13b..5e30530e92b 100644 --- a/python/cugraph/dask/centrality/mg_katz_centrality.pxd +++ b/python/cugraph/dask/centrality/mg_katz_centrality.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_utilities cimport * from libcpp cimport bool -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_katz_centrality[vertex_t, weight_t]( const handle_t &handle, diff --git a/python/cugraph/dask/community/louvain.pxd b/python/cugraph/dask/community/louvain.pxd index 738309dac8a..ab990330028 100644 --- a/python/cugraph/dask/community/louvain.pxd +++ b/python/cugraph/dask/community/louvain.pxd @@ -20,7 +20,7 @@ from libcpp.utility cimport pair from cugraph.structure.graph_utilities cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef pair[size_t, weight_t] call_louvain[weight_t]( const handle_t &handle, diff --git a/python/cugraph/dask/link_analysis/mg_pagerank.pxd b/python/cugraph/dask/link_analysis/mg_pagerank.pxd index 55bbc0dba7e..4b47f43dd87 100644 --- a/python/cugraph/dask/link_analysis/mg_pagerank.pxd +++ b/python/cugraph/dask/link_analysis/mg_pagerank.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_utilities cimport * from libcpp cimport bool -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_pagerank[vertex_t, weight_t]( const handle_t &handle, diff --git a/python/cugraph/dask/traversal/mg_bfs.pxd b/python/cugraph/dask/traversal/mg_bfs.pxd index 6a0277f8713..d4f399bf689 100644 --- a/python/cugraph/dask/traversal/mg_bfs.pxd +++ b/python/cugraph/dask/traversal/mg_bfs.pxd @@ -21,7 +21,7 @@ cdef extern from "limits.h": cdef int INT_MAX cdef long LONG_MAX -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_bfs[vertex_t, weight_t]( const handle_t &handle, diff --git a/python/cugraph/dask/traversal/mg_sssp.pxd b/python/cugraph/dask/traversal/mg_sssp.pxd index d56575da567..937b42147e6 100644 --- a/python/cugraph/dask/traversal/mg_sssp.pxd +++ b/python/cugraph/dask/traversal/mg_sssp.pxd @@ -17,7 +17,7 @@ from cugraph.structure.graph_utilities cimport * from libcpp cimport bool -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_sssp[vertex_t, weight_t]( const handle_t &handle, diff --git a/python/cugraph/layout/force_atlas2.pxd b/python/cugraph/layout/force_atlas2.pxd index cda55cda5c5..bf5186c91f9 100644 --- a/python/cugraph/layout/force_atlas2.pxd +++ b/python/cugraph/layout/force_atlas2.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -19,10 +19,10 @@ from cugraph.structure.graph_primtypes cimport * from libcpp cimport bool -cdef extern from "internals.hpp" namespace "cugraph::internals": +cdef extern from "cugraph/internals.hpp" namespace "cugraph::internals": cdef cppclass GraphBasedDimRedCallback -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void force_atlas2[vertex_t, edge_t, weight_t]( GraphCOOView[vertex_t, edge_t, weight_t] &graph, diff --git a/python/cugraph/layout/force_atlas2_wrapper.pyx b/python/cugraph/layout/force_atlas2_wrapper.pyx index 4515c577f78..7b801d19f1c 100644 --- a/python/cugraph/layout/force_atlas2_wrapper.pyx +++ b/python/cugraph/layout/force_atlas2_wrapper.pyx @@ -25,7 +25,7 @@ import cudf from numba import cuda import numpy as np -cdef extern from "internals.hpp" namespace "cugraph::internals": +cdef extern from "cugraph/internals.hpp" namespace "cugraph::internals": cdef cppclass GraphBasedDimRedCallback diff --git a/python/cugraph/linear_assignment/lap.pxd b/python/cugraph/linear_assignment/lap.pxd index 782d5cfef60..84f5050744d 100644 --- a/python/cugraph/linear_assignment/lap.pxd +++ b/python/cugraph/linear_assignment/lap.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef weight_t hungarian[vertex_t,edge_t,weight_t]( const handle_t &handle, @@ -28,7 +28,7 @@ cdef extern from "algorithms.hpp" namespace "cugraph": vertex_t *assignment) except + -cdef extern from "algorithms.hpp": +cdef extern from "cugraph/algorithms.hpp": cdef weight_t dense_hungarian "cugraph::dense::hungarian" [vertex_t,weight_t]( const handle_t &handle, diff --git a/python/cugraph/link_analysis/hits.pxd b/python/cugraph/link_analysis/hits.pxd index 60d25fd3cdb..9e40f7444f9 100644 --- a/python/cugraph/link_analysis/hits.pxd +++ b/python/cugraph/link_analysis/hits.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -20,7 +20,7 @@ from cugraph.structure.graph_primtypes cimport * from libcpp cimport bool -cdef extern from "algorithms.hpp" namespace "cugraph::gunrock": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph::gunrock": cdef void hits[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph, diff --git a/python/cugraph/link_analysis/pagerank.pxd b/python/cugraph/link_analysis/pagerank.pxd index 2c8bea12016..ed8f763b3ca 100644 --- a/python/cugraph/link_analysis/pagerank.pxd +++ b/python/cugraph/link_analysis/pagerank.pxd @@ -20,7 +20,7 @@ from cugraph.structure.graph_utilities cimport * from libcpp cimport bool -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_pagerank[VT,WT]( const handle_t &handle, diff --git a/python/cugraph/link_prediction/jaccard.pxd b/python/cugraph/link_prediction/jaccard.pxd index bc55bb2cdf0..22ab8fdfaa8 100644 --- a/python/cugraph/link_prediction/jaccard.pxd +++ b/python/cugraph/link_prediction/jaccard.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void jaccard[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph, diff --git a/python/cugraph/link_prediction/overlap.pxd b/python/cugraph/link_prediction/overlap.pxd index 970032b56eb..1c78a523668 100644 --- a/python/cugraph/link_prediction/overlap.pxd +++ b/python/cugraph/link_prediction/overlap.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef void overlap[VT,ET,WT]( const GraphCSRView[VT,ET,WT] &graph, diff --git a/python/cugraph/sampling/random_walks.pxd b/python/cugraph/sampling/random_walks.pxd index 3e0e24b4e98..1eaea92c3e5 100644 --- a/python/cugraph/sampling/random_walks.pxd +++ b/python/cugraph/sampling/random_walks.pxd @@ -13,7 +13,7 @@ #from cugraph.structure.graph_primtypes cimport * from cugraph.structure.graph_utilities cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef unique_ptr[random_walk_ret_t] call_random_walks[vertex_t, edge_t]( const handle_t &handle, const graph_container_t &g, diff --git a/python/cugraph/structure/graph_primtypes.pxd b/python/cugraph/structure/graph_primtypes.pxd index 1e0d9626727..e0db6c31fca 100644 --- a/python/cugraph/structure/graph_primtypes.pxd +++ b/python/cugraph/structure/graph_primtypes.pxd @@ -23,7 +23,7 @@ from libcpp.vector cimport vector from cugraph.raft.common.handle cimport * from rmm._lib.device_buffer cimport device_buffer -cdef extern from "graph.hpp" namespace "cugraph": +cdef extern from "cugraph/graph.hpp" namespace "cugraph": ctypedef enum PropType: PROP_UNDEF "cugraph::PROP_UNDEF" @@ -123,12 +123,12 @@ cdef extern from "graph.hpp" namespace "cugraph": GraphCSRView[VT,ET,WT] view() -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef unique_ptr[GraphCOO[VT, ET, WT]] get_two_hop_neighbors[VT,ET,WT]( const GraphCSRView[VT, ET, WT] &graph) except + -cdef extern from "functions.hpp" namespace "cugraph": +cdef extern from "cugraph/functions.hpp" namespace "cugraph": cdef unique_ptr[device_buffer] renumber_vertices[VT_IN,VT_OUT,ET]( ET number_of_edges, diff --git a/python/cugraph/structure/graph_utilities.pxd b/python/cugraph/structure/graph_utilities.pxd index c9cf1748bfe..eaa170a776a 100644 --- a/python/cugraph/structure/graph_utilities.pxd +++ b/python/cugraph/structure/graph_utilities.pxd @@ -25,7 +25,7 @@ from libcpp.vector cimport vector from rmm._lib.device_buffer cimport device_buffer # C++ graph utilities -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": ctypedef enum numberTypeEnum: int32Type "cugraph::cython::numberTypeEnum::int32Type" @@ -83,7 +83,7 @@ cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": unique_ptr[device_buffer] dst_indices unique_ptr[device_buffer] edge_data unique_ptr[device_buffer] subgraph_offsets - + cdef cppclass random_walk_ret_t: size_t coalesced_sz_v_ size_t coalesced_sz_w_ @@ -95,7 +95,7 @@ cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": cdef extern from "" namespace "std" nogil: cdef device_buffer move(device_buffer) - cdef unique_ptr[device_buffer] move(unique_ptr[device_buffer]) + cdef unique_ptr[device_buffer] move(unique_ptr[device_buffer]) cdef cy_multi_edgelists_t move(cy_multi_edgelists_t) cdef unique_ptr[cy_multi_edgelists_t] move(unique_ptr[cy_multi_edgelists_t]) #cdef device_buffer move(device_buffer) @@ -106,7 +106,7 @@ cdef extern from "" namespace "std" nogil: # # 1. `cdef extern partition_t`: # -cdef extern from "experimental/graph_view.hpp" namespace "cugraph::experimental": +cdef extern from "cugraph/experimental/graph_view.hpp" namespace "cugraph::experimental": cdef cppclass partition_t[vertex_t]: pass @@ -114,7 +114,7 @@ cdef extern from "experimental/graph_view.hpp" namespace "cugraph::experimental" # 2. return type for shuffle: # -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef cppclass major_minor_weights_t[vertex_t, edge_t, weight_t]: major_minor_weights_t(const handle_t &handle) @@ -131,10 +131,10 @@ ctypedef fused shuffled_vertices_t: major_minor_weights_t[int, long, double] major_minor_weights_t[long, long, float] major_minor_weights_t[long, long, double] - + # 3. return type for renumber: # -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef cppclass renum_quad_t[vertex_t, edge_t]: renum_quad_t(const handle_t &handle) @@ -158,11 +158,11 @@ cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": vertex_t get_part_matrix_partition_major_value_start_offset(size_t partition_idx) pair[vertex_t, vertex_t] get_part_matrix_partition_minor_range() vertex_t get_part_matrix_partition_minor_first() - vertex_t get_part_matrix_partition_minor_last() + vertex_t get_part_matrix_partition_minor_last() # 4. `sort_and_shuffle_values()` wrapper: # -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef unique_ptr[major_minor_weights_t[vertex_t, edge_t, weight_t]] call_shuffle[vertex_t, edge_t, weight_t]( const handle_t &handle, @@ -173,7 +173,7 @@ cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": # 5. `renumber_edgelist()` wrapper # -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef unique_ptr[renum_quad_t[vertex_t, edge_t]] call_renumber[vertex_t, edge_t]( const handle_t &handle, diff --git a/python/cugraph/structure/utils.pxd b/python/cugraph/structure/utils.pxd index c22e64841af..350b5890149 100644 --- a/python/cugraph/structure/utils.pxd +++ b/python/cugraph/structure/utils.pxd @@ -20,7 +20,7 @@ from cugraph.structure.graph_primtypes cimport * from libcpp.memory cimport unique_ptr -cdef extern from "functions.hpp" namespace "cugraph": +cdef extern from "cugraph/functions.hpp" namespace "cugraph": cdef unique_ptr[GraphCSR[VT,ET,WT]] coo_to_csr[VT,ET,WT]( const GraphCOOView[VT,ET,WT] &graph) except + diff --git a/python/cugraph/traversal/bfs.pxd b/python/cugraph/traversal/bfs.pxd index b6465a6698c..ac825deffa6 100644 --- a/python/cugraph/traversal/bfs.pxd +++ b/python/cugraph/traversal/bfs.pxd @@ -22,7 +22,7 @@ from libcpp cimport bool cdef extern from "limits.h": cdef int INT_MAX -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_bfs[vertex_t, weight_t]( const handle_t &handle, const graph_container_t &g, diff --git a/python/cugraph/traversal/sssp.pxd b/python/cugraph/traversal/sssp.pxd index 59253a5f1e4..3109668d747 100644 --- a/python/cugraph/traversal/sssp.pxd +++ b/python/cugraph/traversal/sssp.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_utilities cimport * -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef void call_sssp[vertex_t, weight_t]( const handle_t &handle, diff --git a/python/cugraph/traversal/traveling_salesperson.pxd b/python/cugraph/traversal/traveling_salesperson.pxd index 956c7da0978..b38c18c7633 100644 --- a/python/cugraph/traversal/traveling_salesperson.pxd +++ b/python/cugraph/traversal/traveling_salesperson.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef float traveling_salesperson(const handle_t &handle, int *vtx_ptr, @@ -31,4 +31,3 @@ cdef extern from "algorithms.hpp" namespace "cugraph": int nstart, bool verbose, int *route) except + - diff --git a/python/cugraph/tree/minimum_spanning_tree.pxd b/python/cugraph/tree/minimum_spanning_tree.pxd index a38aee96605..32c76ede554 100644 --- a/python/cugraph/tree/minimum_spanning_tree.pxd +++ b/python/cugraph/tree/minimum_spanning_tree.pxd @@ -19,7 +19,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "algorithms.hpp" namespace "cugraph": +cdef extern from "cugraph/algorithms.hpp" namespace "cugraph": cdef unique_ptr[GraphCOO[VT,ET,WT]] minimum_spanning_tree[VT,ET,WT](const handle_t &handle, const GraphCSRView[VT,ET,WT] &graph) except + diff --git a/python/cugraph/utilities/path_retrieval.pxd b/python/cugraph/utilities/path_retrieval.pxd index 88f1da8f213..dcbbef5127d 100644 --- a/python/cugraph/utilities/path_retrieval.pxd +++ b/python/cugraph/utilities/path_retrieval.pxd @@ -18,7 +18,7 @@ from cugraph.structure.graph_primtypes cimport * -cdef extern from "utilities/path_retrieval.hpp" namespace "cugraph": +cdef extern from "cugraph/utilities/path_retrieval.hpp" namespace "cugraph": cdef void get_traversed_cost[vertex_t, weight_t](const handle_t &handle, const vertex_t *vertices, @@ -27,4 +27,3 @@ cdef extern from "utilities/path_retrieval.hpp" namespace "cugraph": weight_t *out, vertex_t stop_vertex, vertex_t num_vertices) except + - From 0fe5dcd869ec2b4ec3b3ee1f79572820665f9e3f Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 16:21:18 -0500 Subject: [PATCH 3/8] update copyright years --- cpp/include/cugraph/utilities/error.hpp | 2 +- cpp/src/centrality/katz_centrality.cu | 2 +- cpp/src/community/ktruss.cu | 2 +- cpp/src/community/triangles_counting.cu | 2 +- cpp/src/components/utils.h | 2 +- cpp/src/converters/COOtoCSR.cuh | 2 +- cpp/src/converters/permute_graph.cuh | 2 +- cpp/src/converters/renumber.cuh | 2 +- cpp/src/sort/bitonic.cuh | 2 +- cpp/src/traversal/bfs.cu | 2 +- cpp/src/traversal/sssp_kernels.cuh | 2 +- cpp/src/traversal/traversal_common.cuh | 2 +- cpp/src/traversal/two_hop_neighbors.cu | 2 +- cpp/tests/community/balanced_edge_test.cpp | 2 +- cpp/tests/community/triangle_test.cu | 2 +- python/cugraph/community/ecg.pxd | 2 +- python/cugraph/community/ktruss_subgraph.pxd | 2 +- python/cugraph/community/leiden.pxd | 2 +- python/cugraph/community/spectral_clustering.pxd | 2 +- python/cugraph/community/subgraph_extraction.pxd | 2 +- python/cugraph/community/triangle_count.pxd | 2 +- python/cugraph/components/connectivity.pxd | 2 +- python/cugraph/cores/core_number.pxd | 2 +- python/cugraph/cores/k_core.pxd | 2 +- python/cugraph/link_prediction/jaccard.pxd | 2 +- python/cugraph/link_prediction/overlap.pxd | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cpp/include/cugraph/utilities/error.hpp b/cpp/include/cugraph/utilities/error.hpp index e44e2c910ea..8cfb077cf7b 100644 --- a/cpp/include/cugraph/utilities/error.hpp +++ b/cpp/include/cugraph/utilities/error.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/centrality/katz_centrality.cu b/cpp/src/centrality/katz_centrality.cu index 8e499dac4b4..0622193670e 100644 --- a/cpp/src/centrality/katz_centrality.cu +++ b/cpp/src/centrality/katz_centrality.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/community/ktruss.cu b/cpp/src/community/ktruss.cu index e807fd2772e..224f84f6718 100644 --- a/cpp/src/community/ktruss.cu +++ b/cpp/src/community/ktruss.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/community/triangles_counting.cu b/cpp/src/community/triangles_counting.cu index 2c210cbeca3..31acb4859bd 100644 --- a/cpp/src/community/triangles_counting.cu +++ b/cpp/src/community/triangles_counting.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/components/utils.h b/cpp/src/components/utils.h index 8dfa3be3304..7b0e3042a97 100644 --- a/cpp/src/components/utils.h +++ b/cpp/src/components/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/converters/COOtoCSR.cuh b/cpp/src/converters/COOtoCSR.cuh index 490a91bc995..2876f1ccf52 100644 --- a/cpp/src/converters/COOtoCSR.cuh +++ b/cpp/src/converters/COOtoCSR.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/converters/permute_graph.cuh b/cpp/src/converters/permute_graph.cuh index 58e26f51dc2..aa64cf5ae11 100644 --- a/cpp/src/converters/permute_graph.cuh +++ b/cpp/src/converters/permute_graph.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/converters/renumber.cuh b/cpp/src/converters/renumber.cuh index 3d26b03b371..ccf4e6f62c2 100644 --- a/cpp/src/converters/renumber.cuh +++ b/cpp/src/converters/renumber.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/sort/bitonic.cuh b/cpp/src/sort/bitonic.cuh index 3c1faea3b01..b1b19bafdf0 100644 --- a/cpp/src/sort/bitonic.cuh +++ b/cpp/src/sort/bitonic.cuh @@ -1,7 +1,7 @@ // -*-c++-*- /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/traversal/bfs.cu b/cpp/src/traversal/bfs.cu index 9cf51d83cf3..8b62fbfecee 100644 --- a/cpp/src/traversal/bfs.cu +++ b/cpp/src/traversal/bfs.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation diff --git a/cpp/src/traversal/sssp_kernels.cuh b/cpp/src/traversal/sssp_kernels.cuh index a9aaa904a6d..d1cf9980773 100644 --- a/cpp/src/traversal/sssp_kernels.cuh +++ b/cpp/src/traversal/sssp_kernels.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/traversal/traversal_common.cuh b/cpp/src/traversal/traversal_common.cuh index 0d0caea2137..64a21a89b04 100644 --- a/cpp/src/traversal/traversal_common.cuh +++ b/cpp/src/traversal/traversal_common.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/traversal/two_hop_neighbors.cu b/cpp/src/traversal/two_hop_neighbors.cu index b36ab28c0e6..770e618637b 100644 --- a/cpp/src/traversal/two_hop_neighbors.cu +++ b/cpp/src/traversal/two_hop_neighbors.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/tests/community/balanced_edge_test.cpp b/cpp/tests/community/balanced_edge_test.cpp index 90a302a860b..a4bd8de769f 100644 --- a/cpp/tests/community/balanced_edge_test.cpp +++ b/cpp/tests/community/balanced_edge_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation diff --git a/cpp/tests/community/triangle_test.cu b/cpp/tests/community/triangle_test.cu index e26e9af4ae9..0faeb795e15 100644 --- a/cpp/tests/community/triangle_test.cu +++ b/cpp/tests/community/triangle_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation diff --git a/python/cugraph/community/ecg.pxd b/python/cugraph/community/ecg.pxd index b370a368459..4f13237eac7 100644 --- a/python/cugraph/community/ecg.pxd +++ b/python/cugraph/community/ecg.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/community/ktruss_subgraph.pxd b/python/cugraph/community/ktruss_subgraph.pxd index 3ad0083ae90..d993c31c375 100644 --- a/python/cugraph/community/ktruss_subgraph.pxd +++ b/python/cugraph/community/ktruss_subgraph.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/community/leiden.pxd b/python/cugraph/community/leiden.pxd index dedb970bca5..871dc826c06 100644 --- a/python/cugraph/community/leiden.pxd +++ b/python/cugraph/community/leiden.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/community/spectral_clustering.pxd b/python/cugraph/community/spectral_clustering.pxd index f71437e2cfa..346eb50a157 100644 --- a/python/cugraph/community/spectral_clustering.pxd +++ b/python/cugraph/community/spectral_clustering.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/community/subgraph_extraction.pxd b/python/cugraph/community/subgraph_extraction.pxd index e57aa2d2a0b..583e220327d 100644 --- a/python/cugraph/community/subgraph_extraction.pxd +++ b/python/cugraph/community/subgraph_extraction.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/community/triangle_count.pxd b/python/cugraph/community/triangle_count.pxd index 2ff9cdd8769..55e8114ccbf 100644 --- a/python/cugraph/community/triangle_count.pxd +++ b/python/cugraph/community/triangle_count.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/components/connectivity.pxd b/python/cugraph/components/connectivity.pxd index 6ba473302ba..a5549a9f54e 100644 --- a/python/cugraph/components/connectivity.pxd +++ b/python/cugraph/components/connectivity.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/cores/core_number.pxd b/python/cugraph/cores/core_number.pxd index f3021c03482..17dc1118a5e 100644 --- a/python/cugraph/cores/core_number.pxd +++ b/python/cugraph/cores/core_number.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/cores/k_core.pxd b/python/cugraph/cores/k_core.pxd index 06a6d60fbef..1d22e7ac4d2 100644 --- a/python/cugraph/cores/k_core.pxd +++ b/python/cugraph/cores/k_core.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/link_prediction/jaccard.pxd b/python/cugraph/link_prediction/jaccard.pxd index 22ab8fdfaa8..9e8c82ec3d8 100644 --- a/python/cugraph/link_prediction/jaccard.pxd +++ b/python/cugraph/link_prediction/jaccard.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/python/cugraph/link_prediction/overlap.pxd b/python/cugraph/link_prediction/overlap.pxd index 1c78a523668..f0654472587 100644 --- a/python/cugraph/link_prediction/overlap.pxd +++ b/python/cugraph/link_prediction/overlap.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at From 067d72bd550783da3c651a35b2b99313838cc0e7 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 17:42:45 -0500 Subject: [PATCH 4/8] update copyright years --- cpp/src/traversal/bfs_kernels.cuh | 2 +- cpp/src/utilities/graph_utils.cuh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/traversal/bfs_kernels.cuh b/cpp/src/traversal/bfs_kernels.cuh index c8d5ebcf453..78ce646d3c6 100644 --- a/cpp/src/traversal/bfs_kernels.cuh +++ b/cpp/src/traversal/bfs_kernels.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, NVIDIA CORPORATION. + * Copyright (c) 2018-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/src/utilities/graph_utils.cuh b/cpp/src/utilities/graph_utils.cuh index 4ebc5e3bee6..4eeab9376fa 100644 --- a/cpp/src/utilities/graph_utils.cuh +++ b/cpp/src/utilities/graph_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2021, NVIDIA CORPORATION. All rights reserved. * * NVIDIA CORPORATION and its licensors retain all intellectual property * and proprietary rights in and to this software, related documentation From bf5b6db35ad5a4a502e6f12d5e0f18f36d905e21 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 18:55:51 -0500 Subject: [PATCH 5/8] update callback_implemens.hpp #include path --- python/cugraph/internals/callbacks_implems.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/internals/callbacks_implems.hpp b/python/cugraph/internals/callbacks_implems.hpp index 7b3a27f6bff..64755d42cfb 100644 --- a/python/cugraph/internals/callbacks_implems.hpp +++ b/python/cugraph/internals/callbacks_implems.hpp @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include From 383f649a91b2bf13c1698d21f0a1199cc3ca591d Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 7 May 2021 18:58:34 -0500 Subject: [PATCH 6/8] update copyright years --- python/cugraph/internals/callbacks_implems.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/internals/callbacks_implems.hpp b/python/cugraph/internals/callbacks_implems.hpp index 64755d42cfb..79fab937965 100644 --- a/python/cugraph/internals/callbacks_implems.hpp +++ b/python/cugraph/internals/callbacks_implems.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 281426ded96bd7112df3bc5850e0e743a5f9993c Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 11 May 2021 11:09:32 -0500 Subject: [PATCH 7/8] fix includes after merge --- cpp/include/cugraph/utilities/cython.hpp | 1 + cpp/src/utilities/cython.cu | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpp/include/cugraph/utilities/cython.hpp b/cpp/include/cugraph/utilities/cython.hpp index 447e9a4f41d..1e246b7255a 100644 --- a/cpp/include/cugraph/utilities/cython.hpp +++ b/cpp/include/cugraph/utilities/cython.hpp @@ -18,6 +18,7 @@ #include #include #include +#include #include diff --git a/cpp/src/utilities/cython.cu b/cpp/src/utilities/cython.cu index 7e63876d43c..1a45782beb4 100644 --- a/cpp/src/utilities/cython.cu +++ b/cpp/src/utilities/cython.cu @@ -14,21 +14,22 @@ * limitations under the License. */ -#include -//#include #include #include #include +#include #include #include #include #include #include +#include #include #include -#include #include + +#include #include #include From 6ddad735e255f8ad6c5063097aed9f812434f733 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 11 May 2021 13:35:45 -0500 Subject: [PATCH 8/8] update header paths in Cython files --- python/cugraph/generators/rmat.pxd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/cugraph/generators/rmat.pxd b/python/cugraph/generators/rmat.pxd index e1ad250073e..16606b59d0f 100644 --- a/python/cugraph/generators/rmat.pxd +++ b/python/cugraph/generators/rmat.pxd @@ -14,13 +14,13 @@ from libcpp cimport bool from cugraph.structure.graph_utilities cimport * from libcpp.vector cimport vector -cdef extern from "experimental/graph_generator.hpp" namespace "cugraph::experimental": +cdef extern from "cugraph/experimental/graph_generator.hpp" namespace "cugraph::experimental": ctypedef enum generator_distribution_t: POWER_LAW "cugraph::experimental::generator_distribution_t::POWER_LAW" UNIFORM "cugraph::experimental::generator_distribution_t::UNIFORM" -cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": +cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython": cdef unique_ptr[graph_generator_t] call_generate_rmat_edgelist[vertex_t] ( const handle_t &handle, size_t scale, @@ -42,4 +42,4 @@ cdef extern from "utilities/cython.hpp" namespace "cugraph::cython": generator_distribution_t edge_distribution, int seed, bool clip_and_flip, - bool scramble_vertex_ids) except + \ No newline at end of file + bool scramble_vertex_ids) except +