From 69d6601ccb7363fd08ec10c1fadb7a2c4cffc15a Mon Sep 17 00:00:00 2001 From: Ralph Liu <137829296+nv-rliu@users.noreply.github.com> Date: Fri, 18 Oct 2024 09:11:45 -0400 Subject: [PATCH 01/14] Add support for storing results for all k-values (#4728) Another small PR for nx-cugraph benchmark logging. Authors: - Ralph Liu (https://github.com/nv-rliu) Approvers: - Rick Ratzel (https://github.com/rlratzel) - Jake Awe (https://github.com/AyodeAwe) URL: https://github.com/rapidsai/cugraph/pull/4728 --- .../nx-cugraph/pytest-based/create_results_summary_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/nx-cugraph/pytest-based/create_results_summary_page.py b/benchmarks/nx-cugraph/pytest-based/create_results_summary_page.py index df4031e0f61..e4aff10f0a5 100644 --- a/benchmarks/nx-cugraph/pytest-based/create_results_summary_page.py +++ b/benchmarks/nx-cugraph/pytest-based/create_results_summary_page.py @@ -157,7 +157,7 @@ def get_system_info(): dataset_patt = re.compile(".*ds=([\w-]+).*") backend_patt = re.compile(".*backend=(\w+).*") - k_patt = re.compile(".*k=(10*).*") + k_patt = re.compile(".*k=(\d+).*") # Organize all benchmark runs by the following hierarchy: algo -> backend -> dataset benchmarks = get_all_benchmark_info() From 2ac5586c8939bc371e3637f8e3e5a972b02bf0ef Mon Sep 17 00:00:00 2001 From: Chuck Hastings <45364586+ChuckHastings@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:21:46 -0400 Subject: [PATCH 02/14] Don't compile int32_t/int64_t vertex_t/edge_t combinations (#4720) To reduce compile time and library size... we're dropping pre-compiled support for vertex_t as int32_t and edge_t as int64_t. This is a small edge case in memory utilization. The data structures and primitives would still support such a configuration, but we're not compiling it into libcugraph.so with this PR. Seems to improve C++ compile time by 25% on my dgx18 and a 30% reduction in the size of libcugraph.so. Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Seunghwa Kang (https://github.com/seunghwak) URL: https://github.com/rapidsai/cugraph/pull/4720 --- cpp/CMakeLists.txt | 106 --------- .../cugraph/utilities/graph_traits.hpp | 2 +- cpp/src/c_api/graph_helper_mg.cu | 22 -- cpp/src/c_api/graph_helper_sg.cu | 24 -- cpp/src/c_api/graph_mg.cpp | 16 +- cpp/src/c_api/graph_sg.cpp | 14 +- .../betweenness_centrality_mg_v32_e64.cu | 58 ----- .../betweenness_centrality_sg_v32_e64.cu | 58 ----- .../eigenvector_centrality_mg_v32_e64.cu | 40 ---- .../eigenvector_centrality_sg_v32_e64.cu | 40 ---- .../centrality/katz_centrality_mg_v32_e64.cu | 50 ---- .../centrality/katz_centrality_sg_v32_e64.cu | 50 ---- .../approx_weighted_matching_mg_v32_e64.cu | 30 --- .../approx_weighted_matching_sg_v32_e64.cu | 30 --- .../detail/common_methods_mg_v32_e64.cu | 118 ---------- .../detail/common_methods_sg_v32_e64.cu | 118 ---------- .../maximal_independent_moves_mg_v32_e64.cu | 28 --- .../maximal_independent_moves_sg_v32_e64.cu | 27 --- cpp/src/community/detail/refine_mg_v32_e64.cu | 66 ------ cpp/src/community/detail/refine_sg_v32_e64.cu | 66 ------ cpp/src/community/ecg_mg_v32_e64.cu | 44 ---- cpp/src/community/ecg_sg_v32_e64.cu | 44 ---- .../edge_triangle_count_mg_v32_e64.cu | 26 --- .../edge_triangle_count_sg_v32_e64.cu | 26 --- cpp/src/community/egonet_mg_v32_e64.cu | 66 ------ cpp/src/community/egonet_sg_v32_e64.cu | 66 ------ cpp/src/community/k_truss_mg_v32_e64.cu | 41 ---- cpp/src/community/k_truss_sg_v32_e64.cu | 41 ---- cpp/src/community/leiden_mg_v32_e64.cu | 58 ----- cpp/src/community/leiden_sg_v32_e64.cu | 58 ----- cpp/src/community/louvain_mg_v32_e64.cu | 57 ----- cpp/src/community/louvain_sg_v32_e64.cu | 57 ----- .../community/triangle_count_mg_v32_e64.cu | 27 --- .../community/triangle_count_sg_v32_e64.cu | 27 --- cpp/src/components/mis_mg_v32_e64.cu | 24 -- cpp/src/components/mis_sg_v32_e64.cu | 25 -- .../components/vertex_coloring_mg_v32_e64.cu | 25 -- .../components/vertex_coloring_sg_v32_e64.cu | 25 -- .../weakly_connected_components_mg_v32_e64.cu | 29 --- .../weakly_connected_components_sg_v32_e64.cu | 29 --- cpp/src/cores/core_number_mg_v32_e64.cu | 31 --- cpp/src/cores/core_number_sg_v32_e64.cu | 31 --- cpp/src/cores/k_core_mg_v32_e64.cu | 45 ---- cpp/src/cores/k_core_sg_v32_e64.cu | 45 ---- .../collect_local_vertex_values_mg_v32_e32.cu | 12 +- .../collect_local_vertex_values_mg_v32_e64.cu | 51 ---- .../collect_local_vertex_values_sg_v32_e32.cu | 12 +- .../collect_local_vertex_values_sg_v32_e64.cu | 51 ---- .../detail/groupby_and_count_mg_v32_e64.cu | 56 ----- cpp/src/link_analysis/hits_mg_v32_e64.cu | 44 ---- cpp/src/link_analysis/hits_sg_v32_e64.cu | 44 ---- cpp/src/link_analysis/pagerank_mg_v32_e64.cu | 75 ------ cpp/src/link_analysis/pagerank_sg_v32_e64.cu | 75 ------ cpp/src/link_prediction/cosine_mg_v32_e64.cu | 54 ----- cpp/src/link_prediction/cosine_sg_v32_e64.cu | 54 ----- cpp/src/link_prediction/jaccard_mg_v32_e64.cu | 54 ----- cpp/src/link_prediction/jaccard_sg_v32_e64.cu | 54 ----- cpp/src/link_prediction/overlap_mg_v32_e64.cu | 54 ----- cpp/src/link_prediction/overlap_sg_v32_e64.cu | 54 ----- .../link_prediction/sorensen_mg_v32_e64.cu | 54 ----- .../link_prediction/sorensen_sg_v32_e64.cu | 54 ----- cpp/src/lookup/lookup_src_dst_mg_v32_e64.cu | 43 ---- cpp/src/lookup/lookup_src_dst_sg_v32_e64.cu | 43 ---- .../check_edge_bias_values_mg_v32_e64.cu | 33 --- .../check_edge_bias_values_sg_v32_e64.cu | 33 --- .../gather_one_hop_edgelist_mg_v32_e64.cu | 55 ----- .../gather_one_hop_edgelist_sg_v32_e64.cu | 55 ----- .../detail/sample_edges_mg_v32_e64.cu | 59 ----- .../detail/sample_edges_sg_v32_e64.cu | 59 ----- .../shuffle_and_organize_output_mg_v32_e64.cu | 63 ----- .../sampling/negative_sampling_mg_v32_e64.cu | 48 ---- .../sampling/negative_sampling_sg_v32_e64.cu | 48 ---- .../sampling/neighbor_sampling_mg_v32_e64.cpp | 130 ----------- .../sampling/neighbor_sampling_sg_v32_e64.cpp | 130 ----------- cpp/src/sampling/random_walks_mg_v32_e64.cu | 75 ------ cpp/src/sampling/random_walks_old_sg.cu | 24 +- .../sampling/random_walks_old_sg_v32_e64.cu | 54 ----- cpp/src/sampling/random_walks_sg_v32_e64.cu | 75 ------ .../sampling_post_processing_sg_v32_e64.cu | 219 ------------------ cpp/src/structure/coarsen_graph_mg_v32_e64.cu | 66 ------ cpp/src/structure/coarsen_graph_sg_v32_e64.cu | 66 ------ .../create_graph_from_edgelist_mg_v32_e64.cu | 189 --------------- .../create_graph_from_edgelist_sg_v32_e64.cu | 190 --------------- .../decompress_to_edgelist_mg_v32_e64.cu | 78 ------- .../decompress_to_edgelist_sg_v32_e64.cu | 78 ------- cpp/src/structure/graph_mg_v32_e64.cu | 25 -- cpp/src/structure/graph_sg_v32_e64.cu | 25 -- cpp/src/structure/graph_view_mg_v32_e64.cu | 24 -- cpp/src/structure/graph_view_sg_v32_e64.cu | 24 -- .../graph_weight_utils_mg_v32_e64.cu | 124 ---------- .../graph_weight_utils_sg_v32_e64.cu | 125 ---------- .../structure/induced_subgraph_mg_v32_e64.cu | 46 ---- .../structure/induced_subgraph_sg_v32_e64.cu | 46 ---- .../remove_multi_edges_sg_v32_e64.cu | 46 ---- .../structure/remove_self_loops_sg_v32_e64.cu | 44 ---- .../structure/renumber_edgelist_mg_v32_e64.cu | 33 --- .../structure/renumber_edgelist_sg_v32_e64.cu | 31 --- .../select_random_vertices_mg_v32_e64.cu | 41 ---- .../select_random_vertices_sg_v32_e64.cu | 41 ---- .../structure/symmetrize_graph_mg_v32_e64.cu | 71 ------ .../structure/symmetrize_graph_sg_v32_e64.cu | 73 ------ .../structure/transpose_graph_mg_v32_e64.cu | 67 ------ .../structure/transpose_graph_sg_v32_e64.cu | 69 ------ .../transpose_graph_storage_mg_v32_e64.cu | 67 ------ .../transpose_graph_storage_sg_v32_e64.cu | 69 ------ cpp/src/traversal/bfs_mg_v32_e64.cu | 33 --- cpp/src/traversal/bfs_sg_v32_e64.cu | 33 --- .../traversal/extract_bfs_paths_mg_v32_e64.cu | 31 --- .../traversal/extract_bfs_paths_sg_v32_e64.cu | 31 --- cpp/src/traversal/k_hop_nbrs_mg_v32_e64.cu | 29 --- cpp/src/traversal/k_hop_nbrs_sg_v32_e64.cu | 29 --- .../od_shortest_distances_sg_v32_e64.cu | 40 ---- cpp/src/traversal/sssp_mg_v32_e64.cu | 40 ---- cpp/src/traversal/sssp_sg_v32_e64.cu | 40 ---- .../shuffle_vertex_pairs_mg_v32_e64.cu | 120 ---------- .../betweenness_centrality_test.cpp | 6 - .../edge_betweenness_centrality_test.cpp | 6 - .../eigenvector_centrality_test.cpp | 7 - cpp/tests/centrality/katz_centrality_test.cpp | 7 - .../mg_betweenness_centrality_test.cpp | 6 - .../mg_edge_betweenness_centrality_test.cpp | 6 - .../mg_eigenvector_centrality_test.cpp | 7 - .../centrality/mg_katz_centrality_test.cpp | 7 - cpp/tests/community/mg_ecg_test.cpp | 6 - .../community/mg_edge_triangle_count_test.cpp | 7 - cpp/tests/community/mg_egonet_test.cu | 6 - cpp/tests/community/mg_k_truss_test.cpp | 7 - cpp/tests/community/mg_leiden_test.cpp | 6 - cpp/tests/community/mg_louvain_test.cpp | 6 - .../community/mg_triangle_count_test.cpp | 7 - .../community/mg_weighted_matching_test.cpp | 12 - cpp/tests/community/triangle_count_test.cpp | 5 - .../community/weighted_matching_test.cpp | 12 - cpp/tests/components/mg_mis_test.cu | 12 - .../components/mg_vertex_coloring_test.cu | 12 - .../mg_weakly_connected_components_test.cpp | 7 - cpp/tests/components/mis_test.cu | 12 - cpp/tests/components/vertex_coloring_test.cu | 12 - .../weakly_connected_components_test.cpp | 7 - cpp/tests/cores/core_number_test.cpp | 7 - cpp/tests/cores/k_core_test.cpp | 5 - cpp/tests/cores/k_core_validate.cu | 10 - cpp/tests/cores/mg_core_number_test.cpp | 7 - cpp/tests/cores/mg_k_core_test.cpp | 5 - cpp/tests/link_analysis/hits_test.cpp | 6 - cpp/tests/link_analysis/mg_hits_test.cpp | 7 - cpp/tests/link_analysis/mg_pagerank_test.cpp | 7 - cpp/tests/link_analysis/pagerank_test.cpp | 6 - .../link_prediction/mg_similarity_test.cpp | 26 --- .../mg_weighted_similarity_test.cpp | 26 --- cpp/tests/link_prediction/similarity_test.cu | 24 -- .../weighted_similarity_test.cpp | 24 -- cpp/tests/lookup/lookup_src_dst_test.cpp | 12 - cpp/tests/lookup/mg_lookup_src_dst_test.cpp | 12 - cpp/tests/prims/mg_count_if_e.cu | 32 --- cpp/tests/prims/mg_count_if_v.cu | 14 -- cpp/tests/prims/mg_extract_transform_e.cu | 14 -- ...extract_transform_v_frontier_outgoing_e.cu | 15 -- ...r_v_pair_transform_dst_nbr_intersection.cu | 8 - ...transform_dst_nbr_weighted_intersection.cu | 8 - ...er_v_random_select_transform_outgoing_e.cu | 16 -- ...rm_reduce_dst_key_aggregated_outgoing_e.cu | 18 -- ..._v_transform_reduce_incoming_outgoing_e.cu | 34 --- cpp/tests/prims/mg_reduce_v.cu | 14 -- cpp/tests/prims/mg_transform_e.cu | 48 ---- ...st_nbr_intersection_of_e_endpoints_by_v.cu | 8 - cpp/tests/prims/mg_transform_reduce_e.cu | 32 --- .../mg_transform_reduce_e_by_src_dst_key.cu | 32 --- cpp/tests/prims/mg_transform_reduce_v.cu | 32 --- ...reduce_v_frontier_outgoing_e_by_src_dst.cu | 15 -- .../sampling/biased_neighbor_sampling.cpp | 13 -- .../sampling/mg_biased_neighbor_sampling.cpp | 6 - .../sampling/mg_uniform_neighbor_sampling.cpp | 6 - cpp/tests/sampling/negative_sampling.cpp | 35 --- ...ing_heterogeneous_post_processing_test.cpp | 5 - .../sampling_post_processing_test.cpp | 5 - .../sampling/uniform_neighbor_sampling.cpp | 12 - cpp/tests/structure/coarsen_graph_test.cpp | 12 - .../count_self_loops_and_multi_edges_test.cpp | 7 - ...has_edge_and_compute_multiplicity_test.cpp | 7 - cpp/tests/structure/mg_coarsen_graph_test.cpp | 14 -- ..._count_self_loops_and_multi_edges_test.cpp | 7 - ...has_edge_and_compute_multiplicity_test.cpp | 7 - .../structure/mg_induced_subgraph_test.cu | 6 - .../mg_select_random_vertices_test.cpp | 6 - cpp/tests/structure/mg_symmetrize_test.cpp | 14 -- .../structure/mg_transpose_storage_test.cpp | 14 -- cpp/tests/structure/mg_transpose_test.cpp | 14 -- cpp/tests/structure/symmetrize_test.cpp | 14 -- .../structure/transpose_storage_test.cpp | 14 -- cpp/tests/structure/transpose_test.cpp | 14 -- cpp/tests/structure/weight_sum_test.cpp | 12 - cpp/tests/traversal/bfs_test.cpp | 7 - cpp/tests/traversal/extract_bfs_paths_test.cu | 7 - cpp/tests/traversal/k_hop_nbrs_test.cpp | 7 - cpp/tests/traversal/mg_bfs_test.cpp | 7 - .../traversal/mg_extract_bfs_paths_test.cu | 7 - cpp/tests/traversal/mg_k_hop_nbrs_test.cpp | 7 - cpp/tests/traversal/mg_sssp_test.cpp | 7 - .../traversal/od_shortest_distances_test.cpp | 7 - cpp/tests/traversal/sssp_test.cpp | 7 - .../utilities/conversion_utilities_mg.cu | 172 -------------- .../utilities/conversion_utilities_sg.cu | 120 ---------- cpp/tests/utilities/csv_file_utilities.cu | 80 ------- cpp/tests/utilities/debug_utilities_mg.cpp | 12 - cpp/tests/utilities/debug_utilities_sg.cpp | 12 - .../utilities/matrix_market_file_utilities.cu | 80 ------- .../property_generator_utilities_mg.cu | 12 - .../property_generator_utilities_sg.cu | 12 - 209 files changed, 39 insertions(+), 7672 deletions(-) delete mode 100644 cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu delete mode 100644 cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu delete mode 100644 cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu delete mode 100644 cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu delete mode 100644 cpp/src/centrality/katz_centrality_mg_v32_e64.cu delete mode 100644 cpp/src/centrality/katz_centrality_sg_v32_e64.cu delete mode 100644 cpp/src/community/approx_weighted_matching_mg_v32_e64.cu delete mode 100644 cpp/src/community/approx_weighted_matching_sg_v32_e64.cu delete mode 100644 cpp/src/community/detail/common_methods_mg_v32_e64.cu delete mode 100644 cpp/src/community/detail/common_methods_sg_v32_e64.cu delete mode 100644 cpp/src/community/detail/maximal_independent_moves_mg_v32_e64.cu delete mode 100644 cpp/src/community/detail/maximal_independent_moves_sg_v32_e64.cu delete mode 100644 cpp/src/community/detail/refine_mg_v32_e64.cu delete mode 100644 cpp/src/community/detail/refine_sg_v32_e64.cu delete mode 100644 cpp/src/community/ecg_mg_v32_e64.cu delete mode 100644 cpp/src/community/ecg_sg_v32_e64.cu delete mode 100644 cpp/src/community/edge_triangle_count_mg_v32_e64.cu delete mode 100644 cpp/src/community/edge_triangle_count_sg_v32_e64.cu delete mode 100644 cpp/src/community/egonet_mg_v32_e64.cu delete mode 100644 cpp/src/community/egonet_sg_v32_e64.cu delete mode 100644 cpp/src/community/k_truss_mg_v32_e64.cu delete mode 100644 cpp/src/community/k_truss_sg_v32_e64.cu delete mode 100644 cpp/src/community/leiden_mg_v32_e64.cu delete mode 100644 cpp/src/community/leiden_sg_v32_e64.cu delete mode 100644 cpp/src/community/louvain_mg_v32_e64.cu delete mode 100644 cpp/src/community/louvain_sg_v32_e64.cu delete mode 100644 cpp/src/community/triangle_count_mg_v32_e64.cu delete mode 100644 cpp/src/community/triangle_count_sg_v32_e64.cu delete mode 100644 cpp/src/components/mis_mg_v32_e64.cu delete mode 100644 cpp/src/components/mis_sg_v32_e64.cu delete mode 100644 cpp/src/components/vertex_coloring_mg_v32_e64.cu delete mode 100644 cpp/src/components/vertex_coloring_sg_v32_e64.cu delete mode 100644 cpp/src/components/weakly_connected_components_mg_v32_e64.cu delete mode 100644 cpp/src/components/weakly_connected_components_sg_v32_e64.cu delete mode 100644 cpp/src/cores/core_number_mg_v32_e64.cu delete mode 100644 cpp/src/cores/core_number_sg_v32_e64.cu delete mode 100644 cpp/src/cores/k_core_mg_v32_e64.cu delete mode 100644 cpp/src/cores/k_core_sg_v32_e64.cu delete mode 100644 cpp/src/detail/collect_local_vertex_values_mg_v32_e64.cu delete mode 100644 cpp/src/detail/collect_local_vertex_values_sg_v32_e64.cu delete mode 100644 cpp/src/detail/groupby_and_count_mg_v32_e64.cu delete mode 100644 cpp/src/link_analysis/hits_mg_v32_e64.cu delete mode 100644 cpp/src/link_analysis/hits_sg_v32_e64.cu delete mode 100644 cpp/src/link_analysis/pagerank_mg_v32_e64.cu delete mode 100644 cpp/src/link_analysis/pagerank_sg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/cosine_mg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/cosine_sg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/jaccard_mg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/jaccard_sg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/overlap_mg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/overlap_sg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/sorensen_mg_v32_e64.cu delete mode 100644 cpp/src/link_prediction/sorensen_sg_v32_e64.cu delete mode 100644 cpp/src/lookup/lookup_src_dst_mg_v32_e64.cu delete mode 100644 cpp/src/lookup/lookup_src_dst_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/check_edge_bias_values_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/check_edge_bias_values_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/gather_one_hop_edgelist_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/gather_one_hop_edgelist_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/sample_edges_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/sample_edges_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/detail/shuffle_and_organize_output_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/negative_sampling_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/negative_sampling_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/neighbor_sampling_mg_v32_e64.cpp delete mode 100644 cpp/src/sampling/neighbor_sampling_sg_v32_e64.cpp delete mode 100644 cpp/src/sampling/random_walks_mg_v32_e64.cu delete mode 100644 cpp/src/sampling/random_walks_old_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/random_walks_sg_v32_e64.cu delete mode 100644 cpp/src/sampling/sampling_post_processing_sg_v32_e64.cu delete mode 100644 cpp/src/structure/coarsen_graph_mg_v32_e64.cu delete mode 100644 cpp/src/structure/coarsen_graph_sg_v32_e64.cu delete mode 100644 cpp/src/structure/create_graph_from_edgelist_mg_v32_e64.cu delete mode 100644 cpp/src/structure/create_graph_from_edgelist_sg_v32_e64.cu delete mode 100644 cpp/src/structure/decompress_to_edgelist_mg_v32_e64.cu delete mode 100644 cpp/src/structure/decompress_to_edgelist_sg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_mg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_sg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_view_mg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_view_sg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_weight_utils_mg_v32_e64.cu delete mode 100644 cpp/src/structure/graph_weight_utils_sg_v32_e64.cu delete mode 100644 cpp/src/structure/induced_subgraph_mg_v32_e64.cu delete mode 100644 cpp/src/structure/induced_subgraph_sg_v32_e64.cu delete mode 100644 cpp/src/structure/remove_multi_edges_sg_v32_e64.cu delete mode 100644 cpp/src/structure/remove_self_loops_sg_v32_e64.cu delete mode 100644 cpp/src/structure/renumber_edgelist_mg_v32_e64.cu delete mode 100644 cpp/src/structure/renumber_edgelist_sg_v32_e64.cu delete mode 100644 cpp/src/structure/select_random_vertices_mg_v32_e64.cu delete mode 100644 cpp/src/structure/select_random_vertices_sg_v32_e64.cu delete mode 100644 cpp/src/structure/symmetrize_graph_mg_v32_e64.cu delete mode 100644 cpp/src/structure/symmetrize_graph_sg_v32_e64.cu delete mode 100644 cpp/src/structure/transpose_graph_mg_v32_e64.cu delete mode 100644 cpp/src/structure/transpose_graph_sg_v32_e64.cu delete mode 100644 cpp/src/structure/transpose_graph_storage_mg_v32_e64.cu delete mode 100644 cpp/src/structure/transpose_graph_storage_sg_v32_e64.cu delete mode 100644 cpp/src/traversal/bfs_mg_v32_e64.cu delete mode 100644 cpp/src/traversal/bfs_sg_v32_e64.cu delete mode 100644 cpp/src/traversal/extract_bfs_paths_mg_v32_e64.cu delete mode 100644 cpp/src/traversal/extract_bfs_paths_sg_v32_e64.cu delete mode 100644 cpp/src/traversal/k_hop_nbrs_mg_v32_e64.cu delete mode 100644 cpp/src/traversal/k_hop_nbrs_sg_v32_e64.cu delete mode 100644 cpp/src/traversal/od_shortest_distances_sg_v32_e64.cu delete mode 100644 cpp/src/traversal/sssp_mg_v32_e64.cu delete mode 100644 cpp/src/traversal/sssp_sg_v32_e64.cu delete mode 100644 cpp/src/utilities/shuffle_vertex_pairs_mg_v32_e64.cu diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index b8eaba9d575..fc3dbb57e1f 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -175,56 +175,40 @@ set(CUGRAPH_SOURCES src/detail/permute_range_v32.cu src/detail/permute_range_v64.cu src/utilities/shuffle_vertex_pairs_mg_v32_e32.cu - src/utilities/shuffle_vertex_pairs_mg_v32_e64.cu src/utilities/shuffle_vertex_pairs_mg_v64_e64.cu src/detail/collect_local_vertex_values_sg_v32_e32.cu - src/detail/collect_local_vertex_values_sg_v32_e64.cu src/detail/collect_local_vertex_values_sg_v64_e64.cu src/detail/collect_local_vertex_values_mg_v32_e32.cu - src/detail/collect_local_vertex_values_mg_v32_e64.cu src/detail/collect_local_vertex_values_mg_v64_e64.cu src/detail/groupby_and_count_mg_v32_e32.cu - src/detail/groupby_and_count_mg_v32_e64.cu src/detail/groupby_and_count_mg_v64_e64.cu src/detail/collect_comm_wrapper_mg_v32_e32.cu src/detail/collect_comm_wrapper_mg_v64_e64.cu src/sampling/random_walks_mg_v64_e64.cu src/sampling/random_walks_mg_v32_e32.cu - src/sampling/random_walks_mg_v32_e64.cu src/community/detail/common_methods_mg_v64_e64.cu src/community/detail/common_methods_mg_v32_e32.cu - src/community/detail/common_methods_mg_v32_e64.cu src/community/detail/common_methods_sg_v64_e64.cu src/community/detail/common_methods_sg_v32_e32.cu - src/community/detail/common_methods_sg_v32_e64.cu src/community/detail/refine_sg_v64_e64.cu src/community/detail/refine_sg_v32_e32.cu - src/community/detail/refine_sg_v32_e64.cu src/community/detail/refine_mg_v64_e64.cu src/community/detail/refine_mg_v32_e32.cu - src/community/detail/refine_mg_v32_e64.cu src/community/edge_triangle_count_sg_v64_e64.cu src/community/edge_triangle_count_sg_v32_e32.cu - src/community/edge_triangle_count_sg_v32_e64.cu src/community/edge_triangle_count_mg_v64_e64.cu src/community/edge_triangle_count_mg_v32_e32.cu - src/community/edge_triangle_count_mg_v32_e64.cu src/community/detail/maximal_independent_moves_sg_v64_e64.cu src/community/detail/maximal_independent_moves_sg_v32_e32.cu - src/community/detail/maximal_independent_moves_sg_v32_e64.cu src/community/detail/maximal_independent_moves_mg_v64_e64.cu src/community/detail/maximal_independent_moves_mg_v32_e32.cu - src/community/detail/maximal_independent_moves_mg_v32_e64.cu src/detail/utility_wrappers_32.cu src/detail/utility_wrappers_64.cu src/structure/graph_view_mg_v64_e64.cu src/structure/graph_view_mg_v32_e32.cu - src/structure/graph_view_mg_v32_e64.cu src/structure/remove_self_loops_sg_v32_e32.cu - src/structure/remove_self_loops_sg_v32_e64.cu src/structure/remove_self_loops_sg_v64_e64.cu src/structure/remove_multi_edges_sg_v32_e32.cu - src/structure/remove_multi_edges_sg_v32_e64.cu src/structure/remove_multi_edges_sg_v64_e64.cu src/utilities/path_retrieval_sg_v32_e32.cu src/utilities/path_retrieval_sg_v64_e64.cu @@ -232,127 +216,89 @@ set(CUGRAPH_SOURCES src/linear_assignment/legacy/hungarian.cu src/link_prediction/jaccard_sg_v64_e64.cu src/link_prediction/jaccard_sg_v32_e32.cu - src/link_prediction/jaccard_sg_v32_e64.cu src/link_prediction/sorensen_sg_v64_e64.cu src/link_prediction/sorensen_sg_v32_e32.cu - src/link_prediction/sorensen_sg_v32_e64.cu src/link_prediction/overlap_sg_v64_e64.cu src/link_prediction/overlap_sg_v32_e32.cu - src/link_prediction/overlap_sg_v32_e64.cu src/link_prediction/cosine_sg_v64_e64.cu src/link_prediction/cosine_sg_v32_e32.cu - src/link_prediction/cosine_sg_v32_e64.cu src/link_prediction/jaccard_mg_v64_e64.cu src/link_prediction/jaccard_mg_v32_e32.cu - src/link_prediction/jaccard_mg_v32_e64.cu src/link_prediction/sorensen_mg_v64_e64.cu src/link_prediction/sorensen_mg_v32_e32.cu - src/link_prediction/sorensen_mg_v32_e64.cu src/link_prediction/overlap_mg_v64_e64.cu src/link_prediction/overlap_mg_v32_e32.cu - src/link_prediction/overlap_mg_v32_e64.cu src/link_prediction/cosine_mg_v64_e64.cu src/link_prediction/cosine_mg_v32_e32.cu - src/link_prediction/cosine_mg_v32_e64.cu src/layout/legacy/force_atlas2.cu src/converters/legacy/COOtoCSR.cu src/community/legacy/spectral_clustering.cu src/community/louvain_sg_v64_e64.cu src/community/louvain_sg_v32_e32.cu - src/community/louvain_sg_v32_e64.cu src/community/louvain_mg_v64_e64.cu src/community/louvain_mg_v32_e32.cu - src/community/louvain_mg_v32_e64.cu src/community/leiden_sg_v64_e64.cu src/community/leiden_sg_v32_e32.cu - src/community/leiden_sg_v32_e64.cu src/community/leiden_mg_v64_e64.cu src/community/leiden_mg_v32_e32.cu - src/community/leiden_mg_v32_e64.cu src/community/ecg_sg_v64_e64.cu src/community/ecg_sg_v32_e32.cu - src/community/ecg_sg_v32_e64.cu src/community/ecg_mg_v64_e64.cu src/community/ecg_mg_v32_e32.cu - src/community/ecg_mg_v32_e64.cu src/community/egonet_sg_v64_e64.cu src/community/egonet_sg_v32_e32.cu - src/community/egonet_sg_v32_e64.cu src/community/egonet_mg_v64_e64.cu src/community/egonet_mg_v32_e32.cu - src/community/egonet_mg_v32_e64.cu src/community/k_truss_sg_v64_e64.cu src/community/k_truss_sg_v32_e32.cu - src/community/k_truss_sg_v32_e64.cu src/community/k_truss_mg_v64_e64.cu src/community/k_truss_mg_v32_e32.cu - src/community/k_truss_mg_v32_e64.cu src/lookup/lookup_src_dst_mg_v32_e32.cu - src/lookup/lookup_src_dst_mg_v32_e64.cu src/lookup/lookup_src_dst_mg_v64_e64.cu src/lookup/lookup_src_dst_sg_v32_e32.cu - src/lookup/lookup_src_dst_sg_v32_e64.cu src/lookup/lookup_src_dst_sg_v64_e64.cu src/sampling/random_walks_old_sg_v32_e32.cu - src/sampling/random_walks_old_sg_v32_e64.cu src/sampling/random_walks_old_sg_v64_e64.cu src/sampling/random_walks_sg_v64_e64.cu src/sampling/random_walks_sg_v32_e32.cu - src/sampling/random_walks_sg_v32_e64.cu src/sampling/detail/prepare_next_frontier_sg_v64_e64.cu src/sampling/detail/prepare_next_frontier_sg_v32_e32.cu src/sampling/detail/prepare_next_frontier_mg_v64_e64.cu src/sampling/detail/prepare_next_frontier_mg_v32_e32.cu src/sampling/detail/gather_one_hop_edgelist_sg_v64_e64.cu src/sampling/detail/gather_one_hop_edgelist_sg_v32_e32.cu - src/sampling/detail/gather_one_hop_edgelist_sg_v32_e64.cu src/sampling/detail/gather_one_hop_edgelist_mg_v64_e64.cu src/sampling/detail/gather_one_hop_edgelist_mg_v32_e32.cu - src/sampling/detail/gather_one_hop_edgelist_mg_v32_e64.cu src/sampling/detail/remove_visited_vertices_from_frontier_sg_v32_e32.cu src/sampling/detail/remove_visited_vertices_from_frontier_sg_v64_e64.cu src/sampling/detail/check_edge_bias_values_sg_v64_e64.cu src/sampling/detail/check_edge_bias_values_sg_v32_e32.cu - src/sampling/detail/check_edge_bias_values_sg_v32_e64.cu src/sampling/detail/check_edge_bias_values_mg_v64_e64.cu src/sampling/detail/check_edge_bias_values_mg_v32_e32.cu - src/sampling/detail/check_edge_bias_values_mg_v32_e64.cu src/sampling/detail/sample_edges_sg_v64_e64.cu src/sampling/detail/sample_edges_sg_v32_e32.cu - src/sampling/detail/sample_edges_sg_v32_e64.cu src/sampling/detail/sample_edges_mg_v64_e64.cu src/sampling/detail/sample_edges_mg_v32_e32.cu - src/sampling/detail/sample_edges_mg_v32_e64.cu src/sampling/detail/shuffle_and_organize_output_mg_v64_e64.cu src/sampling/detail/shuffle_and_organize_output_mg_v32_e32.cu - src/sampling/detail/shuffle_and_organize_output_mg_v32_e64.cu - src/sampling/neighbor_sampling_mg_v32_e64.cpp src/sampling/neighbor_sampling_mg_v32_e32.cpp src/sampling/neighbor_sampling_mg_v64_e64.cpp - src/sampling/neighbor_sampling_sg_v32_e64.cpp src/sampling/neighbor_sampling_sg_v32_e32.cpp src/sampling/neighbor_sampling_sg_v64_e64.cpp - src/sampling/negative_sampling_sg_v32_e64.cu src/sampling/negative_sampling_sg_v32_e32.cu src/sampling/negative_sampling_sg_v64_e64.cu - src/sampling/negative_sampling_mg_v32_e64.cu src/sampling/negative_sampling_mg_v32_e32.cu src/sampling/negative_sampling_mg_v64_e64.cu src/sampling/sampling_post_processing_sg_v64_e64.cu src/sampling/sampling_post_processing_sg_v32_e32.cu - src/sampling/sampling_post_processing_sg_v32_e64.cu src/cores/core_number_sg_v64_e64.cu src/cores/core_number_sg_v32_e32.cu - src/cores/core_number_sg_v32_e64.cu src/cores/core_number_mg_v64_e64.cu src/cores/core_number_mg_v32_e32.cu - src/cores/core_number_mg_v32_e64.cu src/cores/k_core_sg_v64_e64.cu src/cores/k_core_sg_v32_e32.cu - src/cores/k_core_sg_v32_e64.cu src/cores/k_core_mg_v64_e64.cu src/cores/k_core_mg_v32_e32.cu - src/cores/k_core_mg_v32_e64.cu src/components/legacy/connectivity.cu src/generators/generate_rmat_edgelist_sg_v32_e32.cu src/generators/generate_rmat_edgelist_sg_v64_e64.cu @@ -366,55 +312,38 @@ set(CUGRAPH_SOURCES src/generators/erdos_renyi_generator_sg_v64_e64.cu src/structure/graph_sg_v64_e64.cu src/structure/graph_sg_v32_e32.cu - src/structure/graph_sg_v32_e64.cu src/structure/graph_mg_v64_e64.cu src/structure/graph_mg_v32_e32.cu - src/structure/graph_mg_v32_e64.cu src/structure/graph_view_sg_v64_e64.cu src/structure/graph_view_sg_v32_e32.cu - src/structure/graph_view_sg_v32_e64.cu src/structure/decompress_to_edgelist_sg_v64_e64.cu src/structure/decompress_to_edgelist_sg_v32_e32.cu - src/structure/decompress_to_edgelist_sg_v32_e64.cu src/structure/decompress_to_edgelist_mg_v64_e64.cu src/structure/decompress_to_edgelist_mg_v32_e32.cu - src/structure/decompress_to_edgelist_mg_v32_e64.cu src/structure/symmetrize_graph_sg_v64_e64.cu src/structure/symmetrize_graph_sg_v32_e32.cu - src/structure/symmetrize_graph_sg_v32_e64.cu src/structure/symmetrize_graph_mg_v64_e64.cu src/structure/symmetrize_graph_mg_v32_e32.cu - src/structure/symmetrize_graph_mg_v32_e64.cu src/structure/transpose_graph_sg_v64_e64.cu src/structure/transpose_graph_sg_v32_e32.cu - src/structure/transpose_graph_sg_v32_e64.cu src/structure/transpose_graph_mg_v64_e64.cu src/structure/transpose_graph_mg_v32_e32.cu - src/structure/transpose_graph_mg_v32_e64.cu src/structure/transpose_graph_storage_sg_v64_e64.cu src/structure/transpose_graph_storage_sg_v32_e32.cu - src/structure/transpose_graph_storage_sg_v32_e64.cu src/structure/transpose_graph_storage_mg_v64_e64.cu src/structure/transpose_graph_storage_mg_v32_e32.cu - src/structure/transpose_graph_storage_mg_v32_e64.cu src/structure/coarsen_graph_sg_v64_e64.cu src/structure/coarsen_graph_sg_v32_e32.cu - src/structure/coarsen_graph_sg_v32_e64.cu src/structure/coarsen_graph_mg_v64_e64.cu src/structure/coarsen_graph_mg_v32_e32.cu - src/structure/coarsen_graph_mg_v32_e64.cu src/structure/graph_weight_utils_mg_v64_e64.cu src/structure/graph_weight_utils_mg_v32_e32.cu - src/structure/graph_weight_utils_mg_v32_e64.cu src/structure/graph_weight_utils_sg_v64_e64.cu src/structure/graph_weight_utils_sg_v32_e32.cu - src/structure/graph_weight_utils_sg_v32_e64.cu src/structure/renumber_edgelist_sg_v64_e64.cu src/structure/renumber_edgelist_sg_v32_e32.cu - src/structure/renumber_edgelist_sg_v32_e64.cu src/structure/renumber_edgelist_mg_v64_e64.cu src/structure/renumber_edgelist_mg_v32_e32.cu - src/structure/renumber_edgelist_mg_v32_e64.cu src/structure/renumber_utils_sg_v64_e64.cu src/structure/renumber_utils_sg_v32_e32.cu src/structure/renumber_utils_mg_v64_e64.cu @@ -425,115 +354,80 @@ set(CUGRAPH_SOURCES src/structure/relabel_mg_v32_e32.cu src/structure/induced_subgraph_sg_v64_e64.cu src/structure/induced_subgraph_sg_v32_e32.cu - src/structure/induced_subgraph_sg_v32_e64.cu src/structure/induced_subgraph_mg_v64_e64.cu src/structure/induced_subgraph_mg_v32_e32.cu - src/structure/induced_subgraph_mg_v32_e64.cu src/structure/select_random_vertices_sg_v64_e64.cu src/structure/select_random_vertices_sg_v32_e32.cu - src/structure/select_random_vertices_sg_v32_e64.cu src/structure/select_random_vertices_mg_v64_e64.cu src/structure/select_random_vertices_mg_v32_e32.cu - src/structure/select_random_vertices_mg_v32_e64.cu src/traversal/extract_bfs_paths_sg_v64_e64.cu src/traversal/extract_bfs_paths_sg_v32_e32.cu - src/traversal/extract_bfs_paths_sg_v32_e64.cu src/traversal/extract_bfs_paths_mg_v64_e64.cu src/traversal/extract_bfs_paths_mg_v32_e32.cu - src/traversal/extract_bfs_paths_mg_v32_e64.cu src/traversal/bfs_sg_v64_e64.cu src/traversal/bfs_sg_v32_e32.cu - src/traversal/bfs_sg_v32_e64.cu src/traversal/bfs_mg_v64_e64.cu src/traversal/bfs_mg_v32_e32.cu - src/traversal/bfs_mg_v32_e64.cu src/traversal/sssp_sg_v64_e64.cu src/traversal/sssp_sg_v32_e32.cu - src/traversal/sssp_sg_v32_e64.cu src/traversal/od_shortest_distances_sg_v64_e64.cu src/traversal/od_shortest_distances_sg_v32_e32.cu - src/traversal/od_shortest_distances_sg_v32_e64.cu src/traversal/sssp_mg_v64_e64.cu src/traversal/sssp_mg_v32_e32.cu - src/traversal/sssp_mg_v32_e64.cu src/link_analysis/hits_sg_v64_e64.cu src/link_analysis/hits_sg_v32_e32.cu - src/link_analysis/hits_sg_v32_e64.cu src/link_analysis/hits_mg_v64_e64.cu src/link_analysis/hits_mg_v32_e32.cu - src/link_analysis/hits_mg_v32_e64.cu src/link_analysis/pagerank_sg_v64_e64.cu src/link_analysis/pagerank_sg_v32_e32.cu - src/link_analysis/pagerank_sg_v32_e64.cu src/link_analysis/pagerank_mg_v64_e64.cu src/link_analysis/pagerank_mg_v32_e32.cu - src/link_analysis/pagerank_mg_v32_e64.cu src/centrality/katz_centrality_sg_v64_e64.cu src/centrality/katz_centrality_sg_v32_e32.cu - src/centrality/katz_centrality_sg_v32_e64.cu src/centrality/katz_centrality_mg_v64_e64.cu src/centrality/katz_centrality_mg_v32_e32.cu - src/centrality/katz_centrality_mg_v32_e64.cu src/centrality/eigenvector_centrality_sg_v64_e64.cu src/centrality/eigenvector_centrality_sg_v32_e32.cu - src/centrality/eigenvector_centrality_sg_v32_e64.cu src/centrality/eigenvector_centrality_mg_v64_e64.cu src/centrality/eigenvector_centrality_mg_v32_e32.cu - src/centrality/eigenvector_centrality_mg_v32_e64.cu src/centrality/betweenness_centrality_sg_v64_e64.cu src/centrality/betweenness_centrality_sg_v32_e32.cu - src/centrality/betweenness_centrality_sg_v32_e64.cu src/centrality/betweenness_centrality_mg_v64_e64.cu src/centrality/betweenness_centrality_mg_v32_e32.cu - src/centrality/betweenness_centrality_mg_v32_e64.cu src/tree/legacy/mst.cu src/from_cugraph_ops/sampling_index.cu src/components/weakly_connected_components_sg_v64_e64.cu src/components/weakly_connected_components_sg_v32_e32.cu - src/components/weakly_connected_components_sg_v32_e64.cu src/components/weakly_connected_components_mg_v64_e64.cu src/components/weakly_connected_components_mg_v32_e32.cu - src/components/weakly_connected_components_mg_v32_e64.cu src/components/mis_sg_v64_e64.cu src/components/mis_sg_v32_e32.cu - src/components/mis_sg_v32_e64.cu src/components/mis_mg_v64_e64.cu src/components/mis_mg_v32_e32.cu - src/components/mis_mg_v32_e64.cu src/components/vertex_coloring_sg_v64_e64.cu src/components/vertex_coloring_sg_v32_e32.cu - src/components/vertex_coloring_sg_v32_e64.cu src/components/vertex_coloring_mg_v64_e64.cu src/components/vertex_coloring_mg_v32_e32.cu - src/components/vertex_coloring_mg_v32_e64.cu src/structure/create_graph_from_edgelist_sg_v64_e64.cu src/structure/create_graph_from_edgelist_sg_v32_e32.cu - src/structure/create_graph_from_edgelist_sg_v32_e64.cu src/structure/create_graph_from_edgelist_mg_v64_e64.cu src/structure/create_graph_from_edgelist_mg_v32_e32.cu - src/structure/create_graph_from_edgelist_mg_v32_e64.cu src/structure/symmetrize_edgelist_sg_v64_e64.cu src/structure/symmetrize_edgelist_sg_v32_e32.cu src/structure/symmetrize_edgelist_mg_v64_e64.cu src/structure/symmetrize_edgelist_mg_v32_e32.cu src/community/triangle_count_sg_v64_e64.cu src/community/triangle_count_sg_v32_e32.cu - src/community/triangle_count_sg_v32_e64.cu src/community/triangle_count_mg_v64_e64.cu src/community/triangle_count_mg_v32_e32.cu - src/community/triangle_count_mg_v32_e64.cu src/community/approx_weighted_matching_sg_v64_e64.cu src/community/approx_weighted_matching_sg_v32_e32.cu - src/community/approx_weighted_matching_sg_v32_e64.cu src/community/approx_weighted_matching_mg_v64_e64.cu src/community/approx_weighted_matching_mg_v32_e32.cu - src/community/approx_weighted_matching_mg_v32_e64.cu src/traversal/k_hop_nbrs_sg_v64_e64.cu src/traversal/k_hop_nbrs_sg_v32_e32.cu - src/traversal/k_hop_nbrs_sg_v32_e64.cu src/traversal/k_hop_nbrs_mg_v64_e64.cu src/traversal/k_hop_nbrs_mg_v32_e32.cu - src/traversal/k_hop_nbrs_mg_v32_e64.cu src/mtmg/vertex_result_sg_v32_e32.cu src/mtmg/vertex_result_sg_v64_e64.cu src/mtmg/vertex_result_mg_v32_e32.cu diff --git a/cpp/include/cugraph/utilities/graph_traits.hpp b/cpp/include/cugraph/utilities/graph_traits.hpp index bd46c9d4fc1..f0ae0b4279d 100644 --- a/cpp/include/cugraph/utilities/graph_traits.hpp +++ b/cpp/include/cugraph/utilities/graph_traits.hpp @@ -44,7 +44,7 @@ template struct is_vertex_edge_combo { static constexpr bool value = is_one_of::value && is_one_of::value && - (sizeof(vertex_t) <= sizeof(edge_t)); + (sizeof(vertex_t) == sizeof(edge_t)); }; // meta-function that constrains diff --git a/cpp/src/c_api/graph_helper_mg.cu b/cpp/src/c_api/graph_helper_mg.cu index 353d3d90de8..704968066ad 100644 --- a/cpp/src/c_api/graph_helper_mg.cu +++ b/cpp/src/c_api/graph_helper_mg.cu @@ -25,12 +25,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, float constant_value); -template edge_property_t, float> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - float constant_value); - template edge_property_t, float> create_constant_edge_property( raft::handle_t const& handle, @@ -42,11 +36,6 @@ create_constant_edge_property(raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, float constant_value); -template edge_property_t, float> -create_constant_edge_property(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - float constant_value); - template edge_property_t, float> create_constant_edge_property(raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, @@ -58,12 +47,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, double constant_value); -template edge_property_t, double> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - double constant_value); - template edge_property_t, double> create_constant_edge_property( raft::handle_t const& handle, @@ -75,11 +58,6 @@ create_constant_edge_property(raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, double constant_value); -template edge_property_t, double> -create_constant_edge_property(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - double constant_value); - template edge_property_t, double> create_constant_edge_property(raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, diff --git a/cpp/src/c_api/graph_helper_sg.cu b/cpp/src/c_api/graph_helper_sg.cu index 86efa0d7bed..5426a2294e1 100644 --- a/cpp/src/c_api/graph_helper_sg.cu +++ b/cpp/src/c_api/graph_helper_sg.cu @@ -48,12 +48,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, float constant_value); -template edge_property_t, float> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - float constant_value); - template edge_property_t, float> create_constant_edge_property( raft::handle_t const& handle, @@ -66,12 +60,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, float constant_value); -template edge_property_t, float> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - float constant_value); - template edge_property_t, float> create_constant_edge_property( raft::handle_t const& handle, @@ -84,12 +72,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, double constant_value); -template edge_property_t, double> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - double constant_value); - template edge_property_t, double> create_constant_edge_property( raft::handle_t const& handle, @@ -102,12 +84,6 @@ create_constant_edge_property( cugraph::graph_view_t const& graph_view, double constant_value); -template edge_property_t, double> -create_constant_edge_property( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - double constant_value); - template edge_property_t, double> create_constant_edge_property( raft::handle_t const& handle, diff --git a/cpp/src/c_api/graph_mg.cpp b/cpp/src/c_api/graph_mg.cpp index 2057448dbe5..c63528a9180 100644 --- a/cpp/src/c_api/graph_mg.cpp +++ b/cpp/src/c_api/graph_mg.cpp @@ -402,6 +402,14 @@ extern "C" cugraph_error_code_t cugraph_graph_create_mg( raft::comms::op_t::SUM, p_handle->handle_->get_stream()); + cugraph_data_type_id_t edge_type{vertex_type}; + + if (vertex_type == cugraph_data_type_id_t::INT32) + CAPI_EXPECTS(num_edges < int32_threshold, + CUGRAPH_INVALID_INPUT, + "Number of edges won't fit in 32-bit integer, using 32-bit type", + *error); + auto vertex_types = cugraph::host_scalar_allgather( p_handle->handle_->get_comms(), static_cast(vertex_type), p_handle->handle_->get_stream()); @@ -434,14 +442,6 @@ extern "C" cugraph_error_code_t cugraph_graph_create_mg( "different weight type used on different GPUs", *error); - cugraph_data_type_id_t edge_type; - - if (num_edges < int32_threshold) { - edge_type = static_cast(vertex_types[0]); - } else { - edge_type = cugraph_data_type_id_t::INT64; - } - if (weight_type == cugraph_data_type_id_t::NTYPES) { weight_type = cugraph_data_type_id_t::FLOAT32; } diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp index ea598b902ae..e7ebbc2d319 100644 --- a/cpp/src/c_api/graph_sg.cpp +++ b/cpp/src/c_api/graph_sg.cpp @@ -609,14 +609,14 @@ extern "C" cugraph_error_code_t cugraph_graph_create_sg( "Invalid input arguments: src size != weights size.", *error); - cugraph_data_type_id_t edge_type; - cugraph_data_type_id_t weight_type; + if (p_src->type_ == cugraph_data_type_id_t::INT32) + CAPI_EXPECTS(p_src->size_ < int32_threshold, + CUGRAPH_INVALID_INPUT, + "Number of edges won't fit in 32-bit integer, using 32-bit type", + *error); - if (p_src->size_ < int32_threshold) { - edge_type = p_src->type_; - } else { - edge_type = cugraph_data_type_id_t::INT64; - } + cugraph_data_type_id_t edge_type = p_src->type_; + cugraph_data_type_id_t weight_type; if (weights != nullptr) { weight_type = p_weights->type_; diff --git a/cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu b/cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu deleted file mode 100644 index e90ae93b407..00000000000 --- a/cpp/src/centrality/betweenness_centrality_mg_v32_e64.cu +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/betweenness_centrality_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template rmm::device_uvector betweenness_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const include_endpoints, - bool do_expensive_check); - -template rmm::device_uvector betweenness_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const include_endpoints, - bool do_expensive_check); - -template edge_property_t, float> -edge_betweenness_centrality( - const raft::handle_t& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const do_expensive_check); - -template edge_property_t, double> -edge_betweenness_centrality( - const raft::handle_t& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu b/cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu deleted file mode 100644 index 21175047fe9..00000000000 --- a/cpp/src/centrality/betweenness_centrality_sg_v32_e64.cu +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/betweenness_centrality_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template rmm::device_uvector betweenness_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const include_endpoints, - bool do_expensive_check); - -template rmm::device_uvector betweenness_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const include_endpoints, - bool do_expensive_check); - -template edge_property_t, float> -edge_betweenness_centrality( - const raft::handle_t& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const do_expensive_check); - -template edge_property_t, double> -edge_betweenness_centrality( - const raft::handle_t& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - bool const normalized, - bool const do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu b/cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu deleted file mode 100644 index 77d74310c8e..00000000000 --- a/cpp/src/centrality/eigenvector_centrality_mg_v32_e64.cu +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/eigenvector_centrality_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template rmm::device_uvector eigenvector_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> initial_centralities, - float epsilon, - size_t max_iterations, - bool do_expensive_check); - -template rmm::device_uvector eigenvector_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> initial_centralities, - double epsilon, - size_t max_iterations, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu b/cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu deleted file mode 100644 index c0efa7a59c1..00000000000 --- a/cpp/src/centrality/eigenvector_centrality_sg_v32_e64.cu +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/eigenvector_centrality_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template rmm::device_uvector eigenvector_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> initial_centralities, - float epsilon, - size_t max_iterations, - bool do_expensive_check); - -template rmm::device_uvector eigenvector_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> initial_centralities, - double epsilon, - size_t max_iterations, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/centrality/katz_centrality_mg_v32_e64.cu b/cpp/src/centrality/katz_centrality_mg_v32_e64.cu deleted file mode 100644 index 22efe9b5606..00000000000 --- a/cpp/src/centrality/katz_centrality_mg_v32_e64.cu +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/katz_centrality_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template void katz_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - float const* betas, - float* katz_centralities, - float alpha, - float beta, - float epsilon, - size_t max_iterations, - bool has_initial_guess, - bool normalize, - bool do_expensive_check); - -template void katz_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - double const* betas, - double* katz_centralities, - double alpha, - double beta, - double epsilon, - size_t max_iterations, - bool has_initial_guess, - bool normalize, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/centrality/katz_centrality_sg_v32_e64.cu b/cpp/src/centrality/katz_centrality_sg_v32_e64.cu deleted file mode 100644 index 6d977c14825..00000000000 --- a/cpp/src/centrality/katz_centrality_sg_v32_e64.cu +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "centrality/katz_centrality_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template void katz_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - float const* betas, - float* katz_centralities, - float alpha, - float beta, - float epsilon, - size_t max_iterations, - bool has_initial_guess, - bool normalize, - bool do_expensive_check); - -template void katz_centrality( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - double const* betas, - double* katz_centralities, - double alpha, - double beta, - double epsilon, - size_t max_iterations, - bool has_initial_guess, - bool normalize, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/approx_weighted_matching_mg_v32_e64.cu b/cpp/src/community/approx_weighted_matching_mg_v32_e64.cu deleted file mode 100644 index 431634ab18a..00000000000 --- a/cpp/src/community/approx_weighted_matching_mg_v32_e64.cu +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "approx_weighted_matching_impl.cuh" - -namespace cugraph { - -template std::tuple, float> approximate_weighted_matching( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template std::tuple, double> approximate_weighted_matching( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -} // namespace cugraph diff --git a/cpp/src/community/approx_weighted_matching_sg_v32_e64.cu b/cpp/src/community/approx_weighted_matching_sg_v32_e64.cu deleted file mode 100644 index f9bab14c29f..00000000000 --- a/cpp/src/community/approx_weighted_matching_sg_v32_e64.cu +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "approx_weighted_matching_impl.cuh" - -namespace cugraph { - -template std::tuple, float> approximate_weighted_matching( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template std::tuple, double> approximate_weighted_matching( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -} // namespace cugraph diff --git a/cpp/src/community/detail/common_methods_mg_v32_e64.cu b/cpp/src/community/detail/common_methods_mg_v32_e64.cu deleted file mode 100644 index 3958683b4ad..00000000000 --- a/cpp/src/community/detail/common_methods_mg_v32_e64.cu +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/detail/common_methods.cuh" - -namespace cugraph { -namespace detail { - -template float compute_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - rmm::device_uvector const& next_clusters, - rmm::device_uvector const& cluster_weights, - float total_edge_weight, - float resolution); - -template double compute_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - rmm::device_uvector const& next_clusters, - rmm::device_uvector const& cluster_weights, - double total_edge_weight, - double resolution); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>> -graph_contraction(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weights, - raft::device_span labels); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>> -graph_contraction(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weights, - raft::device_span labels); - -template rmm::device_uvector update_clustering_by_delta_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - float total_edge_weight, - float resolution, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, float> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template rmm::device_uvector update_clustering_by_delta_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - double total_edge_weight, - double resolution, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, double> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template std::tuple, rmm::device_uvector> -compute_cluster_keys_and_values( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - rmm::device_uvector const& next_clusters_v, - edge_src_property_t, int32_t> const& - src_clusters_cache); - -template std::tuple, rmm::device_uvector> -compute_cluster_keys_and_values( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - rmm::device_uvector const& next_clusters_v, - edge_src_property_t, int32_t> const& - src_clusters_cache); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/community/detail/common_methods_sg_v32_e64.cu b/cpp/src/community/detail/common_methods_sg_v32_e64.cu deleted file mode 100644 index 7be4b179fa4..00000000000 --- a/cpp/src/community/detail/common_methods_sg_v32_e64.cu +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/detail/common_methods.cuh" - -namespace cugraph { -namespace detail { - -template float compute_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - rmm::device_uvector const& next_clusters, - rmm::device_uvector const& cluster_weights, - float total_edge_weight, - float resolution); - -template double compute_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - rmm::device_uvector const& next_clusters, - rmm::device_uvector const& cluster_weights, - double total_edge_weight, - double resolution); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>> -graph_contraction(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weights, - raft::device_span labels); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>> -graph_contraction(raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weights, - raft::device_span labels); - -template rmm::device_uvector update_clustering_by_delta_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - float total_edge_weight, - float resolution, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, float> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template rmm::device_uvector update_clustering_by_delta_modularity( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - double total_edge_weight, - double resolution, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, double> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template std::tuple, rmm::device_uvector> -compute_cluster_keys_and_values( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - rmm::device_uvector const& next_clusters_v, - edge_src_property_t, int32_t> const& - src_clusters_cache); - -template std::tuple, rmm::device_uvector> -compute_cluster_keys_and_values( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - rmm::device_uvector const& next_clusters_v, - edge_src_property_t, int32_t> const& - src_clusters_cache); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/community/detail/maximal_independent_moves_mg_v32_e64.cu b/cpp/src/community/detail/maximal_independent_moves_mg_v32_e64.cu deleted file mode 100644 index 596f7fa0a11..00000000000 --- a/cpp/src/community/detail/maximal_independent_moves_mg_v32_e64.cu +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "maximal_independent_moves.cuh" - -namespace cugraph { -namespace detail { - -template rmm::device_uvector maximal_independent_moves( - raft::handle_t const& handle, - graph_view_t const& decision_graph_view, - raft::random::RngState& rng_state); - -} // namespace detail - -} // namespace cugraph diff --git a/cpp/src/community/detail/maximal_independent_moves_sg_v32_e64.cu b/cpp/src/community/detail/maximal_independent_moves_sg_v32_e64.cu deleted file mode 100644 index 2ae195faf01..00000000000 --- a/cpp/src/community/detail/maximal_independent_moves_sg_v32_e64.cu +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "maximal_independent_moves.cuh" - -namespace cugraph { -namespace detail { - -template rmm::device_uvector maximal_independent_moves( - raft::handle_t const& handle, - graph_view_t const& decision_graph_view, - raft::random::RngState& rng_state); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/community/detail/refine_mg_v32_e64.cu b/cpp/src/community/detail/refine_mg_v32_e64.cu deleted file mode 100644 index 16c0fde2991..00000000000 --- a/cpp/src/community/detail/refine_mg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/detail/refine_impl.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - std::pair, rmm::device_uvector>> -refine_clustering( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - float total_edge_weight, - float resolution, - float theta, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, float> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template std::tuple, - std::pair, rmm::device_uvector>> -refine_clustering( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - double total_edge_weight, - double resolution, - double theta, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, double> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/community/detail/refine_sg_v32_e64.cu b/cpp/src/community/detail/refine_sg_v32_e64.cu deleted file mode 100644 index f011bb2ebe0..00000000000 --- a/cpp/src/community/detail/refine_sg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/detail/refine_impl.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - std::pair, rmm::device_uvector>> -refine_clustering( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - float total_edge_weight, - float resolution, - float theta, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, float> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -template std::tuple, - std::pair, rmm::device_uvector>> -refine_clustering( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - double total_edge_weight, - double resolution, - double theta, - rmm::device_uvector const& vertex_weights_v, - rmm::device_uvector&& cluster_keys_v, - rmm::device_uvector&& cluster_weights_v, - rmm::device_uvector&& next_clusters_v, - edge_src_property_t, double> const& - src_vertex_weights_cache, - edge_src_property_t, int32_t> const& - src_clusters_cache, - edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/community/ecg_mg_v32_e64.cu b/cpp/src/community/ecg_mg_v32_e64.cu deleted file mode 100644 index 6e9dde68dea..00000000000 --- a/cpp/src/community/ecg_mg_v32_e64.cu +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/ecg_impl.cuh" - -namespace cugraph { -template std::tuple, size_t, float> ecg( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - - float min_weight, - size_t ensemble_size, - size_t max_level, - float threshold, - float resolution); - -template std::tuple, size_t, double> ecg( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - - double min_weight, - size_t ensemble_size, - size_t max_level, - double threshold, - double resolution); - -} // namespace cugraph diff --git a/cpp/src/community/ecg_sg_v32_e64.cu b/cpp/src/community/ecg_sg_v32_e64.cu deleted file mode 100644 index 9fa1a2429f1..00000000000 --- a/cpp/src/community/ecg_sg_v32_e64.cu +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/ecg_impl.cuh" - -namespace cugraph { -template std::tuple, size_t, float> ecg( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - - float min_weight, - size_t ensemble_size, - size_t max_level, - float threshold, - float resolution); - -template std::tuple, size_t, double> ecg( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - - double min_weight, - size_t ensemble_size, - size_t max_level, - double threshold, - double resolution); - -} // namespace cugraph diff --git a/cpp/src/community/edge_triangle_count_mg_v32_e64.cu b/cpp/src/community/edge_triangle_count_mg_v32_e64.cu deleted file mode 100644 index adab2d1fede..00000000000 --- a/cpp/src/community/edge_triangle_count_mg_v32_e64.cu +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/edge_triangle_count_impl.cuh" - -namespace cugraph { - -// SG instantiation -template edge_property_t, int64_t> edge_triangle_count( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/edge_triangle_count_sg_v32_e64.cu b/cpp/src/community/edge_triangle_count_sg_v32_e64.cu deleted file mode 100644 index 24a8de868e0..00000000000 --- a/cpp/src/community/edge_triangle_count_sg_v32_e64.cu +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/edge_triangle_count_impl.cuh" - -namespace cugraph { - -// SG instantiation -template edge_property_t, int64_t> edge_triangle_count( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/egonet_mg_v32_e64.cu b/cpp/src/community/egonet_mg_v32_e64.cu deleted file mode 100644 index f9e27b6cf26..00000000000 --- a/cpp/src/community/egonet_mg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/egonet_impl.cuh" - -namespace cugraph { - -// MG FP32 - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> - -extract_ego(raft::handle_t const&, - graph_view_t const&, - std::optional>, - int32_t*, - int32_t, - int32_t); -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - raft::device_span source_vertex, - int32_t radius, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const&, - graph_view_t const&, - std::optional>, - int32_t*, - int32_t, - int32_t); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - raft::device_span source_vertex, - int32_t radius, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/egonet_sg_v32_e64.cu b/cpp/src/community/egonet_sg_v32_e64.cu deleted file mode 100644 index 4bb79120445..00000000000 --- a/cpp/src/community/egonet_sg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "community/egonet_impl.cuh" - -namespace cugraph { - -// SG FP32 - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - int32_t* source_vertex, - int32_t n_subgraphs, - int32_t radius); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - raft::device_span source_vertex, - int32_t radius, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - int32_t* source_vertex, - int32_t n_subgraphs, - int32_t radius); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_ego(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional>, - raft::device_span source_vertex, - int32_t radius, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/k_truss_mg_v32_e64.cu b/cpp/src/community/k_truss_mg_v32_e64.cu deleted file mode 100644 index b07f9382612..00000000000 --- a/cpp/src/community/k_truss_mg_v32_e64.cu +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/k_truss_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_truss(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int64_t k, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_truss(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int64_t k, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/k_truss_sg_v32_e64.cu b/cpp/src/community/k_truss_sg_v32_e64.cu deleted file mode 100644 index 87a86d3f95d..00000000000 --- a/cpp/src/community/k_truss_sg_v32_e64.cu +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/k_truss_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_truss(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int64_t k, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_truss(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int64_t k, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/leiden_mg_v32_e64.cu b/cpp/src/community/leiden_mg_v32_e64.cu deleted file mode 100644 index bce08617feb..00000000000 --- a/cpp/src/community/leiden_mg_v32_e64.cu +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/leiden_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::pair>, float> leiden( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t max_level, - float resolution, - float theta); - -template std::pair>, double> leiden( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t max_level, - double resolution, - double theta); - -template std::pair leiden(raft::handle_t const&, - raft::random::RngState&, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - float, - float); -template std::pair leiden( - raft::handle_t const&, - raft::random::RngState&, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - double, - double); -} // namespace cugraph diff --git a/cpp/src/community/leiden_sg_v32_e64.cu b/cpp/src/community/leiden_sg_v32_e64.cu deleted file mode 100644 index 518b2c0b0e0..00000000000 --- a/cpp/src/community/leiden_sg_v32_e64.cu +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/leiden_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::pair>, float> leiden( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t max_level, - float resolution, - float theta); - -template std::pair>, double> leiden( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t max_level, - double resolution, - double theta); - -template std::pair leiden(raft::handle_t const&, - raft::random::RngState&, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - float, - float); -template std::pair leiden( - raft::handle_t const&, - raft::random::RngState&, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - double, - double); -} // namespace cugraph diff --git a/cpp/src/community/louvain_mg_v32_e64.cu b/cpp/src/community/louvain_mg_v32_e64.cu deleted file mode 100644 index f25102af2a2..00000000000 --- a/cpp/src/community/louvain_mg_v32_e64.cu +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/louvain_impl.cuh" - -namespace cugraph { - -// Explicit template instantations - -template std::pair>, float> louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - size_t, - float, - float); -template std::pair>, double> louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - size_t, - double, - double); -template std::pair louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - float, - float); -template std::pair louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - double, - double); -} // namespace cugraph diff --git a/cpp/src/community/louvain_sg_v32_e64.cu b/cpp/src/community/louvain_sg_v32_e64.cu deleted file mode 100644 index fc972bdee61..00000000000 --- a/cpp/src/community/louvain_sg_v32_e64.cu +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/louvain_impl.cuh" - -namespace cugraph { - -// Explicit template instantations - -template std::pair>, float> louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - size_t, - float, - float); -template std::pair>, double> louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - size_t, - double, - double); -template std::pair louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - float, - float); -template std::pair louvain( - raft::handle_t const&, - std::optional>, - graph_view_t const&, - std::optional>, - int32_t*, - size_t, - double, - double); -} // namespace cugraph diff --git a/cpp/src/community/triangle_count_mg_v32_e64.cu b/cpp/src/community/triangle_count_mg_v32_e64.cu deleted file mode 100644 index 50ccc074f63..00000000000 --- a/cpp/src/community/triangle_count_mg_v32_e64.cu +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/triangle_count_impl.cuh" - -namespace cugraph { - -template void triangle_count(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> vertices, - raft::device_span counts, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/community/triangle_count_sg_v32_e64.cu b/cpp/src/community/triangle_count_sg_v32_e64.cu deleted file mode 100644 index 6f7c3a87298..00000000000 --- a/cpp/src/community/triangle_count_sg_v32_e64.cu +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "community/triangle_count_impl.cuh" - -namespace cugraph { - -template void triangle_count(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> vertices, - raft::device_span counts, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/components/mis_mg_v32_e64.cu b/cpp/src/components/mis_mg_v32_e64.cu deleted file mode 100644 index 793d170b433..00000000000 --- a/cpp/src/components/mis_mg_v32_e64.cu +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "mis_impl.cuh" -namespace cugraph { - -template rmm::device_uvector maximal_independent_set( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::random::RngState& rng_state); - -} // namespace cugraph diff --git a/cpp/src/components/mis_sg_v32_e64.cu b/cpp/src/components/mis_sg_v32_e64.cu deleted file mode 100644 index a3a29cb751b..00000000000 --- a/cpp/src/components/mis_sg_v32_e64.cu +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "mis_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector maximal_independent_set( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::random::RngState& rng_state); - -} // namespace cugraph diff --git a/cpp/src/components/vertex_coloring_mg_v32_e64.cu b/cpp/src/components/vertex_coloring_mg_v32_e64.cu deleted file mode 100644 index 04facb7cda8..00000000000 --- a/cpp/src/components/vertex_coloring_mg_v32_e64.cu +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "vertex_coloring_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector vertex_coloring( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::random::RngState& rng_state); - -} // namespace cugraph diff --git a/cpp/src/components/vertex_coloring_sg_v32_e64.cu b/cpp/src/components/vertex_coloring_sg_v32_e64.cu deleted file mode 100644 index bf510a1f571..00000000000 --- a/cpp/src/components/vertex_coloring_sg_v32_e64.cu +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "vertex_coloring_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector vertex_coloring( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::random::RngState& rng_state); - -} // namespace cugraph diff --git a/cpp/src/components/weakly_connected_components_mg_v32_e64.cu b/cpp/src/components/weakly_connected_components_mg_v32_e64.cu deleted file mode 100644 index edbc8cc5eb5..00000000000 --- a/cpp/src/components/weakly_connected_components_mg_v32_e64.cu +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "components/weakly_connected_components_impl.cuh" - -namespace cugraph { - -// MG instantiations - -template void weakly_connected_components( - raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t* components, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/components/weakly_connected_components_sg_v32_e64.cu b/cpp/src/components/weakly_connected_components_sg_v32_e64.cu deleted file mode 100644 index 813d2711674..00000000000 --- a/cpp/src/components/weakly_connected_components_sg_v32_e64.cu +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "components/weakly_connected_components_impl.cuh" - -namespace cugraph { - -// SG instantiations - -template void weakly_connected_components( - raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t* components, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/cores/core_number_mg_v32_e64.cu b/cpp/src/cores/core_number_mg_v32_e64.cu deleted file mode 100644 index f41f9cd8a17..00000000000 --- a/cpp/src/cores/core_number_mg_v32_e64.cu +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cores/core_number_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template void core_number(raft::handle_t const& handle, - graph_view_t const& graph_view, - int64_t* core_numbers, - k_core_degree_type_t degree_type, - size_t k_first, - size_t k_last, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/cores/core_number_sg_v32_e64.cu b/cpp/src/cores/core_number_sg_v32_e64.cu deleted file mode 100644 index 63a6d0069a3..00000000000 --- a/cpp/src/cores/core_number_sg_v32_e64.cu +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cores/core_number_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template void core_number(raft::handle_t const& handle, - graph_view_t const& graph_view, - int64_t* core_numbers, - k_core_degree_type_t degree_type, - size_t k_first, - size_t k_last, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/cores/k_core_mg_v32_e64.cu b/cpp/src/cores/k_core_mg_v32_e64.cu deleted file mode 100644 index b2329997cb6..00000000000 --- a/cpp/src/cores/k_core_mg_v32_e64.cu +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cores/k_core_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_core(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t k, - std::optional degree_type, - std::optional> core_numbers, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_core(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t k, - std::optional degree_type, - std::optional> core_numbers, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/cores/k_core_sg_v32_e64.cu b/cpp/src/cores/k_core_sg_v32_e64.cu deleted file mode 100644 index 642f6673168..00000000000 --- a/cpp/src/cores/k_core_sg_v32_e64.cu +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cores/k_core_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_core(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t k, - std::optional degree_type, - std::optional> core_numbers, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>> -k_core(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - size_t k, - std::optional degree_type, - std::optional> core_numbers, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/detail/collect_local_vertex_values_mg_v32_e32.cu b/cpp/src/detail/collect_local_vertex_values_mg_v32_e32.cu index 3b6059a0ce8..c0c186e867e 100644 --- a/cpp/src/detail/collect_local_vertex_values_mg_v32_e32.cu +++ b/cpp/src/detail/collect_local_vertex_values_mg_v32_e32.cu @@ -15,7 +15,6 @@ */ #include "detail/collect_local_vertex_values.cuh" -#include "detail/graph_partition_utils.cuh" #include #include @@ -47,5 +46,16 @@ collect_local_vertex_values_from_ext_vertex_value_pairs( int32_t default_value, bool do_expensive_check); +template rmm::device_uvector +collect_local_vertex_values_from_ext_vertex_value_pairs( + raft::handle_t const& handle, + rmm::device_uvector&& d_vertices, + rmm::device_uvector&& d_values, + rmm::device_uvector const& number_map, + int32_t local_vertex_first, + int32_t local_vertex_last, + double default_value, + bool do_expensive_check); + } // namespace detail } // namespace cugraph diff --git a/cpp/src/detail/collect_local_vertex_values_mg_v32_e64.cu b/cpp/src/detail/collect_local_vertex_values_mg_v32_e64.cu deleted file mode 100644 index e33b6fe7a68..00000000000 --- a/cpp/src/detail/collect_local_vertex_values_mg_v32_e64.cu +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "detail/collect_local_vertex_values.cuh" -#include "detail/graph_partition_utils.cuh" - -#include -#include - -#include - -namespace cugraph { -namespace detail { - -template rmm::device_uvector -collect_local_vertex_values_from_ext_vertex_value_pairs( - raft::handle_t const& handle, - rmm::device_uvector&& d_vertices, - rmm::device_uvector&& d_values, - rmm::device_uvector const& number_map, - int32_t local_vertex_first, - int32_t local_vertex_last, - double default_value, - bool do_expensive_check); - -template rmm::device_uvector -collect_local_vertex_values_from_ext_vertex_value_pairs( - raft::handle_t const& handle, - rmm::device_uvector&& d_vertices, - rmm::device_uvector&& d_values, - rmm::device_uvector const& number_map, - int32_t local_vertex_first, - int32_t local_vertex_last, - int64_t default_value, - bool do_expensive_check); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/detail/collect_local_vertex_values_sg_v32_e32.cu b/cpp/src/detail/collect_local_vertex_values_sg_v32_e32.cu index c544d009aef..ac4c612b74a 100644 --- a/cpp/src/detail/collect_local_vertex_values_sg_v32_e32.cu +++ b/cpp/src/detail/collect_local_vertex_values_sg_v32_e32.cu @@ -15,7 +15,6 @@ */ #include "detail/collect_local_vertex_values.cuh" -#include "detail/graph_partition_utils.cuh" #include #include @@ -47,5 +46,16 @@ collect_local_vertex_values_from_ext_vertex_value_pairs int32_t default_value, bool do_expensive_check); +template rmm::device_uvector +collect_local_vertex_values_from_ext_vertex_value_pairs( + raft::handle_t const& handle, + rmm::device_uvector&& d_vertices, + rmm::device_uvector&& d_values, + rmm::device_uvector const& number_map, + int32_t local_vertex_first, + int32_t local_vertex_last, + double default_value, + bool do_expensive_check); + } // namespace detail } // namespace cugraph diff --git a/cpp/src/detail/collect_local_vertex_values_sg_v32_e64.cu b/cpp/src/detail/collect_local_vertex_values_sg_v32_e64.cu deleted file mode 100644 index 99817a70e61..00000000000 --- a/cpp/src/detail/collect_local_vertex_values_sg_v32_e64.cu +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "detail/collect_local_vertex_values.cuh" -#include "detail/graph_partition_utils.cuh" - -#include -#include - -#include - -namespace cugraph { -namespace detail { - -template rmm::device_uvector -collect_local_vertex_values_from_ext_vertex_value_pairs( - raft::handle_t const& handle, - rmm::device_uvector&& d_vertices, - rmm::device_uvector&& d_values, - rmm::device_uvector const& number_map, - int32_t local_vertex_first, - int32_t local_vertex_last, - double default_value, - bool do_expensive_check); - -template rmm::device_uvector -collect_local_vertex_values_from_ext_vertex_value_pairs( - raft::handle_t const& handle, - rmm::device_uvector&& d_vertices, - rmm::device_uvector&& d_values, - rmm::device_uvector const& number_map, - int32_t local_vertex_first, - int32_t local_vertex_last, - int64_t default_value, - bool do_expensive_check); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/detail/groupby_and_count_mg_v32_e64.cu b/cpp/src/detail/groupby_and_count_mg_v32_e64.cu deleted file mode 100644 index ec9cbc89aa2..00000000000 --- a/cpp/src/detail/groupby_and_count_mg_v32_e64.cu +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "detail/graph_partition_utils.cuh" -#include "detail/groupby_and_count.cuh" - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include - -namespace cugraph { -namespace detail { -template rmm::device_uvector groupby_and_count_edgelist_by_local_partition_id( - raft::handle_t const& handle, - rmm::device_uvector& d_edgelist_majors, - rmm::device_uvector& d_edgelist_minors, - std::optional>& d_edgelist_weights, - std::optional>& d_edgelist_edge_ids, - std::optional>& d_edgelist_edge_types, - bool groupby_and_counts_local_partition); - -template rmm::device_uvector groupby_and_count_edgelist_by_local_partition_id( - raft::handle_t const& handle, - rmm::device_uvector& d_edgelist_majors, - rmm::device_uvector& d_edgelist_minors, - std::optional>& d_edgelist_weights, - std::optional>& d_edgelist_edge_ids, - std::optional>& d_edgelist_edge_types, - bool groupby_and_counts_local_partition); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/link_analysis/hits_mg_v32_e64.cu b/cpp/src/link_analysis/hits_mg_v32_e64.cu deleted file mode 100644 index a0a99f61822..00000000000 --- a/cpp/src/link_analysis/hits_mg_v32_e64.cu +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "link_analysis/hits_impl.cuh" - -namespace cugraph { - -// MG instantiation -template std::tuple hits( - raft::handle_t const& handle, - graph_view_t const& graph_view, - float* const hubs, - float* const authorities, - float epsilon, - size_t max_iterations, - bool has_initial_hubs_guess, - bool normalize, - bool do_expensive_check); - -template std::tuple hits( - raft::handle_t const& handle, - graph_view_t const& graph_view, - double* const hubs, - double* const authorities, - double epsilon, - size_t max_iterations, - bool has_initial_hubs_guess, - bool normalize, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_analysis/hits_sg_v32_e64.cu b/cpp/src/link_analysis/hits_sg_v32_e64.cu deleted file mode 100644 index 10eb4579f15..00000000000 --- a/cpp/src/link_analysis/hits_sg_v32_e64.cu +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "link_analysis/hits_impl.cuh" - -namespace cugraph { - -// SG instantiation -template std::tuple hits( - raft::handle_t const& handle, - graph_view_t const& graph_view, - float* const hubs, - float* const authorities, - float epsilon, - size_t max_iterations, - bool has_initial_hubs_guess, - bool normalize, - bool do_expensive_check); - -template std::tuple hits( - raft::handle_t const& handle, - graph_view_t const& graph_view, - double* const hubs, - double* const authorities, - double epsilon, - size_t max_iterations, - bool has_initial_hubs_guess, - bool normalize, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_analysis/pagerank_mg_v32_e64.cu b/cpp/src/link_analysis/pagerank_mg_v32_e64.cu deleted file mode 100644 index c3a3b1b6f52..00000000000 --- a/cpp/src/link_analysis/pagerank_mg_v32_e64.cu +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_analysis/pagerank_impl.cuh" - -namespace cugraph { - -// MG instantiation -template void pagerank(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional precomputed_vertex_out_weight_sums, - std::optional personalization_vertices, - std::optional personalization_values, - std::optional personalization_vector_size, - float* pageranks, - float alpha, - float epsilon, - size_t max_iterations, - bool has_initial_guess, - bool do_expensive_check); - -template void pagerank(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional precomputed_vertex_out_weight_sums, - std::optional personalization_vertices, - std::optional personalization_values, - std::optional personalization_vector_size, - double* pageranks, - double alpha, - double epsilon, - size_t max_iterations, - bool has_initial_guess, - bool do_expensive_check); - -template std::tuple, centrality_algorithm_metadata_t> pagerank( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> precomputed_vertex_out_weight_sums, - std::optional, raft::device_span>> - personalization, - std::optional> initial_pageranks, - float alpha, - float epsilon, - size_t max_iterations, - bool do_expensive_check); - -template std::tuple, centrality_algorithm_metadata_t> pagerank( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> precomputed_vertex_out_weight_sums, - std::optional, raft::device_span>> - personalization, - std::optional> initial_pageranks, - double alpha, - double epsilon, - size_t max_iterations, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_analysis/pagerank_sg_v32_e64.cu b/cpp/src/link_analysis/pagerank_sg_v32_e64.cu deleted file mode 100644 index 0e515a55024..00000000000 --- a/cpp/src/link_analysis/pagerank_sg_v32_e64.cu +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_analysis/pagerank_impl.cuh" - -namespace cugraph { - -// SG instantiation -template void pagerank(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional precomputed_vertex_out_weight_sums, - std::optional personalization_vertices, - std::optional personalization_values, - std::optional personalization_vector_size, - float* pageranks, - float alpha, - float epsilon, - size_t max_iterations, - bool has_initial_guess, - bool do_expensive_check); - -template void pagerank(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional precomputed_vertex_out_weight_sums, - std::optional personalization_vertices, - std::optional personalization_values, - std::optional personalization_vector_size, - double* pageranks, - double alpha, - double epsilon, - size_t max_iterations, - bool has_initial_guess, - bool do_expensive_check); - -template std::tuple, centrality_algorithm_metadata_t> pagerank( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> precomputed_vertex_out_weight_sums, - std::optional, raft::device_span>> - personalization, - std::optional> initial_pageranks, - float alpha, - float epsilon, - size_t max_iterations, - bool do_expensive_check); - -template std::tuple, centrality_algorithm_metadata_t> pagerank( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> precomputed_vertex_out_weight_sums, - std::optional, raft::device_span>> - personalization, - std::optional> initial_pageranks, - double alpha, - double epsilon, - size_t max_iterations, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/cosine_mg_v32_e64.cu b/cpp/src/link_prediction/cosine_mg_v32_e64.cu deleted file mode 100644 index c6efa6b8c30..00000000000 --- a/cpp/src/link_prediction/cosine_mg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/cosine_similarity_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector cosine_similarity_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector cosine_similarity_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - cosine_similarity_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - cosine_similarity_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/cosine_sg_v32_e64.cu b/cpp/src/link_prediction/cosine_sg_v32_e64.cu deleted file mode 100644 index 80a3b31faab..00000000000 --- a/cpp/src/link_prediction/cosine_sg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/cosine_similarity_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector cosine_similarity_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector cosine_similarity_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - cosine_similarity_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - cosine_similarity_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/jaccard_mg_v32_e64.cu b/cpp/src/link_prediction/jaccard_mg_v32_e64.cu deleted file mode 100644 index a359458a3c0..00000000000 --- a/cpp/src/link_prediction/jaccard_mg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/jaccard_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector jaccard_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector jaccard_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - jaccard_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - jaccard_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/jaccard_sg_v32_e64.cu b/cpp/src/link_prediction/jaccard_sg_v32_e64.cu deleted file mode 100644 index eaa01f13c5e..00000000000 --- a/cpp/src/link_prediction/jaccard_sg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/jaccard_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector jaccard_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector jaccard_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - jaccard_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - jaccard_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/overlap_mg_v32_e64.cu b/cpp/src/link_prediction/overlap_mg_v32_e64.cu deleted file mode 100644 index c493a50a5db..00000000000 --- a/cpp/src/link_prediction/overlap_mg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/overlap_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector overlap_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector overlap_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - overlap_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - overlap_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/overlap_sg_v32_e64.cu b/cpp/src/link_prediction/overlap_sg_v32_e64.cu deleted file mode 100644 index 31adbcf0238..00000000000 --- a/cpp/src/link_prediction/overlap_sg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/overlap_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector overlap_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector overlap_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - overlap_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - overlap_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/sorensen_mg_v32_e64.cu b/cpp/src/link_prediction/sorensen_mg_v32_e64.cu deleted file mode 100644 index 9c5f5cc9716..00000000000 --- a/cpp/src/link_prediction/sorensen_mg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/sorensen_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector sorensen_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector sorensen_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - sorensen_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - sorensen_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/link_prediction/sorensen_sg_v32_e64.cu b/cpp/src/link_prediction/sorensen_sg_v32_e64.cu deleted file mode 100644 index 20cd5e621e2..00000000000 --- a/cpp/src/link_prediction/sorensen_sg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "link_prediction/sorensen_impl.cuh" - -namespace cugraph { - -template rmm::device_uvector sorensen_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template rmm::device_uvector sorensen_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::tuple, raft::device_span> vertex_pairs, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - sorensen_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - sorensen_all_pairs_coefficients( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> vertices, - std::optional topk, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/lookup/lookup_src_dst_mg_v32_e64.cu b/cpp/src/lookup/lookup_src_dst_mg_v32_e64.cu deleted file mode 100644 index 4e120f49f10..00000000000 --- a/cpp/src/lookup/lookup_src_dst_mg_v32_e64.cu +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "lookup/lookup_src_dst_impl.cuh" - -namespace cugraph { - -template class lookup_container_t; - -template lookup_container_t build_edge_id_and_type_to_src_dst_lookup_map( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_id_view, - edge_property_view_t edge_type_view); - -template std::tuple, rmm::device_uvector> -lookup_endpoints_from_edge_ids_and_single_type( - raft::handle_t const& handle, - lookup_container_t const& search_container, - raft::device_span edge_ids_to_lookup, - int32_t edge_type_to_lookup); - -template std::tuple, rmm::device_uvector> -lookup_endpoints_from_edge_ids_and_types( - raft::handle_t const& handle, - lookup_container_t const& search_container, - raft::device_span edge_ids_to_lookup, - raft::device_span edge_types_to_lookup); - -} // namespace cugraph diff --git a/cpp/src/lookup/lookup_src_dst_sg_v32_e64.cu b/cpp/src/lookup/lookup_src_dst_sg_v32_e64.cu deleted file mode 100644 index 46b62e05ed8..00000000000 --- a/cpp/src/lookup/lookup_src_dst_sg_v32_e64.cu +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "lookup/lookup_src_dst_impl.cuh" - -namespace cugraph { - -template class lookup_container_t; - -template lookup_container_t build_edge_id_and_type_to_src_dst_lookup_map( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_id_view, - edge_property_view_t edge_type_view); - -template std::tuple, rmm::device_uvector> -lookup_endpoints_from_edge_ids_and_single_type( - raft::handle_t const& handle, - lookup_container_t const& search_container, - raft::device_span edge_ids_to_lookup, - int32_t edge_type_to_lookup); - -template std::tuple, rmm::device_uvector> -lookup_endpoints_from_edge_ids_and_types( - raft::handle_t const& handle, - lookup_container_t const& search_container, - raft::device_span edge_ids_to_lookup, - raft::device_span edge_types_to_lookup); - -} // namespace cugraph diff --git a/cpp/src/sampling/detail/check_edge_bias_values_mg_v32_e64.cu b/cpp/src/sampling/detail/check_edge_bias_values_mg_v32_e64.cu deleted file mode 100644 index b8b3564fee7..00000000000 --- a/cpp/src/sampling/detail/check_edge_bias_values_mg_v32_e64.cu +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/check_edge_bias_values.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple check_edge_bias_values( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_bias_view); - -template std::tuple check_edge_bias_values( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_bias_view); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/check_edge_bias_values_sg_v32_e64.cu b/cpp/src/sampling/detail/check_edge_bias_values_sg_v32_e64.cu deleted file mode 100644 index c8c28a5ad04..00000000000 --- a/cpp/src/sampling/detail/check_edge_bias_values_sg_v32_e64.cu +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/check_edge_bias_values.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple check_edge_bias_values( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_bias_view); - -template std::tuple check_edge_bias_values( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_bias_view); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/gather_one_hop_edgelist_mg_v32_e64.cu b/cpp/src/sampling/detail/gather_one_hop_edgelist_mg_v32_e64.cu deleted file mode 100644 index d7dd08b4cd5..00000000000 --- a/cpp/src/sampling/detail/gather_one_hop_edgelist_mg_v32_e64.cu +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/gather_one_hop_edgelist_impl.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -gather_one_hop_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - raft::device_span active_majors, - std::optional> active_major_labels, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -gather_one_hop_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - raft::device_span active_majors, - std::optional> active_major_labels, - bool do_expensive_check); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/gather_one_hop_edgelist_sg_v32_e64.cu b/cpp/src/sampling/detail/gather_one_hop_edgelist_sg_v32_e64.cu deleted file mode 100644 index 2a151b4d4e6..00000000000 --- a/cpp/src/sampling/detail/gather_one_hop_edgelist_sg_v32_e64.cu +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/gather_one_hop_edgelist_impl.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -gather_one_hop_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - raft::device_span active_majors, - std::optional> active_major_labels, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -gather_one_hop_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - raft::device_span active_majors, - std::optional> active_major_labels, - bool do_expensive_check); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/sample_edges_mg_v32_e64.cu b/cpp/src/sampling/detail/sample_edges_mg_v32_e64.cu deleted file mode 100644 index 4628840499f..00000000000 --- a/cpp/src/sampling/detail/sample_edges_mg_v32_e64.cu +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/sample_edges.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sample_edges(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - std::optional> edge_bias_view, - raft::random::RngState& rng_state, - raft::device_span active_majors, - std::optional> active_major_labels, - size_t fanout, - bool with_replacement); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sample_edges(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - std::optional> edge_bias_view, - raft::random::RngState& rng_state, - raft::device_span active_majors, - std::optional> active_major_labels, - size_t fanout, - bool with_replacement); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/sample_edges_sg_v32_e64.cu b/cpp/src/sampling/detail/sample_edges_sg_v32_e64.cu deleted file mode 100644 index b1d664782f2..00000000000 --- a/cpp/src/sampling/detail/sample_edges_sg_v32_e64.cu +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/sample_edges.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sample_edges(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - std::optional> edge_bias_view, - raft::random::RngState& rng_state, - raft::device_span active_majors, - std::optional> active_major_labels, - size_t fanout, - bool with_replacement); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sample_edges(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_edge_type_view, - std::optional> edge_bias_view, - raft::random::RngState& rng_state, - raft::device_span active_majors, - std::optional> active_major_labels, - size_t fanout, - bool with_replacement); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/detail/shuffle_and_organize_output_mg_v32_e64.cu b/cpp/src/sampling/detail/shuffle_and_organize_output_mg_v32_e64.cu deleted file mode 100644 index 50fc3910aca..00000000000 --- a/cpp/src/sampling/detail/shuffle_and_organize_output_mg_v32_e64.cu +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/detail/shuffle_and_organize_output_impl.cuh" - -namespace cugraph { -namespace detail { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -shuffle_and_organize_output( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types, - std::optional>&& hops, - std::optional>&& labels, - std::optional, raft::device_span>> - label_to_output_comm_rank); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -shuffle_and_organize_output( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types, - std::optional>&& hops, - std::optional>&& labels, - std::optional, raft::device_span>> - label_to_output_comm_rank); - -} // namespace detail -} // namespace cugraph diff --git a/cpp/src/sampling/negative_sampling_mg_v32_e64.cu b/cpp/src/sampling/negative_sampling_mg_v32_e64.cu deleted file mode 100644 index af4c28c0f1a..00000000000 --- a/cpp/src/sampling/negative_sampling_mg_v32_e64.cu +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "negative_sampling_impl.cuh" - -#include -#include - -namespace cugraph { - -template std::tuple, rmm::device_uvector> negative_sampling( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> src_bias, - std::optional> dst_bias, - size_t num_samples, - bool remove_duplicates, - bool remove_existing_edges, - bool exact_number_of_samples, - bool do_expensive_check); - -template std::tuple, rmm::device_uvector> negative_sampling( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> src_bias, - std::optional> dst_bias, - size_t num_samples, - bool remove_duplicates, - bool remove_existing_edges, - bool exact_number_of_samples, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/sampling/negative_sampling_sg_v32_e64.cu b/cpp/src/sampling/negative_sampling_sg_v32_e64.cu deleted file mode 100644 index c66c31a4258..00000000000 --- a/cpp/src/sampling/negative_sampling_sg_v32_e64.cu +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2024, 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "negative_sampling_impl.cuh" - -#include -#include - -namespace cugraph { - -template std::tuple, rmm::device_uvector> negative_sampling( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> src_bias, - std::optional> dst_bias, - size_t num_samples, - bool remove_duplicates, - bool remove_existing_edges, - bool exact_number_of_samples, - bool do_expensive_check); - -template std::tuple, rmm::device_uvector> negative_sampling( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> src_bias, - std::optional> dst_bias, - size_t num_samples, - bool remove_duplicates, - bool remove_existing_edges, - bool exact_number_of_samples, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/sampling/neighbor_sampling_mg_v32_e64.cpp b/cpp/src/sampling/neighbor_sampling_mg_v32_e64.cpp deleted file mode 100644 index c37b353ae1c..00000000000 --- a/cpp/src/sampling/neighbor_sampling_mg_v32_e64.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "neighbor_sampling_impl.hpp" - -#include -#include - -namespace cugraph { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -uniform_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -uniform_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -biased_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - edge_property_view_t edge_bias_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -biased_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - edge_property_view_t edge_bias_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/sampling/neighbor_sampling_sg_v32_e64.cpp b/cpp/src/sampling/neighbor_sampling_sg_v32_e64.cpp deleted file mode 100644 index 7ab0a8782ec..00000000000 --- a/cpp/src/sampling/neighbor_sampling_sg_v32_e64.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "neighbor_sampling_impl.hpp" - -#include -#include - -namespace cugraph { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -uniform_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -uniform_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -biased_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - edge_property_view_t edge_bias_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -biased_neighbor_sample( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - edge_property_view_t edge_bias_view, - raft::device_span starting_vertices, - std::optional> starting_vertex_labels, - std::optional, raft::device_span>> - label_to_output_comm_rank, - raft::host_span fan_out, - raft::random::RngState& rng_state, - bool return_hops, - bool with_replacement, - prior_sources_behavior_t prior_sources_behavior, - bool dedupe_sources, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/sampling/random_walks_mg_v32_e64.cu b/cpp/src/sampling/random_walks_mg_v32_e64.cu deleted file mode 100644 index b1bf1a19b77..00000000000 --- a/cpp/src/sampling/random_walks_mg_v32_e64.cu +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/random_walks_impl.cuh" - -#include - -namespace cugraph { - -template std::tuple, std::optional>> -uniform_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -uniform_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -biased_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -biased_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -node2vec_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length, - float p, - float q); - -template std::tuple, std::optional>> -node2vec_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length, - double p, - double q); - -} // namespace cugraph diff --git a/cpp/src/sampling/random_walks_old_sg.cu b/cpp/src/sampling/random_walks_old_sg.cu index 0e612163715..d5079231f51 100644 --- a/cpp/src/sampling/random_walks_old_sg.cu +++ b/cpp/src/sampling/random_walks_old_sg.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,17 +33,6 @@ template std:: bool use_padding, std::unique_ptr sampling_strategy); -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - random_walks(raft::handle_t const& handle, - graph_view_t const& gview, - std::optional> edge_weight_view, - int32_t const* ptr_d_start, - int64_t num_paths, - int64_t max_depth, - bool use_padding, - std::unique_ptr sampling_strategy); - template std:: tuple, rmm::device_uvector, rmm::device_uvector> random_walks(raft::handle_t const& handle, @@ -68,17 +57,6 @@ template std:: bool use_padding, std::unique_ptr sampling_strategy); -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - random_walks(raft::handle_t const& handle, - graph_view_t const& gview, - std::optional> edge_weight_view, - int32_t const* ptr_d_start, - int64_t num_paths, - int64_t max_depth, - bool use_padding, - std::unique_ptr sampling_strategy); - template std:: tuple, rmm::device_uvector, rmm::device_uvector> random_walks(raft::handle_t const& handle, diff --git a/cpp/src/sampling/random_walks_old_sg_v32_e64.cu b/cpp/src/sampling/random_walks_old_sg_v32_e64.cu deleted file mode 100644 index 7dfbf964587..00000000000 --- a/cpp/src/sampling/random_walks_old_sg_v32_e64.cu +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// Andrei Schaffer, aschaffer@nvidia.com -// -#include "random_walks.cuh" - -namespace cugraph { -// template explicit instantiation directives (EIDir's): - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - random_walks(raft::handle_t const& handle, - graph_view_t const& gview, - std::optional> edge_weight_view, - int32_t const* ptr_d_start, - int64_t num_paths, - int64_t max_depth, - bool use_padding, - std::unique_ptr sampling_strategy); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - random_walks(raft::handle_t const& handle, - graph_view_t const& gview, - std::optional> edge_weight_view, - int32_t const* ptr_d_start, - int64_t num_paths, - int64_t max_depth, - bool use_padding, - std::unique_ptr sampling_strategy); - -template std:: - tuple, rmm::device_uvector, rmm::device_uvector> - convert_paths_to_coo(raft::handle_t const& handle, - int64_t coalesced_sz_v, - int64_t num_paths, - rmm::device_buffer&& d_coalesced_v, - rmm::device_buffer&& d_sizes); - -} // namespace cugraph diff --git a/cpp/src/sampling/random_walks_sg_v32_e64.cu b/cpp/src/sampling/random_walks_sg_v32_e64.cu deleted file mode 100644 index 98d2bb02d88..00000000000 --- a/cpp/src/sampling/random_walks_sg_v32_e64.cu +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling/random_walks_impl.cuh" - -#include - -namespace cugraph { - -template std::tuple, std::optional>> -uniform_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -uniform_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -biased_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -biased_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span start_vertices, - size_t max_length); - -template std::tuple, std::optional>> -node2vec_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length, - float p, - float q); - -template std::tuple, std::optional>> -node2vec_random_walks(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span start_vertices, - size_t max_length, - double p, - double q); - -} // namespace cugraph diff --git a/cpp/src/sampling/sampling_post_processing_sg_v32_e64.cu b/cpp/src/sampling/sampling_post_processing_sg_v32_e64.cu deleted file mode 100644 index 7001dcfdaf3..00000000000 --- a/cpp/src/sampling/sampling_post_processing_sg_v32_e64.cu +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sampling_post_processing_impl.cuh" - -#include - -namespace cugraph { - -template std::tuple>, - rmm::device_uvector, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - std::optional>> -renumber_and_compress_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool compress_per_hop, - bool doubly_compress, - bool do_expensive_check); - -template std::tuple>, - rmm::device_uvector, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - std::optional>> -renumber_and_compress_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool compress_per_hop, - bool doubly_compress, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - std::optional>> -renumber_and_sort_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - std::optional>> -renumber_and_sort_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - rmm::device_uvector, - std::optional>, - std::optional>> -heterogeneous_renumber_and_sort_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - raft::device_span vertex_type_offsets, - size_t num_labels, - size_t num_hops, - size_t num_vertex_types, - size_t num_edge_types, - bool src_is_major, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - rmm::device_uvector, - rmm::device_uvector, - std::optional>, - std::optional>> -heterogeneous_renumber_and_sort_sampled_edgelist( - raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> seed_vertices, - std::optional> seed_vertex_label_offsets, - std::optional> edgelist_label_offsets, - raft::device_span vertex_type_offsets, - size_t num_labels, - size_t num_hops, - size_t num_vertex_types, - size_t num_edge_types, - bool src_is_major, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sort_sampled_edgelist(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::optional>> -sort_sampled_edgelist(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - std::optional>&& edgelist_hops, - std::optional> edgelist_label_offsets, - size_t num_labels, - size_t num_hops, - bool src_is_major, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/coarsen_graph_mg_v32_e64.cu b/cpp/src/structure/coarsen_graph_mg_v32_e64.cu deleted file mode 100644 index c41d1071304..00000000000 --- a/cpp/src/structure/coarsen_graph_mg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/coarsen_graph_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/coarsen_graph_sg_v32_e64.cu b/cpp/src/structure/coarsen_graph_sg_v32_e64.cu deleted file mode 100644 index 317bd5a3588..00000000000 --- a/cpp/src/structure/coarsen_graph_sg_v32_e64.cu +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/coarsen_graph_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -coarsen_graph(raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - int32_t const* labels, - bool renumber, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/create_graph_from_edgelist_mg_v32_e64.cu b/cpp/src/structure/create_graph_from_edgelist_mg_v32_e64.cu deleted file mode 100644 index 380d3474292..00000000000 --- a/cpp/src/structure/create_graph_from_edgelist_mg_v32_e64.cu +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/create_graph_from_edgelist_impl.cuh" - -namespace cugraph { - -// explicit instantiations - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); -} // namespace cugraph diff --git a/cpp/src/structure/create_graph_from_edgelist_sg_v32_e64.cu b/cpp/src/structure/create_graph_from_edgelist_sg_v32_e64.cu deleted file mode 100644 index 71bd74c1a44..00000000000 --- a/cpp/src/structure/create_graph_from_edgelist_sg_v32_e64.cu +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/create_graph_from_edgelist_impl.cuh" - -namespace cugraph { - -// explicit instantiations - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, float>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -template std::tuple< - cugraph::graph_t, - std::optional< - cugraph::edge_property_t, double>>, - std::optional< - cugraph::edge_property_t, int64_t>>, - std::optional< - cugraph::edge_property_t, int32_t>>, - std::optional>> -create_graph_from_edgelist( - raft::handle_t const& handle, - std::optional>&& vertices, - std::vector>&& edgelist_srcs, - std::vector>&& edgelist_dsts, - std::optional>>&& edgelist_weights, - std::optional>>&& edgelist_edge_ids, - std::optional>>&& edgelist_edge_types, - graph_properties_t graph_properties, - bool renumber, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/decompress_to_edgelist_mg_v32_e64.cu b/cpp/src/structure/decompress_to_edgelist_mg_v32_e64.cu deleted file mode 100644 index 082b058c3ae..00000000000 --- a/cpp/src/structure/decompress_to_edgelist_mg_v32_e64.cu +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/decompress_to_edgelist_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/decompress_to_edgelist_sg_v32_e64.cu b/cpp/src/structure/decompress_to_edgelist_sg_v32_e64.cu deleted file mode 100644 index 035bea15e1c..00000000000 --- a/cpp/src/structure/decompress_to_edgelist_sg_v32_e64.cu +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/decompress_to_edgelist_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -decompress_to_edgelist( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> edge_type_view, - std::optional> renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/graph_mg_v32_e64.cu b/cpp/src/structure/graph_mg_v32_e64.cu deleted file mode 100644 index 154ae2971dc..00000000000 --- a/cpp/src/structure/graph_mg_v32_e64.cu +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template class graph_t; -template class graph_t; - -} // namespace cugraph diff --git a/cpp/src/structure/graph_sg_v32_e64.cu b/cpp/src/structure/graph_sg_v32_e64.cu deleted file mode 100644 index 51f19cfc910..00000000000 --- a/cpp/src/structure/graph_sg_v32_e64.cu +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template class graph_t; -template class graph_t; - -} // namespace cugraph diff --git a/cpp/src/structure/graph_view_mg_v32_e64.cu b/cpp/src/structure/graph_view_mg_v32_e64.cu deleted file mode 100644 index 1c6edc53706..00000000000 --- a/cpp/src/structure/graph_view_mg_v32_e64.cu +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_view_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template class graph_view_t; -template class graph_view_t; -} // namespace cugraph diff --git a/cpp/src/structure/graph_view_sg_v32_e64.cu b/cpp/src/structure/graph_view_sg_v32_e64.cu deleted file mode 100644 index 12b140e34a6..00000000000 --- a/cpp/src/structure/graph_view_sg_v32_e64.cu +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_view_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template class graph_view_t; -template class graph_view_t; -} // namespace cugraph diff --git a/cpp/src/structure/graph_weight_utils_mg_v32_e64.cu b/cpp/src/structure/graph_weight_utils_mg_v32_e64.cu deleted file mode 100644 index a1fe84b2b85..00000000000 --- a/cpp/src/structure/graph_weight_utils_mg_v32_e64.cu +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_weight_utils_impl.cuh" - -namespace cugraph { - -// SG instantiation - -// compute_in_weight_sums - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -} // namespace cugraph diff --git a/cpp/src/structure/graph_weight_utils_sg_v32_e64.cu b/cpp/src/structure/graph_weight_utils_sg_v32_e64.cu deleted file mode 100644 index 4d4ce7097bd..00000000000 --- a/cpp/src/structure/graph_weight_utils_sg_v32_e64.cu +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2020-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/graph_weight_utils_impl.cuh" - -namespace cugraph { - -// SG instantiation - -// compute_in_weight_sums - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_in_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector -compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template rmm::device_uvector compute_out_weight_sums( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_in_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_max_out_weight_sum( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template float compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -template double compute_total_edge_weight( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view); - -} // namespace cugraph diff --git a/cpp/src/structure/induced_subgraph_mg_v32_e64.cu b/cpp/src/structure/induced_subgraph_mg_v32_e64.cu deleted file mode 100644 index e83d101898f..00000000000 --- a/cpp/src/structure/induced_subgraph_mg_v32_e64.cu +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/induced_subgraph_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_induced_subgraphs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span subgraph_offsets, - raft::device_span subgraph_vertices, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_induced_subgraphs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span subgraph_offsets, - raft::device_span subgraph_vertices, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/induced_subgraph_sg_v32_e64.cu b/cpp/src/structure/induced_subgraph_sg_v32_e64.cu deleted file mode 100644 index 6a4c08f9682..00000000000 --- a/cpp/src/structure/induced_subgraph_sg_v32_e64.cu +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/induced_subgraph_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_induced_subgraphs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span subgraph_offsets, - raft::device_span subgraph_vertices, - bool do_expensive_check); - -template std::tuple, - rmm::device_uvector, - std::optional>, - rmm::device_uvector> -extract_induced_subgraphs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - raft::device_span subgraph_offsets, - raft::device_span subgraph_vertices, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/remove_multi_edges_sg_v32_e64.cu b/cpp/src/structure/remove_multi_edges_sg_v32_e64.cu deleted file mode 100644 index 03b5a634158..00000000000 --- a/cpp/src/structure/remove_multi_edges_sg_v32_e64.cu +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/remove_multi_edges_impl.cuh" - -namespace cugraph { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -remove_multi_edges(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - bool keep_min_value_edge); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -remove_multi_edges(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types, - bool keep_min_value_edge); - -} // namespace cugraph diff --git a/cpp/src/structure/remove_self_loops_sg_v32_e64.cu b/cpp/src/structure/remove_self_loops_sg_v32_e64.cu deleted file mode 100644 index 0244e75353d..00000000000 --- a/cpp/src/structure/remove_self_loops_sg_v32_e64.cu +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/remove_self_loops_impl.cuh" - -namespace cugraph { - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -remove_self_loops(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>> -remove_self_loops(raft::handle_t const& handle, - rmm::device_uvector&& edgelist_srcs, - rmm::device_uvector&& edgelist_dsts, - std::optional>&& edgelist_weights, - std::optional>&& edgelist_edge_ids, - std::optional>&& edgelist_edge_types); - -} // namespace cugraph diff --git a/cpp/src/structure/renumber_edgelist_mg_v32_e64.cu b/cpp/src/structure/renumber_edgelist_mg_v32_e64.cu deleted file mode 100644 index 6d1414f918c..00000000000 --- a/cpp/src/structure/renumber_edgelist_mg_v32_e64.cu +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/renumber_edgelist_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, renumber_meta_t> -renumber_edgelist( - raft::handle_t const& handle, - std::optional>&& local_vertices, - std::vector const& edgelist_srcs /* [INOUT] */, - std::vector const& edgelist_dsts /* [INOUT] */, - std::vector const& edgelist_edge_counts, - std::optional>> const& edgelist_intra_partition_segment_offsets, - bool store_transposed, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/renumber_edgelist_sg_v32_e64.cu b/cpp/src/structure/renumber_edgelist_sg_v32_e64.cu deleted file mode 100644 index 5214ec15f3e..00000000000 --- a/cpp/src/structure/renumber_edgelist_sg_v32_e64.cu +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/renumber_edgelist_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, renumber_meta_t> -renumber_edgelist(raft::handle_t const& handle, - std::optional>&& vertices, - int32_t* edgelist_srcs /* [INOUT] */, - int32_t* edgelist_dsts /* [INOUT] */, - int64_t num_edgelist_edges, - bool store_transposed, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/select_random_vertices_mg_v32_e64.cu b/cpp/src/structure/select_random_vertices_mg_v32_e64.cu deleted file mode 100644 index 16b5243bcd4..00000000000 --- a/cpp/src/structure/select_random_vertices_mg_v32_e64.cu +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "structure/select_random_vertices_impl.hpp" - -namespace cugraph { - -template rmm::device_uvector select_random_vertices( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> given_set, - raft::random::RngState& rng_state, - size_t select_count, - bool with_replacement, - bool sort_vertices, - bool do_expensive_check); - -template rmm::device_uvector select_random_vertices( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> given_set, - raft::random::RngState& rng_state, - size_t select_count, - bool with_replacement, - bool sort_vertices, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/select_random_vertices_sg_v32_e64.cu b/cpp/src/structure/select_random_vertices_sg_v32_e64.cu deleted file mode 100644 index 21842ba76f8..00000000000 --- a/cpp/src/structure/select_random_vertices_sg_v32_e64.cu +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "structure/select_random_vertices_impl.hpp" - -namespace cugraph { - -template rmm::device_uvector select_random_vertices( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> given_set, - raft::random::RngState& rng_state, - size_t select_count, - bool with_replacement, - bool sort_vertices, - bool do_expensive_check); - -template rmm::device_uvector select_random_vertices( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> given_set, - raft::random::RngState& rng_state, - size_t select_count, - bool with_replacement, - bool sort_vertices, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/symmetrize_graph_mg_v32_e64.cu b/cpp/src/structure/symmetrize_graph_mg_v32_e64.cu deleted file mode 100644 index db077e676bd..00000000000 --- a/cpp/src/structure/symmetrize_graph_mg_v32_e64.cu +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/symmetrize_graph_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/symmetrize_graph_sg_v32_e64.cu b/cpp/src/structure/symmetrize_graph_sg_v32_e64.cu deleted file mode 100644 index a819207874d..00000000000 --- a/cpp/src/structure/symmetrize_graph_sg_v32_e64.cu +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/symmetrize_graph_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& - edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -symmetrize_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool reciprocal, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/transpose_graph_mg_v32_e64.cu b/cpp/src/structure/transpose_graph_mg_v32_e64.cu deleted file mode 100644 index 6bf9b9e4011..00000000000 --- a/cpp/src/structure/transpose_graph_mg_v32_e64.cu +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/transpose_graph_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/transpose_graph_sg_v32_e64.cu b/cpp/src/structure/transpose_graph_sg_v32_e64.cu deleted file mode 100644 index af64aa7b20b..00000000000 --- a/cpp/src/structure/transpose_graph_sg_v32_e64.cu +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/transpose_graph_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/transpose_graph_storage_mg_v32_e64.cu b/cpp/src/structure/transpose_graph_storage_mg_v32_e64.cu deleted file mode 100644 index 15488e2ba17..00000000000 --- a/cpp/src/structure/transpose_graph_storage_mg_v32_e64.cu +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/transpose_graph_storage_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/structure/transpose_graph_storage_sg_v32_e64.cu b/cpp/src/structure/transpose_graph_storage_sg_v32_e64.cu deleted file mode 100644 index ac8787582dd..00000000000 --- a/cpp/src/structure/transpose_graph_storage_sg_v32_e64.cu +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "structure/transpose_graph_storage_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, float>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, float>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -template std::tuple< - graph_t, - std::optional, double>>, - std::optional>> -transpose_graph_storage( - raft::handle_t const& handle, - graph_t&& graph, - std::optional, double>>&& - edge_weights, - std::optional>&& renumber_map, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/bfs_mg_v32_e64.cu b/cpp/src/traversal/bfs_mg_v32_e64.cu deleted file mode 100644 index 5fde01e0fcc..00000000000 --- a/cpp/src/traversal/bfs_mg_v32_e64.cu +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "traversal/bfs_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template void bfs(raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t* distances, - int32_t* predecessors, - int32_t const* sources, - size_t n_sources, - bool direction_optimizing, - int32_t depth_limit, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/bfs_sg_v32_e64.cu b/cpp/src/traversal/bfs_sg_v32_e64.cu deleted file mode 100644 index 3a6a7ef01de..00000000000 --- a/cpp/src/traversal/bfs_sg_v32_e64.cu +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "traversal/bfs_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template void bfs(raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t* distances, - int32_t* predecessors, - int32_t const* sources, - size_t n_sources, - bool direction_optimizing, - int32_t depth_limit, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/extract_bfs_paths_mg_v32_e64.cu b/cpp/src/traversal/extract_bfs_paths_mg_v32_e64.cu deleted file mode 100644 index 00aacc50c47..00000000000 --- a/cpp/src/traversal/extract_bfs_paths_mg_v32_e64.cu +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "traversal/extract_bfs_paths_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, int32_t> extract_bfs_paths( - raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t const* distances, - int32_t const* predecessors, - int32_t const* destinations, - size_t n_destinations); - -} // namespace cugraph diff --git a/cpp/src/traversal/extract_bfs_paths_sg_v32_e64.cu b/cpp/src/traversal/extract_bfs_paths_sg_v32_e64.cu deleted file mode 100644 index 369ae9efa1a..00000000000 --- a/cpp/src/traversal/extract_bfs_paths_sg_v32_e64.cu +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "traversal/extract_bfs_paths_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template std::tuple, int32_t> extract_bfs_paths( - raft::handle_t const& handle, - graph_view_t const& graph_view, - int32_t const* distances, - int32_t const* predecessors, - int32_t const* destinations, - size_t n_destinations); - -} // namespace cugraph diff --git a/cpp/src/traversal/k_hop_nbrs_mg_v32_e64.cu b/cpp/src/traversal/k_hop_nbrs_mg_v32_e64.cu deleted file mode 100644 index 31049883166..00000000000 --- a/cpp/src/traversal/k_hop_nbrs_mg_v32_e64.cu +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "traversal/k_hop_nbrs_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, rmm::device_uvector> k_hop_nbrs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::device_span start_vertices, - size_t k, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/k_hop_nbrs_sg_v32_e64.cu b/cpp/src/traversal/k_hop_nbrs_sg_v32_e64.cu deleted file mode 100644 index cd47f81361f..00000000000 --- a/cpp/src/traversal/k_hop_nbrs_sg_v32_e64.cu +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "traversal/k_hop_nbrs_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template std::tuple, rmm::device_uvector> k_hop_nbrs( - raft::handle_t const& handle, - graph_view_t const& graph_view, - raft::device_span start_vertices, - size_t k, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/od_shortest_distances_sg_v32_e64.cu b/cpp/src/traversal/od_shortest_distances_sg_v32_e64.cu deleted file mode 100644 index 880bc775589..00000000000 --- a/cpp/src/traversal/od_shortest_distances_sg_v32_e64.cu +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2023-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "traversal/od_shortest_distances_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template rmm::device_uvector od_shortest_distances( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span origins, - raft::device_span destinations, - float cutoff, - bool do_expensive_check); - -template rmm::device_uvector od_shortest_distances( - raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - raft::device_span origins, - raft::device_span destinations, - double cutoff, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/sssp_mg_v32_e64.cu b/cpp/src/traversal/sssp_mg_v32_e64.cu deleted file mode 100644 index 382b31cebf9..00000000000 --- a/cpp/src/traversal/sssp_mg_v32_e64.cu +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "traversal/sssp_impl.cuh" - -namespace cugraph { - -// MG instantiation - -template void sssp(raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - float* distances, - int32_t* predecessors, - int32_t source_vertex, - float cutoff, - bool do_expensive_check); - -template void sssp(raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - double* distances, - int32_t* predecessors, - int32_t source_vertex, - double cutoff, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/traversal/sssp_sg_v32_e64.cu b/cpp/src/traversal/sssp_sg_v32_e64.cu deleted file mode 100644 index b02d43cfaf2..00000000000 --- a/cpp/src/traversal/sssp_sg_v32_e64.cu +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "traversal/sssp_impl.cuh" - -namespace cugraph { - -// SG instantiation - -template void sssp(raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - float* distances, - int32_t* predecessors, - int32_t source_vertex, - float cutoff, - bool do_expensive_check); - -template void sssp(raft::handle_t const& handle, - graph_view_t const& graph_view, - edge_property_view_t edge_weight_view, - double* distances, - int32_t* predecessors, - int32_t source_vertex, - double cutoff, - bool do_expensive_check); - -} // namespace cugraph diff --git a/cpp/src/utilities/shuffle_vertex_pairs_mg_v32_e64.cu b/cpp/src/utilities/shuffle_vertex_pairs_mg_v32_e64.cu deleted file mode 100644 index d79b2379224..00000000000 --- a/cpp/src/utilities/shuffle_vertex_pairs_mg_v32_e64.cu +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "detail/graph_partition_utils.cuh" -#include "shuffle_vertex_pairs.cuh" - -#include -#include -#include -#include -#include - -#include -#include - -#include - -namespace cugraph { - -namespace detail { -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types, - std::vector const& vertex_partition_range_lasts); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning( - raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types, - std::vector const& vertex_partition_range_lasts); - -} // namespace detail - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_external_edges(raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types); - -template std::tuple, - rmm::device_uvector, - std::optional>, - std::optional>, - std::optional>, - std::vector> -shuffle_external_edges(raft::handle_t const& handle, - rmm::device_uvector&& majors, - rmm::device_uvector&& minors, - std::optional>&& weights, - std::optional>&& edge_ids, - std::optional>&& edge_types); - -} // namespace cugraph diff --git a/cpp/tests/centrality/betweenness_centrality_test.cpp b/cpp/tests/centrality/betweenness_centrality_test.cpp index 671e70bd40c..42f619efa2b 100644 --- a/cpp/tests/centrality/betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/betweenness_centrality_test.cpp @@ -182,12 +182,6 @@ TEST_P(Tests_BetweennessCentrality_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_BetweennessCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_BetweennessCentrality_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/centrality/edge_betweenness_centrality_test.cpp b/cpp/tests/centrality/edge_betweenness_centrality_test.cpp index 4f9cdbe6458..9ba840bde90 100644 --- a/cpp/tests/centrality/edge_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/edge_betweenness_centrality_test.cpp @@ -205,12 +205,6 @@ TEST_P(Tests_EdgeBetweennessCentrality_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_EdgeBetweennessCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_EdgeBetweennessCentrality_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/centrality/eigenvector_centrality_test.cpp b/cpp/tests/centrality/eigenvector_centrality_test.cpp index 9e232888e77..f9bccd6256b 100644 --- a/cpp/tests/centrality/eigenvector_centrality_test.cpp +++ b/cpp/tests/centrality/eigenvector_centrality_test.cpp @@ -254,13 +254,6 @@ TEST_P(Tests_EigenvectorCentrality_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_EigenvectorCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_EigenvectorCentrality_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/centrality/katz_centrality_test.cpp b/cpp/tests/centrality/katz_centrality_test.cpp index fc5aead5d90..a6365a37c70 100644 --- a/cpp/tests/centrality/katz_centrality_test.cpp +++ b/cpp/tests/centrality/katz_centrality_test.cpp @@ -258,13 +258,6 @@ TEST_P(Tests_KatzCentrality_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_KatzCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_KatzCentrality_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/centrality/mg_betweenness_centrality_test.cpp b/cpp/tests/centrality/mg_betweenness_centrality_test.cpp index 65a1098033b..35f6a5157ff 100644 --- a/cpp/tests/centrality/mg_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/mg_betweenness_centrality_test.cpp @@ -205,12 +205,6 @@ TEST_P(Tests_MGBetweennessCentrality_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGBetweennessCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGBetweennessCentrality_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp b/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp index 8dbeb076c00..ff100a33e40 100644 --- a/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp +++ b/cpp/tests/centrality/mg_edge_betweenness_centrality_test.cpp @@ -209,12 +209,6 @@ TEST_P(Tests_MGEdgeBetweennessCentrality_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGEdgeBetweennessCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGEdgeBetweennessCentrality_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp b/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp index 39406e05d6c..0e2a0e37c1b 100644 --- a/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp +++ b/cpp/tests/centrality/mg_eigenvector_centrality_test.cpp @@ -238,13 +238,6 @@ TEST_P(Tests_MGEigenvectorCentrality_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGEigenvectorCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGEigenvectorCentrality_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/centrality/mg_katz_centrality_test.cpp b/cpp/tests/centrality/mg_katz_centrality_test.cpp index 15a4089fa1b..5ccade18c18 100644 --- a/cpp/tests/centrality/mg_katz_centrality_test.cpp +++ b/cpp/tests/centrality/mg_katz_centrality_test.cpp @@ -229,13 +229,6 @@ TEST_P(Tests_MGKatzCentrality_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGKatzCentrality_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGKatzCentrality_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/community/mg_ecg_test.cpp b/cpp/tests/community/mg_ecg_test.cpp index c99f83fa2e8..14d1697744e 100644 --- a/cpp/tests/community/mg_ecg_test.cpp +++ b/cpp/tests/community/mg_ecg_test.cpp @@ -182,12 +182,6 @@ TEST_P(Tests_MGEcg_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGEcg_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGEcg_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/community/mg_edge_triangle_count_test.cpp b/cpp/tests/community/mg_edge_triangle_count_test.cpp index 89bdf870ccd..5f00d4bbc5c 100644 --- a/cpp/tests/community/mg_edge_triangle_count_test.cpp +++ b/cpp/tests/community/mg_edge_triangle_count_test.cpp @@ -206,13 +206,6 @@ TEST_P(Tests_MGEdgeTriangleCount_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGEdgeTriangleCount_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGEdgeTriangleCount_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/community/mg_egonet_test.cu b/cpp/tests/community/mg_egonet_test.cu index ac363df3ec5..130e01e8df9 100644 --- a/cpp/tests/community/mg_egonet_test.cu +++ b/cpp/tests/community/mg_egonet_test.cu @@ -268,12 +268,6 @@ TEST_P(Tests_MGEgonet_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGEgonet_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGEgonet_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/community/mg_k_truss_test.cpp b/cpp/tests/community/mg_k_truss_test.cpp index a1624949007..d3463e73a6f 100644 --- a/cpp/tests/community/mg_k_truss_test.cpp +++ b/cpp/tests/community/mg_k_truss_test.cpp @@ -241,13 +241,6 @@ TEST_P(Tests_MGKTruss_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGKTruss_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGKTruss_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/community/mg_leiden_test.cpp b/cpp/tests/community/mg_leiden_test.cpp index 65f4827ba06..6949ac8d170 100644 --- a/cpp/tests/community/mg_leiden_test.cpp +++ b/cpp/tests/community/mg_leiden_test.cpp @@ -214,12 +214,6 @@ TEST_P(Tests_MGLeiden_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGLeiden_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGLeiden_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/community/mg_louvain_test.cpp b/cpp/tests/community/mg_louvain_test.cpp index 106ad2562f7..4aebd26c256 100644 --- a/cpp/tests/community/mg_louvain_test.cpp +++ b/cpp/tests/community/mg_louvain_test.cpp @@ -252,12 +252,6 @@ TEST_P(Tests_MGLouvain_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGLouvain_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGLouvain_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/community/mg_triangle_count_test.cpp b/cpp/tests/community/mg_triangle_count_test.cpp index 932ff5050f1..b541933ca4d 100644 --- a/cpp/tests/community/mg_triangle_count_test.cpp +++ b/cpp/tests/community/mg_triangle_count_test.cpp @@ -246,13 +246,6 @@ TEST_P(Tests_MGTriangleCount_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTriangleCount_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTriangleCount_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/community/mg_weighted_matching_test.cpp b/cpp/tests/community/mg_weighted_matching_test.cpp index 5a150bbc1f7..4e57450ace7 100644 --- a/cpp/tests/community/mg_weighted_matching_test.cpp +++ b/cpp/tests/community/mg_weighted_matching_test.cpp @@ -188,12 +188,6 @@ TEST_P(Tests_MGWeightedMatching_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGWeightedMatching_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGWeightedMatching_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -206,12 +200,6 @@ TEST_P(Tests_MGWeightedMatching_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGWeightedMatching_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGWeightedMatching_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/community/triangle_count_test.cpp b/cpp/tests/community/triangle_count_test.cpp index b4f4b87943a..c35ab4e6f4d 100644 --- a/cpp/tests/community/triangle_count_test.cpp +++ b/cpp/tests/community/triangle_count_test.cpp @@ -263,11 +263,6 @@ TEST_P(Tests_TriangleCount_Rmat, CheckInt32Int32) run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_TriangleCount_File, CheckInt32Int64) -{ - run_current_test(override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_TriangleCount_Rmat, CheckInt64Int64) { run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); diff --git a/cpp/tests/community/weighted_matching_test.cpp b/cpp/tests/community/weighted_matching_test.cpp index 436273c3be3..ddaa85a14db 100644 --- a/cpp/tests/community/weighted_matching_test.cpp +++ b/cpp/tests/community/weighted_matching_test.cpp @@ -123,12 +123,6 @@ TEST_P(Tests_SGWeightedMatching_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGWeightedMatching_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGWeightedMatching_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -141,12 +135,6 @@ TEST_P(Tests_SGWeightedMatching_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGWeightedMatching_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGWeightedMatching_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/components/mg_mis_test.cu b/cpp/tests/components/mg_mis_test.cu index 9c50be3fa28..0696a6a1db1 100644 --- a/cpp/tests/components/mg_mis_test.cu +++ b/cpp/tests/components/mg_mis_test.cu @@ -213,12 +213,6 @@ TEST_P(Tests_MGMaximalIndependentSet_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGMaximalIndependentSet_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGMaximalIndependentSet_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -231,12 +225,6 @@ TEST_P(Tests_MGMaximalIndependentSet_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGMaximalIndependentSet_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGMaximalIndependentSet_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/components/mg_vertex_coloring_test.cu b/cpp/tests/components/mg_vertex_coloring_test.cu index 14e15df502f..17327e35c97 100644 --- a/cpp/tests/components/mg_vertex_coloring_test.cu +++ b/cpp/tests/components/mg_vertex_coloring_test.cu @@ -214,12 +214,6 @@ TEST_P(Tests_MGGraphColoring_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGGraphColoring_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGGraphColoring_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -232,12 +226,6 @@ TEST_P(Tests_MGGraphColoring_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGGraphColoring_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGGraphColoring_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/components/mg_weakly_connected_components_test.cpp b/cpp/tests/components/mg_weakly_connected_components_test.cpp index 368fea68877..bb3bc826a71 100644 --- a/cpp/tests/components/mg_weakly_connected_components_test.cpp +++ b/cpp/tests/components/mg_weakly_connected_components_test.cpp @@ -195,13 +195,6 @@ TEST_P(Tests_MGWeaklyConnectedComponents_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGWeaklyConnectedComponents_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGWeaklyConnectedComponents_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/components/mis_test.cu b/cpp/tests/components/mis_test.cu index f98aa1fe0c7..d7871f32082 100644 --- a/cpp/tests/components/mis_test.cu +++ b/cpp/tests/components/mis_test.cu @@ -179,12 +179,6 @@ TEST_P(Tests_SGMaximalIndependentSet_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGMaximalIndependentSet_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGMaximalIndependentSet_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -197,12 +191,6 @@ TEST_P(Tests_SGMaximalIndependentSet_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGMaximalIndependentSet_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGMaximalIndependentSet_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/components/vertex_coloring_test.cu b/cpp/tests/components/vertex_coloring_test.cu index c7c37c6ad56..fed64f272d7 100644 --- a/cpp/tests/components/vertex_coloring_test.cu +++ b/cpp/tests/components/vertex_coloring_test.cu @@ -182,12 +182,6 @@ TEST_P(Tests_SGGraphColoring_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGGraphColoring_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGGraphColoring_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -200,12 +194,6 @@ TEST_P(Tests_SGGraphColoring_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGGraphColoring_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGGraphColoring_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/components/weakly_connected_components_test.cpp b/cpp/tests/components/weakly_connected_components_test.cpp index 7b909c6f594..db8eeefe511 100644 --- a/cpp/tests/components/weakly_connected_components_test.cpp +++ b/cpp/tests/components/weakly_connected_components_test.cpp @@ -213,13 +213,6 @@ TEST_P(Tests_WeaklyConnectedComponents_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_WeaklyConnectedComponents_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_WeaklyConnectedComponents_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/cores/core_number_test.cpp b/cpp/tests/cores/core_number_test.cpp index ca0174202c2..937bdb95241 100644 --- a/cpp/tests/cores/core_number_test.cpp +++ b/cpp/tests/cores/core_number_test.cpp @@ -331,13 +331,6 @@ TEST_P(Tests_CoreNumber_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_CoreNumber_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_CoreNumber_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/cores/k_core_test.cpp b/cpp/tests/cores/k_core_test.cpp index 064b7862842..5dbafe206dc 100644 --- a/cpp/tests/cores/k_core_test.cpp +++ b/cpp/tests/cores/k_core_test.cpp @@ -134,11 +134,6 @@ TEST_P(Tests_KCore_Rmat, CheckInt32Int32) run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_KCore_Rmat, CheckInt32Int64) -{ - run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_KCore_Rmat, CheckInt64Int64) { run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); diff --git a/cpp/tests/cores/k_core_validate.cu b/cpp/tests/cores/k_core_validate.cu index 53c97dd466b..4645af95a91 100644 --- a/cpp/tests/cores/k_core_validate.cu +++ b/cpp/tests/cores/k_core_validate.cu @@ -99,16 +99,6 @@ template void check_correctness( std::optional>> const& subgraph, size_t k); -template void check_correctness( - raft::handle_t const& handle, - graph_view_t const& graph_view, - std::optional> edge_weight_view, - rmm::device_uvector const& core_numbers, - std::tuple, - rmm::device_uvector, - std::optional>> const& subgraph, - size_t k); - template void check_correctness( raft::handle_t const& handle, graph_view_t const& graph_view, diff --git a/cpp/tests/cores/mg_core_number_test.cpp b/cpp/tests/cores/mg_core_number_test.cpp index f8294d81fdf..f6b73be7b09 100644 --- a/cpp/tests/cores/mg_core_number_test.cpp +++ b/cpp/tests/cores/mg_core_number_test.cpp @@ -205,13 +205,6 @@ TEST_P(Tests_MGCoreNumber_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCoreNumber_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCoreNumber_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/cores/mg_k_core_test.cpp b/cpp/tests/cores/mg_k_core_test.cpp index 28bc445bda8..8ebbff6f5a4 100644 --- a/cpp/tests/cores/mg_k_core_test.cpp +++ b/cpp/tests/cores/mg_k_core_test.cpp @@ -208,11 +208,6 @@ TEST_P(Tests_MGKCore_Rmat, CheckInt32Int32) run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGKCore_Rmat, CheckInt32Int64) -{ - run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGKCore_Rmat, CheckInt64Int64) { run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); diff --git a/cpp/tests/link_analysis/hits_test.cpp b/cpp/tests/link_analysis/hits_test.cpp index 89bc0ca34c5..0017f4652ba 100644 --- a/cpp/tests/link_analysis/hits_test.cpp +++ b/cpp/tests/link_analysis/hits_test.cpp @@ -316,12 +316,6 @@ TEST_P(Tests_Hits_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_Hits_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_Hits_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/link_analysis/mg_hits_test.cpp b/cpp/tests/link_analysis/mg_hits_test.cpp index 8a13204a5aa..eb2a9bcd721 100644 --- a/cpp/tests/link_analysis/mg_hits_test.cpp +++ b/cpp/tests/link_analysis/mg_hits_test.cpp @@ -266,13 +266,6 @@ TEST_P(Tests_MGHits_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGHits_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGHits_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/link_analysis/mg_pagerank_test.cpp b/cpp/tests/link_analysis/mg_pagerank_test.cpp index a9e3a10b2ae..f6ca6b03192 100644 --- a/cpp/tests/link_analysis/mg_pagerank_test.cpp +++ b/cpp/tests/link_analysis/mg_pagerank_test.cpp @@ -283,13 +283,6 @@ TEST_P(Tests_MGPageRank_Rmat, CheckInt32Int32FloatFloat) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPageRank_Rmat, CheckInt32Int64FloatFloat) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPageRank_Rmat, CheckInt64Int64FloatFloat) { auto param = GetParam(); diff --git a/cpp/tests/link_analysis/pagerank_test.cpp b/cpp/tests/link_analysis/pagerank_test.cpp index 196476d6756..b2bc501218a 100644 --- a/cpp/tests/link_analysis/pagerank_test.cpp +++ b/cpp/tests/link_analysis/pagerank_test.cpp @@ -369,12 +369,6 @@ TEST_P(Tests_PageRank_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_PageRank_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_PageRank_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/link_prediction/mg_similarity_test.cpp b/cpp/tests/link_prediction/mg_similarity_test.cpp index 3bcabb6b6df..302248fe516 100644 --- a/cpp/tests/link_prediction/mg_similarity_test.cpp +++ b/cpp/tests/link_prediction/mg_similarity_test.cpp @@ -190,13 +190,6 @@ TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int32FloatFloatJaccard) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); } -TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int64FloatFloatJaccard) -{ - auto param = GetParam(); - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); -} - TEST_P(Tests_MGSimilarity_Rmat, CheckInt64Int64FloatFloatJaccard) { auto param = GetParam(); @@ -216,12 +209,6 @@ TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int32FloatSorensen) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); } -TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int64FloatSorensen) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); -} - TEST_P(Tests_MGSimilarity_Rmat, CheckInt64Int64FloatSorensen) { run_current_test( @@ -240,12 +227,6 @@ TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int32FloatOverlap) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); } -TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int64FloatOverlap) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); -} - TEST_P(Tests_MGSimilarity_Rmat, CheckInt64Int64FloatOverlap) { run_current_test( @@ -266,13 +247,6 @@ TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int32FloatFloatCosine) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); } -TEST_P(Tests_MGSimilarity_Rmat, CheckInt32Int64FloatFloatCosine) -{ - auto param = GetParam(); - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); -} - TEST_P(Tests_MGSimilarity_Rmat, CheckInt64Int64FloatFloatCosine) { auto param = GetParam(); diff --git a/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp b/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp index 730a3ac8f08..2076d4ff79e 100644 --- a/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp +++ b/cpp/tests/link_prediction/mg_weighted_similarity_test.cpp @@ -200,13 +200,6 @@ TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int32FloatFloatJaccard) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); } -TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int64FloatFloatJaccard) -{ - auto param = GetParam(); - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); -} - TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt64Int64FloatFloatJaccard) { auto param = GetParam(); @@ -226,12 +219,6 @@ TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int32FloatSorensen) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); } -TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int64FloatSorensen) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); -} - TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt64Int64FloatSorensen) { run_current_test( @@ -250,12 +237,6 @@ TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int32FloatOverlap) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); } -TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int64FloatOverlap) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); -} - TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt64Int64FloatOverlap) { run_current_test( @@ -276,13 +257,6 @@ TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int32FloatFloatCosine) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); } -TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt32Int64FloatFloatCosine) -{ - auto param = GetParam(); - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); -} - TEST_P(Tests_MGWeightedSimilarity_Rmat, CheckInt64Int64FloatFloatCosine) { auto param = GetParam(); diff --git a/cpp/tests/link_prediction/similarity_test.cu b/cpp/tests/link_prediction/similarity_test.cu index 5547c4bd0c0..ec6db102830 100644 --- a/cpp/tests/link_prediction/similarity_test.cu +++ b/cpp/tests/link_prediction/similarity_test.cu @@ -223,12 +223,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatJaccard) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatJaccard) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatJaccard) { run_current_test( @@ -247,12 +241,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatSorensen) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatSorensen) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatSorensen) { run_current_test( @@ -271,12 +259,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatOverlap) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatOverlap) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatOverlap) { run_current_test( @@ -295,12 +277,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatCosine) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatCosine) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatCosine) { run_current_test( diff --git a/cpp/tests/link_prediction/weighted_similarity_test.cpp b/cpp/tests/link_prediction/weighted_similarity_test.cpp index 2450e7d6376..cfd1171eedb 100644 --- a/cpp/tests/link_prediction/weighted_similarity_test.cpp +++ b/cpp/tests/link_prediction/weighted_similarity_test.cpp @@ -233,12 +233,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatJaccard) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatJaccard) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_jaccard_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatJaccard) { run_current_test( @@ -257,12 +251,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatSorensen) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatSorensen) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_sorensen_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatSorensen) { run_current_test( @@ -281,12 +269,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatOverlap) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatOverlap) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_overlap_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatOverlap) { run_current_test( @@ -305,12 +287,6 @@ TEST_P(Tests_Similarity_Rmat, CheckInt32Int32FloatCosine) override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); } -TEST_P(Tests_Similarity_Rmat, CheckInt32Int64FloatCosine) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam()), cugraph::test::test_cosine_t{}); -} - TEST_P(Tests_Similarity_Rmat, CheckInt64Int64FloatCosine) { run_current_test( diff --git a/cpp/tests/lookup/lookup_src_dst_test.cpp b/cpp/tests/lookup/lookup_src_dst_test.cpp index 87f4958f740..5f23af6dfa3 100644 --- a/cpp/tests/lookup/lookup_src_dst_test.cpp +++ b/cpp/tests/lookup/lookup_src_dst_test.cpp @@ -250,12 +250,6 @@ TEST_P(Tests_SGLookupEdgeSrcDst_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGLookupEdgeSrcDst_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGLookupEdgeSrcDst_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -268,12 +262,6 @@ TEST_P(Tests_SGLookupEdgeSrcDst_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SGLookupEdgeSrcDst_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SGLookupEdgeSrcDst_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/lookup/mg_lookup_src_dst_test.cpp b/cpp/tests/lookup/mg_lookup_src_dst_test.cpp index 8d31b0ca157..7136f620919 100644 --- a/cpp/tests/lookup/mg_lookup_src_dst_test.cpp +++ b/cpp/tests/lookup/mg_lookup_src_dst_test.cpp @@ -293,12 +293,6 @@ TEST_P(Tests_MGLookupEdgeSrcDst_File, CheckInt32Int32FloatFloat) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGLookupEdgeSrcDst_File, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGLookupEdgeSrcDst_File, CheckInt64Int64FloatFloat) { run_current_test( @@ -311,12 +305,6 @@ TEST_P(Tests_MGLookupEdgeSrcDst_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGLookupEdgeSrcDst_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGLookupEdgeSrcDst_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/prims/mg_count_if_e.cu b/cpp/tests/prims/mg_count_if_e.cu index 88494132ac7..63a785fb182 100644 --- a/cpp/tests/prims/mg_count_if_e.cu +++ b/cpp/tests/prims/mg_count_if_e.cu @@ -212,14 +212,6 @@ TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int32FloatTupleIntFloatTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { auto param = GetParam(); @@ -243,14 +235,6 @@ TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int32FloatTupleIntFloatTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { auto param = GetParam(); @@ -273,14 +257,6 @@ TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int32FloatTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfE_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -303,14 +279,6 @@ TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int32FloatTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfE_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfE_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_count_if_v.cu b/cpp/tests/prims/mg_count_if_v.cu index 19ec285109c..0d399f52acd 100644 --- a/cpp/tests/prims/mg_count_if_v.cu +++ b/cpp/tests/prims/mg_count_if_v.cu @@ -168,13 +168,6 @@ TEST_P(Tests_MGCountIfV_Rmat, CheckInt32Int32FloatTransposeFalse) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfV_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfV_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -195,13 +188,6 @@ TEST_P(Tests_MGCountIfV_Rmat, CheckInt32Int32FloatTransposeTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountIfV_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountIfV_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_extract_transform_e.cu b/cpp/tests/prims/mg_extract_transform_e.cu index e45f10c3175..d3d6524cbdb 100644 --- a/cpp/tests/prims/mg_extract_transform_e.cu +++ b/cpp/tests/prims/mg_extract_transform_e.cu @@ -334,20 +334,6 @@ TEST_P(Tests_MGExtractTransformE_Rmat, CheckInt32Int32FloatInt32TupleFloatInt32) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGExtractTransformE_File, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test(std::get<0>(param), std::get<1>(param)); -} - -TEST_P(Tests_MGExtractTransformE_Rmat, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGExtractTransformE_File, CheckInt64Int64FloatInt32Int32) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu b/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu index 03f64e422c9..a8393d84e43 100644 --- a/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu +++ b/cpp/tests/prims/mg_extract_transform_v_frontier_outgoing_e.cu @@ -435,21 +435,6 @@ TEST_P(Tests_MGExtractTransformVFrontierOutgoingE_Rmat, CheckInt32Int32FloatInt3 cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGExtractTransformVFrontierOutgoingE_File, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test(std::get<0>(param), - std::get<1>(param)); -} - -TEST_P(Tests_MGExtractTransformVFrontierOutgoingE_Rmat, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGExtractTransformVFrontierOutgoingE_File, CheckInt64Int64FloatInt32Int32) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu index 4025d4d1b1d..48c308746f1 100644 --- a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu +++ b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_intersection.cu @@ -291,14 +291,6 @@ TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt32Int32Float) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu index 8af187554e1..4e12cf608cb 100644 --- a/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu +++ b/cpp/tests/prims/mg_per_v_pair_transform_dst_nbr_weighted_intersection.cu @@ -337,14 +337,6 @@ TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt32Int32Float) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVPairTransformDstNbrIntersection_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu b/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu index f698701eb08..386fce24a87 100644 --- a/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu +++ b/cpp/tests/prims/mg_per_v_random_select_transform_outgoing_e.cu @@ -565,14 +565,6 @@ TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt32Int32FloatTupl cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt32Int64FloatTupleIntFloat) -{ - auto param = GetParam(); - run_current_test>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt64Int64FloatTupleIntFloat) { auto param = GetParam(); @@ -595,14 +587,6 @@ TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt32Int32Float) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVRandomSelectTransformOutgoingE_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_per_v_transform_reduce_dst_key_aggregated_outgoing_e.cu b/cpp/tests/prims/mg_per_v_transform_reduce_dst_key_aggregated_outgoing_e.cu index e08baa610e5..3dd256544b4 100644 --- a/cpp/tests/prims/mg_per_v_transform_reduce_dst_key_aggregated_outgoing_e.cu +++ b/cpp/tests/prims/mg_per_v_transform_reduce_dst_key_aggregated_outgoing_e.cu @@ -513,15 +513,6 @@ TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, - CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { @@ -547,15 +538,6 @@ TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, - CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceDstKeyAggregatedOutgoingE_Rmat, CheckInt64Int64FloatTransposeFalse) { diff --git a/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu b/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu index eb350ddb435..41830b3017c 100644 --- a/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu +++ b/cpp/tests/prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu @@ -494,15 +494,6 @@ TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, - CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { @@ -529,15 +520,6 @@ TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, - CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { @@ -561,14 +543,6 @@ TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt32Int32FloatTr cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -591,14 +565,6 @@ TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt32Int32FloatTr cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGPerVTransformReduceIncomingOutgoingE_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_reduce_v.cu b/cpp/tests/prims/mg_reduce_v.cu index 0f53adcc71c..ebd557da004 100644 --- a/cpp/tests/prims/mg_reduce_v.cu +++ b/cpp/tests/prims/mg_reduce_v.cu @@ -270,13 +270,6 @@ TEST_P(Tests_MGReduceV_Rmat, CheckInt32Int32FloatTransposeFalse) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGReduceV_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGReduceV_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -297,13 +290,6 @@ TEST_P(Tests_MGReduceV_Rmat, CheckInt32Int32FloatTransposeTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGReduceV_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGReduceV_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_e.cu b/cpp/tests/prims/mg_transform_e.cu index 2f131b4d54f..3984c7cd86b 100644 --- a/cpp/tests/prims/mg_transform_e.cu +++ b/cpp/tests/prims/mg_transform_e.cu @@ -278,14 +278,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatTupleIntFloatTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { auto param = GetParam(); @@ -309,14 +301,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatTupleIntFloatTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { auto param = GetParam(); @@ -339,14 +323,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatIntTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatIntTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatIntTransposeFalse) { auto param = GetParam(); @@ -369,14 +345,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatIntTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatIntTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatIntTransposeTrue) { auto param = GetParam(); @@ -399,14 +367,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatBoolTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatBoolTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatBoolTransposeFalse) { auto param = GetParam(); @@ -429,14 +389,6 @@ TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int32FloatBoolTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformE_Rmat, CheckInt32Int64FloatBoolTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformE_Rmat, CheckInt64Int64FloatBoolTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cu b/cpp/tests/prims/mg_transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cu index 8eee3d5a6d5..cb86a96d78b 100644 --- a/cpp/tests/prims/mg_transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cu +++ b/cpp/tests/prims/mg_transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cu @@ -246,14 +246,6 @@ TEST_P(Tests_MGTransformReduceDstNbrIntersectionOfEEndpointsByV_Rmat, CheckInt32 cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceDstNbrIntersectionOfEEndpointsByV_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceDstNbrIntersectionOfEEndpointsByV_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_reduce_e.cu b/cpp/tests/prims/mg_transform_reduce_e.cu index ff8bd42f1ad..e290f05e9e4 100644 --- a/cpp/tests/prims/mg_transform_reduce_e.cu +++ b/cpp/tests/prims/mg_transform_reduce_e.cu @@ -228,14 +228,6 @@ TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int32FloatTupleIntFloatTranspose cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { auto param = GetParam(); @@ -259,14 +251,6 @@ TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int32FloatTupleIntFloatTranspose cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { auto param = GetParam(); @@ -289,14 +273,6 @@ TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int32FloatTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -319,14 +295,6 @@ TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int32FloatTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceE_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_reduce_e_by_src_dst_key.cu b/cpp/tests/prims/mg_transform_reduce_e_by_src_dst_key.cu index c7bb51e3635..b050e314a15 100644 --- a/cpp/tests/prims/mg_transform_reduce_e_by_src_dst_key.cu +++ b/cpp/tests/prims/mg_transform_reduce_e_by_src_dst_key.cu @@ -354,14 +354,6 @@ TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int32FloatTupleIntFlo cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { auto param = GetParam(); @@ -385,14 +377,6 @@ TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int32FloatTupleIntFlo cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { auto param = GetParam(); @@ -415,14 +399,6 @@ TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int32FloatTransposeFa cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -445,14 +421,6 @@ TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int32FloatTransposeTr cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceEBySrcDstKey_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_reduce_v.cu b/cpp/tests/prims/mg_transform_reduce_v.cu index 9e9bee89d67..1e5cb7207b1 100644 --- a/cpp/tests/prims/mg_transform_reduce_v.cu +++ b/cpp/tests/prims/mg_transform_reduce_v.cu @@ -246,14 +246,6 @@ TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int32FloatTupleIntFloatTranspose cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test, false>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeFalse) { auto param = GetParam(); @@ -277,14 +269,6 @@ TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int32FloatTupleIntFloatTranspose cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int64FloatTupleIntFloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test, true>( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt64Int64FloatTupleIntFloatTransposeTrue) { auto param = GetParam(); @@ -307,14 +291,6 @@ TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int32FloatTransposeFalse) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); @@ -337,14 +313,6 @@ TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int32FloatTransposeTrue) cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceV_Rmat, CheckInt64Int64FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_src_dst.cu b/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_src_dst.cu index 5947dd9a560..9b7e24856fe 100644 --- a/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_src_dst.cu +++ b/cpp/tests/prims/mg_transform_reduce_v_frontier_outgoing_e_by_src_dst.cu @@ -688,21 +688,6 @@ TEST_P(Tests_MGTransformReduceVFrontierOutgoingEBySrcDst_Rmat, cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransformReduceVFrontierOutgoingEBySrcDst_File, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test(std::get<0>(param), - std::get<1>(param)); -} - -TEST_P(Tests_MGTransformReduceVFrontierOutgoingEBySrcDst_Rmat, CheckInt32Int64FloatInt32Int32) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), - cugraph::test::override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransformReduceVFrontierOutgoingEBySrcDst_File, CheckInt64Int64FloatInt32Int32) { auto param = GetParam(); diff --git a/cpp/tests/sampling/biased_neighbor_sampling.cpp b/cpp/tests/sampling/biased_neighbor_sampling.cpp index 0b7307bef7d..6e63d18383e 100644 --- a/cpp/tests/sampling/biased_neighbor_sampling.cpp +++ b/cpp/tests/sampling/biased_neighbor_sampling.cpp @@ -223,13 +223,6 @@ TEST_P(Tests_Biased_Neighbor_Sampling_File, CheckInt32Int32Float) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_Biased_Neighbor_Sampling_File, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_Biased_Neighbor_Sampling_File, CheckInt64Int64Float) { auto param = GetParam(); @@ -243,12 +236,6 @@ TEST_P(Tests_Biased_Neighbor_Sampling_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_Biased_Neighbor_Sampling_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_Biased_Neighbor_Sampling_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/sampling/mg_biased_neighbor_sampling.cpp b/cpp/tests/sampling/mg_biased_neighbor_sampling.cpp index 8f08320aac8..d39e1725b63 100644 --- a/cpp/tests/sampling/mg_biased_neighbor_sampling.cpp +++ b/cpp/tests/sampling/mg_biased_neighbor_sampling.cpp @@ -298,12 +298,6 @@ TEST_P(Tests_MGBiased_Neighbor_Sampling_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGBiased_Neighbor_Sampling_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGBiased_Neighbor_Sampling_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp index 23f1da40cf4..0dd63e4fb06 100644 --- a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp +++ b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp @@ -320,12 +320,6 @@ TEST_P(Tests_MGUniform_Neighbor_Sampling_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGUniform_Neighbor_Sampling_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGUniform_Neighbor_Sampling_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/sampling/negative_sampling.cpp b/cpp/tests/sampling/negative_sampling.cpp index ba929c63e9b..8906d011376 100644 --- a/cpp/tests/sampling/negative_sampling.cpp +++ b/cpp/tests/sampling/negative_sampling.cpp @@ -213,18 +213,12 @@ class Tests_Negative_Sampling : public ::testing::TestWithParam using Tests_Negative_Sampling_File_i32_i32_float = Tests_Negative_Sampling; -using Tests_Negative_Sampling_File_i32_i64_float = - Tests_Negative_Sampling; - using Tests_Negative_Sampling_File_i64_i64_float = Tests_Negative_Sampling; using Tests_Negative_Sampling_Rmat_i32_i32_float = Tests_Negative_Sampling; -using Tests_Negative_Sampling_Rmat_i32_i64_float = - Tests_Negative_Sampling; - using Tests_Negative_Sampling_Rmat_i64_i64_float = Tests_Negative_Sampling; @@ -255,12 +249,6 @@ TEST_P(Tests_Negative_Sampling_File_i32_i32_float, CheckInt32Int32Float) run_all_tests(this); } -TEST_P(Tests_Negative_Sampling_File_i32_i64_float, CheckInt32Int64Float) -{ - load_graph(override_File_Usecase_with_cmd_line_arguments(GetParam())); - run_all_tests(this); -} - TEST_P(Tests_Negative_Sampling_File_i64_i64_float, CheckInt64Int64Float) { load_graph(override_File_Usecase_with_cmd_line_arguments(GetParam())); @@ -273,12 +261,6 @@ TEST_P(Tests_Negative_Sampling_Rmat_i32_i32_float, CheckInt32Int32Float) run_all_tests(this); } -TEST_P(Tests_Negative_Sampling_Rmat_i32_i64_float, CheckInt32Int64Float) -{ - load_graph(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); - run_all_tests(this); -} - TEST_P(Tests_Negative_Sampling_Rmat_i64_i64_float, CheckInt64Int64Float) { load_graph(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); @@ -297,18 +279,6 @@ INSTANTIATE_TEST_SUITE_P( cugraph::test::File_Usecase("test/datasets/ljournal-2008.mtx"), cugraph::test::File_Usecase("test/datasets/webbase-1M.mtx"))); -INSTANTIATE_TEST_SUITE_P( - file_test, - Tests_Negative_Sampling_File_i32_i64_float, - ::testing::Values(cugraph::test::File_Usecase("test/datasets/karate.mtx"))); - -INSTANTIATE_TEST_SUITE_P( - file_large_test, - Tests_Negative_Sampling_File_i32_i64_float, - ::testing::Values(cugraph::test::File_Usecase("test/datasets/web-Google.mtx"), - cugraph::test::File_Usecase("test/datasets/ljournal-2008.mtx"), - cugraph::test::File_Usecase("test/datasets/webbase-1M.mtx"))); - INSTANTIATE_TEST_SUITE_P( file_test, Tests_Negative_Sampling_File_i64_i64_float, @@ -326,11 +296,6 @@ INSTANTIATE_TEST_SUITE_P( Tests_Negative_Sampling_Rmat_i32_i32_float, ::testing::Values(cugraph::test::Rmat_Usecase(10, 16, 0.57, 0.19, 0.19, 0, false, false, 0))); -INSTANTIATE_TEST_SUITE_P( - rmat_small_test, - Tests_Negative_Sampling_Rmat_i32_i64_float, - ::testing::Values(cugraph::test::Rmat_Usecase(10, 16, 0.57, 0.19, 0.19, 0, false, false, 0))); - INSTANTIATE_TEST_SUITE_P( rmat_small_test, Tests_Negative_Sampling_Rmat_i64_i64_float, diff --git a/cpp/tests/sampling/sampling_heterogeneous_post_processing_test.cpp b/cpp/tests/sampling/sampling_heterogeneous_post_processing_test.cpp index 2b2049dc8db..4d58bfc31e6 100644 --- a/cpp/tests/sampling/sampling_heterogeneous_post_processing_test.cpp +++ b/cpp/tests/sampling/sampling_heterogeneous_post_processing_test.cpp @@ -578,11 +578,6 @@ TEST_P(Tests_SamplingHeterogeneousPostProcessing_Rmat, CheckInt32Int32) run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SamplingHeterogeneousPostProcessing_Rmat, CheckInt32Int64) -{ - run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SamplingHeterogeneousPostProcessing_Rmat, CheckInt64Int64) { run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); diff --git a/cpp/tests/sampling/sampling_post_processing_test.cpp b/cpp/tests/sampling/sampling_post_processing_test.cpp index b262794d26d..c1b99b99b0a 100644 --- a/cpp/tests/sampling/sampling_post_processing_test.cpp +++ b/cpp/tests/sampling/sampling_post_processing_test.cpp @@ -896,11 +896,6 @@ TEST_P(Tests_SamplingPostProcessing_Rmat, CheckInt32Int32) run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_SamplingPostProcessing_Rmat, CheckInt32Int64) -{ - run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_SamplingPostProcessing_Rmat, CheckInt64Int64) { run_current_test(override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); diff --git a/cpp/tests/sampling/uniform_neighbor_sampling.cpp b/cpp/tests/sampling/uniform_neighbor_sampling.cpp index e348780e14b..87524b03acf 100644 --- a/cpp/tests/sampling/uniform_neighbor_sampling.cpp +++ b/cpp/tests/sampling/uniform_neighbor_sampling.cpp @@ -240,12 +240,6 @@ TEST_P(Tests_Uniform_Neighbor_Sampling_File, CheckInt32Int32Float) override_File_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_Uniform_Neighbor_Sampling_File, CheckInt32Int64Float) -{ - run_current_test( - override_File_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_Uniform_Neighbor_Sampling_File, CheckInt64Int64Float) { run_current_test( @@ -258,12 +252,6 @@ TEST_P(Tests_Uniform_Neighbor_Sampling_Rmat, CheckInt32Int32Float) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_Uniform_Neighbor_Sampling_Rmat, CheckInt32Int64Float) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_Uniform_Neighbor_Sampling_Rmat, CheckInt64Int64Float) { run_current_test( diff --git a/cpp/tests/structure/coarsen_graph_test.cpp b/cpp/tests/structure/coarsen_graph_test.cpp index 9225156f7f3..417dd4f3e05 100644 --- a/cpp/tests/structure/coarsen_graph_test.cpp +++ b/cpp/tests/structure/coarsen_graph_test.cpp @@ -366,18 +366,6 @@ TEST_P(Tests_CoarsenGraph_Rmat, CheckInt32Int32FloatTransposeTrue) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_CoarsenGraph_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - -TEST_P(Tests_CoarsenGraph_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_CoarsenGraph_Rmat, CheckInt64Int64FloatTransposeFalse) { run_current_test( diff --git a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp index 0055ee1315e..178909037b1 100644 --- a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp +++ b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp @@ -177,13 +177,6 @@ TEST_P(Tests_CountSelfLoopsAndMultiEdges_Rmat, CheckInt32Int32FloatTransposeFals std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_CountSelfLoopsAndMultiEdges_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_CountSelfLoopsAndMultiEdges_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp b/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp index 322d7915504..9c2576cfe6c 100644 --- a/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp +++ b/cpp/tests/structure/has_edge_and_compute_multiplicity_test.cpp @@ -223,13 +223,6 @@ TEST_P(Tests_HasEdgeAndComputeMultiplicity_Rmat, CheckInt32Int32FloatTransposeFa std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_HasEdgeAndComputeMultiplicity_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_HasEdgeAndComputeMultiplicity_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_coarsen_graph_test.cpp b/cpp/tests/structure/mg_coarsen_graph_test.cpp index 471773d71bd..deb4c287183 100644 --- a/cpp/tests/structure/mg_coarsen_graph_test.cpp +++ b/cpp/tests/structure/mg_coarsen_graph_test.cpp @@ -436,20 +436,6 @@ TEST_P(Tests_MGCoarsenGraph_Rmat, CheckInt32Int32FloatTransposeFalse) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCoarsenGraph_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_MGCoarsenGraph_Rmat, CheckInt64Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCoarsenGraph_File, CheckInt32Int32FloatTransposeTrue) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp index 61f40049e31..8b78e16c404 100644 --- a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp +++ b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp @@ -180,13 +180,6 @@ TEST_P(Tests_MGCountSelfLoopsAndMultiEdges_Rmat, CheckInt32Int32FloatTransposeFa std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGCountSelfLoopsAndMultiEdges_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGCountSelfLoopsAndMultiEdges_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp b/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp index b8ad06dd18b..9da8dfeb595 100644 --- a/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp +++ b/cpp/tests/structure/mg_has_edge_and_compute_multiplicity_test.cpp @@ -278,13 +278,6 @@ TEST_P(Tests_MGHasEdgeAndComputeMultiplicity_Rmat, CheckInt32Int32FloatTranspose std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGHasEdgeAndComputeMultiplicity_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGHasEdgeAndComputeMultiplicity_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_induced_subgraph_test.cu b/cpp/tests/structure/mg_induced_subgraph_test.cu index fd636e8c4c9..2958686c945 100644 --- a/cpp/tests/structure/mg_induced_subgraph_test.cu +++ b/cpp/tests/structure/mg_induced_subgraph_test.cu @@ -288,12 +288,6 @@ TEST_P(Tests_MGInducedSubgraph_Rmat, CheckInt32Int32) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGInducedSubgraph_Rmat, CheckInt32Int64) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGInducedSubgraph_Rmat, CheckInt64Int64) { run_current_test( diff --git a/cpp/tests/structure/mg_select_random_vertices_test.cpp b/cpp/tests/structure/mg_select_random_vertices_test.cpp index a33e2ca1813..d59bb8e0f63 100644 --- a/cpp/tests/structure/mg_select_random_vertices_test.cpp +++ b/cpp/tests/structure/mg_select_random_vertices_test.cpp @@ -225,12 +225,6 @@ TEST_P(Tests_MGSelectRandomVertices_Rmat, CheckInt32Int32FloatFloat) override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); } -TEST_P(Tests_MGSelectRandomVertices_Rmat, CheckInt32Int64FloatFloat) -{ - run_current_test( - override_Rmat_Usecase_with_cmd_line_arguments(GetParam())); -} - TEST_P(Tests_MGSelectRandomVertices_Rmat, CheckInt64Int64FloatFloat) { run_current_test( diff --git a/cpp/tests/structure/mg_symmetrize_test.cpp b/cpp/tests/structure/mg_symmetrize_test.cpp index 7d83b482ccf..ebdec278db1 100644 --- a/cpp/tests/structure/mg_symmetrize_test.cpp +++ b/cpp/tests/structure/mg_symmetrize_test.cpp @@ -262,20 +262,6 @@ TEST_P(Tests_MGSymmetrize_Rmat, CheckInt32Int32FloatTransposedTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGSymmetrize_Rmat, CheckInt32Int64FloatTransposedFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_MGSymmetrize_Rmat, CheckInt32Int64FloatTransposedTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGSymmetrize_Rmat, CheckInt64Int64FloatTransposedFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_transpose_storage_test.cpp b/cpp/tests/structure/mg_transpose_storage_test.cpp index c43561a4251..41c50b396fb 100644 --- a/cpp/tests/structure/mg_transpose_storage_test.cpp +++ b/cpp/tests/structure/mg_transpose_storage_test.cpp @@ -261,20 +261,6 @@ TEST_P(Tests_MGTransposeStorage_Rmat, CheckInt32Int32FloatTransposeStoragedTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTransposeStorage_Rmat, CheckInt32Int64FloatTransposeStoragedFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_MGTransposeStorage_Rmat, CheckInt32Int64FloatTransposeStoragedTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTransposeStorage_Rmat, CheckInt64Int64FloatTransposeStoragedFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/mg_transpose_test.cpp b/cpp/tests/structure/mg_transpose_test.cpp index a1a816e6f4b..28f5c000d3d 100644 --- a/cpp/tests/structure/mg_transpose_test.cpp +++ b/cpp/tests/structure/mg_transpose_test.cpp @@ -257,20 +257,6 @@ TEST_P(Tests_MGTranspose_Rmat, CheckInt32Int32FloatTransposedTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGTranspose_Rmat, CheckInt32Int64FloatTransposedFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_MGTranspose_Rmat, CheckInt32Int64FloatTransposedTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGTranspose_Rmat, CheckInt64Int64FloatTransposedFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/symmetrize_test.cpp b/cpp/tests/structure/symmetrize_test.cpp index bf5e28e472f..5c9d76df117 100644 --- a/cpp/tests/structure/symmetrize_test.cpp +++ b/cpp/tests/structure/symmetrize_test.cpp @@ -434,20 +434,6 @@ TEST_P(Tests_Symmetrize_Rmat, CheckInt32Int32FloatTransposeTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_Symmetrize_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_Symmetrize_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_Symmetrize_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/transpose_storage_test.cpp b/cpp/tests/structure/transpose_storage_test.cpp index d14f975b382..86c58fbe6b8 100644 --- a/cpp/tests/structure/transpose_storage_test.cpp +++ b/cpp/tests/structure/transpose_storage_test.cpp @@ -214,20 +214,6 @@ TEST_P(Tests_TransposeStorage_Rmat, CheckInt32Int32FloatTransposeTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_TransposeStorage_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_TransposeStorage_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_TransposeStorage_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/transpose_test.cpp b/cpp/tests/structure/transpose_test.cpp index 4b666d72814..e8c3b31f932 100644 --- a/cpp/tests/structure/transpose_test.cpp +++ b/cpp/tests/structure/transpose_test.cpp @@ -198,20 +198,6 @@ TEST_P(Tests_Transpose_Rmat, CheckInt32Int32FloatTransposeTrue) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_Transpose_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - -TEST_P(Tests_Transpose_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_Transpose_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = GetParam(); diff --git a/cpp/tests/structure/weight_sum_test.cpp b/cpp/tests/structure/weight_sum_test.cpp index 6f600e69431..5affd93073b 100644 --- a/cpp/tests/structure/weight_sum_test.cpp +++ b/cpp/tests/structure/weight_sum_test.cpp @@ -217,18 +217,6 @@ TEST_P(Tests_WeightSum_Rmat, CheckInt32Int32FloatTransposeTrue) run_current_test(std::get<0>(param), std::get<1>(param)); } -TEST_P(Tests_WeightSum_Rmat, CheckInt32Int64FloatTransposeFalse) -{ - auto param = override_Rmat_Usecase_with_cmd_line_arguments(GetParam()); - run_current_test(std::get<0>(param), std::get<1>(param)); -} - -TEST_P(Tests_WeightSum_Rmat, CheckInt32Int64FloatTransposeTrue) -{ - auto param = override_Rmat_Usecase_with_cmd_line_arguments(GetParam()); - run_current_test(std::get<0>(param), std::get<1>(param)); -} - TEST_P(Tests_WeightSum_Rmat, CheckInt64Int64FloatTransposeFalse) { auto param = override_Rmat_Usecase_with_cmd_line_arguments(GetParam()); diff --git a/cpp/tests/traversal/bfs_test.cpp b/cpp/tests/traversal/bfs_test.cpp index c5041378d78..b17b9aee66b 100644 --- a/cpp/tests/traversal/bfs_test.cpp +++ b/cpp/tests/traversal/bfs_test.cpp @@ -275,13 +275,6 @@ TEST_P(Tests_BFS_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_BFS_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_BFS_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/extract_bfs_paths_test.cu b/cpp/tests/traversal/extract_bfs_paths_test.cu index 89f87503494..62b654df233 100644 --- a/cpp/tests/traversal/extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/extract_bfs_paths_test.cu @@ -215,13 +215,6 @@ TEST_P(Tests_ExtractBfsPaths_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_ExtractBfsPaths_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_ExtractBfsPaths_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/k_hop_nbrs_test.cpp b/cpp/tests/traversal/k_hop_nbrs_test.cpp index e385f05b0c7..326921552db 100644 --- a/cpp/tests/traversal/k_hop_nbrs_test.cpp +++ b/cpp/tests/traversal/k_hop_nbrs_test.cpp @@ -256,13 +256,6 @@ TEST_P(Tests_KHopNbrs_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_KHopNbrs_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_KHopNbrs_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/traversal/mg_bfs_test.cpp index c294c6d0091..4d4b83e275b 100644 --- a/cpp/tests/traversal/mg_bfs_test.cpp +++ b/cpp/tests/traversal/mg_bfs_test.cpp @@ -294,13 +294,6 @@ TEST_P(Tests_MGBFS_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGBFS_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGBFS_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu index 476a6ffab8f..1ef5c282c1c 100644 --- a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu +++ b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu @@ -298,13 +298,6 @@ TEST_P(Tests_MGExtractBFSPaths_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGExtractBFSPaths_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGExtractBFSPaths_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp b/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp index 311d1f55b9c..4e4b7d38ccd 100644 --- a/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp +++ b/cpp/tests/traversal/mg_k_hop_nbrs_test.cpp @@ -254,13 +254,6 @@ TEST_P(Tests_MGKHopNbrs_Rmat, CheckInt32Int32) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGKHopNbrs_Rmat, CheckInt32Int64) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGKHopNbrs_Rmat, CheckInt64Int64) { auto param = GetParam(); diff --git a/cpp/tests/traversal/mg_sssp_test.cpp b/cpp/tests/traversal/mg_sssp_test.cpp index 9ad16d1c947..bc3f5870f6c 100644 --- a/cpp/tests/traversal/mg_sssp_test.cpp +++ b/cpp/tests/traversal/mg_sssp_test.cpp @@ -285,13 +285,6 @@ TEST_P(Tests_MGSSSP_Rmat, CheckInt32Int32Float) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_MGSSSP_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_MGSSSP_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/traversal/od_shortest_distances_test.cpp b/cpp/tests/traversal/od_shortest_distances_test.cpp index fe9fe99e784..aba85e2b425 100644 --- a/cpp/tests/traversal/od_shortest_distances_test.cpp +++ b/cpp/tests/traversal/od_shortest_distances_test.cpp @@ -235,13 +235,6 @@ TEST_P(Tests_ODShortestDistances_Rmat, CheckInt32Int32Float) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_ODShortestDistances_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_ODShortestDistances_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/traversal/sssp_test.cpp b/cpp/tests/traversal/sssp_test.cpp index 3eff1a8e106..9180ec94da5 100644 --- a/cpp/tests/traversal/sssp_test.cpp +++ b/cpp/tests/traversal/sssp_test.cpp @@ -271,13 +271,6 @@ TEST_P(Tests_SSSP_Rmat, CheckInt32Int32Float) std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); } -TEST_P(Tests_SSSP_Rmat, CheckInt32Int64Float) -{ - auto param = GetParam(); - run_current_test( - std::get<0>(param), override_Rmat_Usecase_with_cmd_line_arguments(std::get<1>(param))); -} - TEST_P(Tests_SSSP_Rmat, CheckInt64Int64Float) { auto param = GetParam(); diff --git a/cpp/tests/utilities/conversion_utilities_mg.cu b/cpp/tests/utilities/conversion_utilities_mg.cu index cb4703ec89b..6c5db5b6c57 100644 --- a/cpp/tests/utilities/conversion_utilities_mg.cu +++ b/cpp/tests/utilities/conversion_utilities_mg.cu @@ -25,13 +25,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -46,13 +39,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -67,13 +53,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -88,13 +67,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -111,15 +83,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -138,15 +101,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -165,15 +119,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -192,15 +137,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -217,13 +153,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -238,13 +167,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -259,13 +181,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -280,13 +195,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -301,13 +209,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -322,13 +223,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -343,13 +237,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -364,13 +251,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -391,19 +271,6 @@ mg_graph_to_sg_graph( std::optional> renumber_map, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional, int64_t>>, - std::optional>> -mg_graph_to_sg_graph( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> renumber_map, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, float>>, @@ -430,19 +297,6 @@ mg_graph_to_sg_graph( std::optional> renumber_map, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional, int64_t>>, - std::optional>> -mg_graph_to_sg_graph( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> renumber_map, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, double>>, @@ -469,19 +323,6 @@ mg_graph_to_sg_graph( std::optional> renumber_map, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional, int64_t>>, - std::optional>> -mg_graph_to_sg_graph( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> renumber_map, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, float>>, @@ -508,19 +349,6 @@ mg_graph_to_sg_graph( std::optional> renumber_map, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional, int64_t>>, - std::optional>> -mg_graph_to_sg_graph( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> edge_id_view, - std::optional> renumber_map, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, double>>, diff --git a/cpp/tests/utilities/conversion_utilities_sg.cu b/cpp/tests/utilities/conversion_utilities_sg.cu index 450594807d1..c97881b895a 100644 --- a/cpp/tests/utilities/conversion_utilities_sg.cu +++ b/cpp/tests/utilities/conversion_utilities_sg.cu @@ -25,13 +25,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -46,13 +39,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -67,13 +53,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -88,13 +67,6 @@ graph_to_host_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_coo( raft::handle_t const& handle, @@ -111,15 +83,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -138,15 +101,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -165,15 +119,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -192,15 +137,6 @@ graph_to_device_coo( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, - rmm::device_uvector, - std::optional>> -graph_to_device_coo( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, rmm::device_uvector, std::optional>> @@ -217,13 +153,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -238,13 +167,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -259,13 +181,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -280,13 +195,6 @@ graph_to_host_csr( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csr( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csr( raft::handle_t const& handle, @@ -301,13 +209,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -322,13 +223,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -343,13 +237,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, @@ -364,13 +251,6 @@ graph_to_host_csc( std::optional> edge_weight_view, std::optional> renumber_map); -template std::tuple, std::vector, std::optional>> -graph_to_host_csc( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template std::tuple, std::vector, std::optional>> graph_to_host_csc( raft::handle_t const& handle, diff --git a/cpp/tests/utilities/csv_file_utilities.cu b/cpp/tests/utilities/csv_file_utilities.cu index 08b1e37af8a..e7be9ff3133 100644 --- a/cpp/tests/utilities/csv_file_utilities.cu +++ b/cpp/tests/utilities/csv_file_utilities.cu @@ -406,86 +406,6 @@ read_graph_from_csv_file( bool test_weighted, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_csv_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, float>>, diff --git a/cpp/tests/utilities/debug_utilities_mg.cpp b/cpp/tests/utilities/debug_utilities_mg.cpp index 3423189a8ad..e160976d648 100644 --- a/cpp/tests/utilities/debug_utilities_mg.cpp +++ b/cpp/tests/utilities/debug_utilities_mg.cpp @@ -30,18 +30,6 @@ template void print_edges( std::optional> edge_weight_view, std::optional> renumber_map); -template void print_edges( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - -template void print_edges( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template void print_edges( raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, diff --git a/cpp/tests/utilities/debug_utilities_sg.cpp b/cpp/tests/utilities/debug_utilities_sg.cpp index 622943b3c08..a5984c92397 100644 --- a/cpp/tests/utilities/debug_utilities_sg.cpp +++ b/cpp/tests/utilities/debug_utilities_sg.cpp @@ -30,18 +30,6 @@ template void print_edges( std::optional> edge_weight_view, std::optional> renumber_map); -template void print_edges( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - -template void print_edges( - raft::handle_t const& handle, - cugraph::graph_view_t const& graph_view, - std::optional> edge_weight_view, - std::optional> renumber_map); - template void print_edges( raft::handle_t const& handle, cugraph::graph_view_t const& graph_view, diff --git a/cpp/tests/utilities/matrix_market_file_utilities.cu b/cpp/tests/utilities/matrix_market_file_utilities.cu index 302533113ee..1ca31a1ee6b 100644 --- a/cpp/tests/utilities/matrix_market_file_utilities.cu +++ b/cpp/tests/utilities/matrix_market_file_utilities.cu @@ -567,86 +567,6 @@ read_graph_from_matrix_market_file( bool test_weighted, bool renumber); -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, float>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - -template std::tuple< - cugraph::graph_t, - std::optional, double>>, - std::optional>> -read_graph_from_matrix_market_file( - raft::handle_t const& handle, - std::string const& graph_file_full_path, - bool test_weighted, - bool renumber); - template std::tuple< cugraph::graph_t, std::optional, float>>, diff --git a/cpp/tests/utilities/property_generator_utilities_mg.cu b/cpp/tests/utilities/property_generator_utilities_mg.cu index f283050dca8..cd208684bec 100644 --- a/cpp/tests/utilities/property_generator_utilities_mg.cu +++ b/cpp/tests/utilities/property_generator_utilities_mg.cu @@ -30,18 +30,6 @@ template struct generate, in template struct generate, thrust::tuple>; -template struct generate, bool>; -template struct generate, int32_t>; -template struct generate, int64_t>; -template struct generate, - thrust::tuple>; - -template struct generate, bool>; -template struct generate, int32_t>; -template struct generate, int64_t>; -template struct generate, - thrust::tuple>; - template struct generate, bool>; template struct generate, int32_t>; template struct generate, int64_t>; diff --git a/cpp/tests/utilities/property_generator_utilities_sg.cu b/cpp/tests/utilities/property_generator_utilities_sg.cu index dd1907a9f1d..e824dc2b5d2 100644 --- a/cpp/tests/utilities/property_generator_utilities_sg.cu +++ b/cpp/tests/utilities/property_generator_utilities_sg.cu @@ -30,18 +30,6 @@ template struct generate, i template struct generate, thrust::tuple>; -template struct generate, bool>; -template struct generate, int32_t>; -template struct generate, int64_t>; -template struct generate, - thrust::tuple>; - -template struct generate, bool>; -template struct generate, int32_t>; -template struct generate, int64_t>; -template struct generate, - thrust::tuple>; - template struct generate, bool>; template struct generate, int32_t>; template struct generate, int64_t>; From 27f8ce1d8c1e4a24e3b15e12fea7a43e5f7566b8 Mon Sep 17 00:00:00 2001 From: Alex Barghi <105237337+alexbarghi-nv@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:40:20 -0400 Subject: [PATCH 03/14] [FEA] Support Edge ID Lookup in PyLibcuGraph (#4687) Support Edge ID lookup in `pylibcugraph`. Also fixes some bugs in the C API (i.e. lookup table not being cleaned up correctly, container being incorrectly dereferenced as graph). Verified in rapidsai/cugraph-gnn#50 Authors: - Alex Barghi (https://github.com/alexbarghi-nv) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Seunghwa Kang (https://github.com/seunghwak) - Rick Ratzel (https://github.com/rlratzel) URL: https://github.com/rapidsai/cugraph/pull/4687 --- cpp/include/cugraph_c/lookup_src_dst.h | 8 ++ cpp/src/c_api/lookup_src_dst.cpp | 45 ++++--- .../pylibcugraph/pylibcugraph/CMakeLists.txt | 1 + python/pylibcugraph/pylibcugraph/__init__.py | 2 + .../_cugraph_c/lookup_src_dst.pxd | 2 + .../pylibcugraph/edge_id_lookup_table.pxd | 34 ++++++ .../pylibcugraph/edge_id_lookup_table.pyx | 114 ++++++++++++++++++ .../internal_types/CMakeLists.txt | 1 + .../internal_types/edge_id_lookup_result.pxd | 30 +++++ .../internal_types/edge_id_lookup_result.pyx | 63 ++++++++++ .../pylibcugraph/tests/test_lookup_table.py | 80 ++++++++++++ 11 files changed, 364 insertions(+), 16 deletions(-) create mode 100644 python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pxd create mode 100644 python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pyx create mode 100644 python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pxd create mode 100644 python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pyx create mode 100644 python/pylibcugraph/pylibcugraph/tests/test_lookup_table.py diff --git a/cpp/include/cugraph_c/lookup_src_dst.h b/cpp/include/cugraph_c/lookup_src_dst.h index f4d63572e82..64051743981 100644 --- a/cpp/include/cugraph_c/lookup_src_dst.h +++ b/cpp/include/cugraph_c/lookup_src_dst.h @@ -136,6 +136,14 @@ cugraph_type_erased_device_array_view_t* cugraph_lookup_result_get_dsts( */ void cugraph_lookup_result_free(cugraph_lookup_result_t* result); +/** + * @ingroup samplingC + * @brief Free a sampling lookup map + * + * @param [in] container The sampling lookup map (a.k.a. container). + */ +void cugraph_lookup_container_free(cugraph_lookup_container_t* container); + #ifdef __cplusplus } #endif diff --git a/cpp/src/c_api/lookup_src_dst.cpp b/cpp/src/c_api/lookup_src_dst.cpp index 1be2137ef2f..3b87791ac50 100644 --- a/cpp/src/c_api/lookup_src_dst.cpp +++ b/cpp/src/c_api/lookup_src_dst.cpp @@ -307,23 +307,26 @@ extern "C" cugraph_error_code_t cugraph_lookup_endpoints_from_edge_ids_and_types { CAPI_EXPECTS( reinterpret_cast(graph)->vertex_type_ == - reinterpret_cast(lookup_container)->vertex_type_, + reinterpret_cast(lookup_container) + ->vertex_type_, CUGRAPH_INVALID_INPUT, "vertex type of graph and lookup_container must match", *error); CAPI_EXPECTS( reinterpret_cast(graph)->edge_type_ == - reinterpret_cast(lookup_container)->edge_type_, + reinterpret_cast(lookup_container) + ->edge_type_, CUGRAPH_INVALID_INPUT, "edge type of graph and lookup_container must match", *error); - CAPI_EXPECTS(reinterpret_cast(graph)->edge_type_id_type_ == - reinterpret_cast(lookup_container) - ->edge_type_id_type_, - CUGRAPH_INVALID_INPUT, - "edge type id type of graph and lookup_container must match", - *error); + CAPI_EXPECTS( + reinterpret_cast(graph)->edge_type_id_type_ == + reinterpret_cast(lookup_container) + ->edge_type_id_type_, + CUGRAPH_INVALID_INPUT, + "edge type id type of graph and lookup_container must match", + *error); lookup_using_edge_ids_and_types_functor functor( handle, graph, lookup_container, edge_ids_to_lookup, edge_types_to_lookup); @@ -341,23 +344,26 @@ extern "C" cugraph_error_code_t cugraph_lookup_endpoints_from_edge_ids_and_singl { CAPI_EXPECTS( reinterpret_cast(graph)->vertex_type_ == - reinterpret_cast(lookup_container)->vertex_type_, + reinterpret_cast(lookup_container) + ->vertex_type_, CUGRAPH_INVALID_INPUT, "vertex type of graph and lookup_container must match", *error); CAPI_EXPECTS( reinterpret_cast(graph)->edge_type_ == - reinterpret_cast(lookup_container)->edge_type_, + reinterpret_cast(lookup_container) + ->edge_type_, CUGRAPH_INVALID_INPUT, "edge type of graph and lookup_container must match", *error); - CAPI_EXPECTS(reinterpret_cast(graph)->edge_type_id_type_ == - reinterpret_cast(lookup_container) - ->edge_type_id_type_, - CUGRAPH_INVALID_INPUT, - "edge type id type of graph and lookup_container must match", - *error); + CAPI_EXPECTS( + reinterpret_cast(graph)->edge_type_id_type_ == + reinterpret_cast(lookup_container) + ->edge_type_id_type_, + CUGRAPH_INVALID_INPUT, + "edge type id type of graph and lookup_container must match", + *error); lookup_using_edge_ids_of_single_type_functor functor( handle, graph, lookup_container, edge_ids_to_lookup, edge_type_to_lookup); @@ -387,3 +393,10 @@ extern "C" void cugraph_lookup_result_free(cugraph_lookup_result_t* result) delete internal_pointer->dsts_; delete internal_pointer; } + +extern "C" void cugraph_lookup_container_free(cugraph_lookup_container_t* container) +{ + auto internal_ptr = reinterpret_cast(container); + // The graph should presumably own the other structures. + delete internal_ptr; +} diff --git a/python/pylibcugraph/pylibcugraph/CMakeLists.txt b/python/pylibcugraph/pylibcugraph/CMakeLists.txt index 9f1b9924336..3a53c7d16c3 100644 --- a/python/pylibcugraph/pylibcugraph/CMakeLists.txt +++ b/python/pylibcugraph/pylibcugraph/CMakeLists.txt @@ -65,6 +65,7 @@ set(cython_sources all_pairs_sorensen_coefficients.pyx all_pairs_overlap_coefficients.pyx all_pairs_cosine_coefficients.pyx + edge_id_lookup_table.pyx ) set(linked_libraries cugraph::cugraph;cugraph::cugraph_c) diff --git a/python/pylibcugraph/pylibcugraph/__init__.py b/python/pylibcugraph/pylibcugraph/__init__.py index 26fa3f64ddd..9c04a528fd8 100644 --- a/python/pylibcugraph/pylibcugraph/__init__.py +++ b/python/pylibcugraph/pylibcugraph/__init__.py @@ -21,6 +21,8 @@ from pylibcugraph.graph_properties import GraphProperties +from pylibcugraph.edge_id_lookup_table import EdgeIdLookupTable + from pylibcugraph.eigenvector_centrality import eigenvector_centrality from pylibcugraph.katz_centrality import katz_centrality diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd index 710ca7d113b..e8a2bbf47ae 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd @@ -70,3 +70,5 @@ cdef extern from "cugraph_c/lookup_src_dst.h": const cugraph_lookup_result_t* result) cdef void cugraph_lookup_result_free(cugraph_lookup_result_t* result) + + cdef void cugraph_lookup_container_free(cugraph_lookup_container_t* container) diff --git a/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pxd b/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pxd new file mode 100644 index 00000000000..9bbd19963a7 --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pxd @@ -0,0 +1,34 @@ +# Copyright (c) 2024, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Have cython use python 3 syntax +# cython: language_level = 3 + +from pylibcugraph._cugraph_c.error cimport ( + cugraph_error_code_t, + cugraph_error_t, +) +from pylibcugraph._cugraph_c.lookup_src_dst cimport ( + cugraph_lookup_container_t, +) +from pylibcugraph.resource_handle cimport ( + ResourceHandle, +) +from pylibcugraph.graphs cimport ( + _GPUGraph, +) + +cdef class EdgeIdLookupTable: + cdef ResourceHandle handle, + cdef _GPUGraph graph, + cdef cugraph_lookup_container_t* lookup_container_c_ptr diff --git a/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pyx b/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pyx new file mode 100644 index 00000000000..49ccdbdd168 --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/edge_id_lookup_table.pyx @@ -0,0 +1,114 @@ +# Copyright (c) 2024, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Have cython use python 3 syntax +# cython: language_level = 3 + +from pylibcugraph._cugraph_c.resource_handle cimport ( + cugraph_resource_handle_t, +) +from pylibcugraph._cugraph_c.error cimport ( + cugraph_error_code_t, + cugraph_error_t, +) +from pylibcugraph._cugraph_c.array cimport ( + cugraph_type_erased_device_array_view_t, + cugraph_type_erased_device_array_view_create, + cugraph_type_erased_device_array_view_free, + cugraph_type_erased_host_array_view_t, + cugraph_type_erased_host_array_view_create, + cugraph_type_erased_host_array_view_free, +) +from pylibcugraph._cugraph_c.graph cimport ( + cugraph_graph_t, +) +from pylibcugraph._cugraph_c.lookup_src_dst cimport ( + cugraph_lookup_container_t, + cugraph_build_edge_id_and_type_to_src_dst_lookup_map, + cugraph_lookup_container_free, + cugraph_lookup_endpoints_from_edge_ids_and_single_type, + cugraph_lookup_result_t, +) +from pylibcugraph.utils cimport ( + assert_success, + assert_CAI_type, + assert_AI_type, + get_c_type_from_numpy_type, + create_cugraph_type_erased_device_array_view_from_py_obj +) +from pylibcugraph.resource_handle cimport ( + ResourceHandle, +) +from pylibcugraph.graphs cimport ( + _GPUGraph, +) +from pylibcugraph.internal_types.edge_id_lookup_result cimport ( + EdgeIdLookupResult, +) + +cdef class EdgeIdLookupTable: + def __cinit__(self, ResourceHandle resource_handle, _GPUGraph graph): + self.handle = resource_handle + self.graph = graph + + cdef cugraph_error_code_t error_code + cdef cugraph_error_t* error_ptr + + error_code = cugraph_build_edge_id_and_type_to_src_dst_lookup_map( + self.handle.c_resource_handle_ptr, + self.graph.c_graph_ptr, + &self.lookup_container_c_ptr, + &error_ptr, + ) + + assert_success(error_code, error_ptr, "cugraph_build_edge_id_and_type_to_src_dst_lookup_map") + + def __dealloc__(self): + if self.lookup_container_c_ptr is not NULL: + cugraph_lookup_container_free(self.lookup_container_c_ptr) + + def lookup_vertex_ids( + self, + edge_ids, + int edge_type + ): + """ + For a single edge type, finds the source and destination vertex ids corresponding + to the provided edge ids. + """ + + cdef cugraph_error_code_t error_code + cdef cugraph_error_t* error_ptr + cdef cugraph_lookup_result_t* result_ptr + + cdef cugraph_type_erased_device_array_view_t* edge_ids_c_ptr + edge_ids_c_ptr = create_cugraph_type_erased_device_array_view_from_py_obj(edge_ids) + + error_code = cugraph_lookup_endpoints_from_edge_ids_and_single_type( + self.handle.c_resource_handle_ptr, + self.graph.c_graph_ptr, + self.lookup_container_c_ptr, + edge_ids_c_ptr, + edge_type, + &result_ptr, + &error_ptr, + ) + + assert_success(error_code, error_ptr, "cugraph_lookup_endpoints_from_edge_ids_and_single_type") + + lr = EdgeIdLookupResult() + lr.set_ptr((result_ptr)) + return { + 'sources': lr.get_sources(), + 'destinations': lr.get_destinations(), + } diff --git a/python/pylibcugraph/pylibcugraph/internal_types/CMakeLists.txt b/python/pylibcugraph/pylibcugraph/internal_types/CMakeLists.txt index 22f07939db0..1b0d6ec71a4 100644 --- a/python/pylibcugraph/pylibcugraph/internal_types/CMakeLists.txt +++ b/python/pylibcugraph/pylibcugraph/internal_types/CMakeLists.txt @@ -15,6 +15,7 @@ set(cython_sources sampling_result.pyx coo.pyx + edge_id_lookup_result.pyx ) set(linked_libraries cugraph::cugraph;cugraph::cugraph_c) diff --git a/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pxd b/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pxd new file mode 100644 index 00000000000..68dd2362a00 --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pxd @@ -0,0 +1,30 @@ +# Copyright (c) 2024, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Have cython use python 3 syntax +# cython: language_level = 3 + + +from pylibcugraph._cugraph_c.lookup_src_dst cimport ( + cugraph_lookup_result_t +) +from pylibcugraph._cugraph_c.array cimport ( + cugraph_type_erased_device_array_view_t, +) + +cdef class EdgeIdLookupResult: + cdef cugraph_lookup_result_t* result_c_ptr + + cdef get_array(self, cugraph_type_erased_device_array_view_t* ptr) + + cdef set_ptr(self, cugraph_lookup_result_t* ptr) diff --git a/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pyx b/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pyx new file mode 100644 index 00000000000..5f7165ce988 --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/internal_types/edge_id_lookup_result.pyx @@ -0,0 +1,63 @@ +# Copyright (c) 2024, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Have cython use python 3 syntax +# cython: language_level = 3 + +from pylibcugraph._cugraph_c.lookup_src_dst cimport ( + cugraph_lookup_result_t, + cugraph_lookup_result_free, + cugraph_lookup_result_get_dsts, + cugraph_lookup_result_get_srcs, +) +from pylibcugraph._cugraph_c.array cimport ( + cugraph_type_erased_device_array_view_t, +) +from pylibcugraph.utils cimport ( + create_cupy_array_view_for_device_ptr, +) + +cdef class EdgeIdLookupResult: + def __cinit__(self): + """ + Sets this object as the owner of the given pointer. + """ + self.result_c_ptr = NULL + + cdef set_ptr(self, cugraph_lookup_result_t* ptr): + self.result_c_ptr = ptr + + def __dealloc__(self): + if self.result_c_ptr is not NULL: + cugraph_lookup_result_free(self.result_c_ptr) + + cdef get_array(self, cugraph_type_erased_device_array_view_t* ptr): + if ptr is NULL: + return None + + return create_cupy_array_view_for_device_ptr( + ptr, + self, + ) + + def get_sources(self): + if self.result_c_ptr is NULL: + return None + cdef cugraph_type_erased_device_array_view_t* ptr = cugraph_lookup_result_get_srcs(self.result_c_ptr) + return self.get_array(ptr) + + def get_destinations(self): + if self.result_c_ptr is NULL: + return None + cdef cugraph_type_erased_device_array_view_t* ptr = cugraph_lookup_result_get_dsts(self.result_c_ptr) + return self.get_array(ptr) diff --git a/python/pylibcugraph/pylibcugraph/tests/test_lookup_table.py b/python/pylibcugraph/pylibcugraph/tests/test_lookup_table.py new file mode 100644 index 00000000000..2910a5f8d4d --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/tests/test_lookup_table.py @@ -0,0 +1,80 @@ +# Copyright (c) 2024, 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import cupy + +from pylibcugraph import ( + SGGraph, + ResourceHandle, + GraphProperties, + EdgeIdLookupTable, +) + + +# ============================================================================= +# Pytest fixtures +# ============================================================================= +# fixtures used in this test module are defined in conftest.py + + +# ============================================================================= +# Tests +# ============================================================================= + + +def test_lookup_table(): + # Vertex id array + vtcs = cupy.arange(6, dtype="int64") + + # Edge ids are unique per edge type and start from 0 + # Each edge type has the same src/dst vertex type here, + # just as it would in a GNN application. + srcs = cupy.array([0, 1, 5, 4, 3, 2, 2, 0, 5, 4, 4, 5]) + dsts = cupy.array([1, 5, 0, 3, 2, 1, 3, 3, 2, 3, 1, 4]) + etps = cupy.array([0, 2, 6, 7, 4, 3, 4, 1, 7, 7, 6, 8], dtype="int32") + eids = cupy.array([0, 0, 0, 0, 0, 0, 1, 0, 1, 2, 1, 0]) + + wgts = cupy.ones((len(srcs),), dtype="float32") + + graph = SGGraph( + resource_handle=ResourceHandle(), + graph_properties=GraphProperties(is_symmetric=False, is_multigraph=True), + src_or_offset_array=srcs, + dst_or_index_array=dsts, + vertices_array=vtcs, + weight_array=wgts, + edge_id_array=eids, + edge_type_array=etps, + store_transposed=False, + renumber=False, + do_expensive_check=True, + ) + + table = EdgeIdLookupTable(ResourceHandle(), graph) + + assert table is not None + + found_edges = table.lookup_vertex_ids(cupy.array([0, 1, 2, 3, 4]), 7) + assert (found_edges["sources"] == cupy.array([4, 5, 4, -1, -1])).all() + assert (found_edges["destinations"] == cupy.array([3, 2, 3, -1, -1])).all() + + found_edges = table.lookup_vertex_ids(cupy.array([0]), 5) + assert (found_edges["sources"] == cupy.array([-1])).all() + assert (found_edges["destinations"] == cupy.array([-1])).all() + + found_edges = table.lookup_vertex_ids(cupy.array([3, 1, 0, 5]), 6) + assert (found_edges["sources"] == cupy.array([-1, 4, 5, -1])).all() + assert (found_edges["destinations"] == cupy.array([-1, 1, 0, -1])).all() + + # call __dealloc__() + del table From a9192a8575ee7e79d0b41d59382884cc7dfeabc4 Mon Sep 17 00:00:00 2001 From: Joseph Nke <76006812+jnke2016@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:55:02 +0100 Subject: [PATCH 04/14] Symmetrize edgelist when creating a CSR graph (#4716) This PR allows the edge list to be symmetrized when creating a graph from a CSR representation. closes #4693 Authors: - Joseph Nke (https://github.com/jnke2016) Approvers: - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) URL: https://github.com/rapidsai/cugraph/pull/4716 --- cpp/src/c_api/graph_sg.cpp | 2 +- .../cugraph/tests/structure/test_graph.py | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp index e7ebbc2d319..e57d6b5bb14 100644 --- a/cpp/src/c_api/graph_sg.cpp +++ b/cpp/src/c_api/graph_sg.cpp @@ -761,7 +761,7 @@ cugraph_error_code_t cugraph_graph_create_sg_from_csr( p_edge_ids, p_edge_type_ids, renumber, - FALSE, // symmetrize + symmetrize, do_expensive_check); try { diff --git a/python/cugraph/cugraph/tests/structure/test_graph.py b/python/cugraph/cugraph/tests/structure/test_graph.py index 48a0b257b12..b3e517100e1 100644 --- a/python/cugraph/cugraph/tests/structure/test_graph.py +++ b/python/cugraph/cugraph/tests/structure/test_graph.py @@ -26,6 +26,7 @@ from cudf.testing import assert_series_equal from cudf.testing.testing import assert_frame_equal from cugraph.structure.symmetrize import symmetrize +from cugraph.datasets import karate_asymmetric # MG import dask_cudf @@ -204,6 +205,37 @@ def test_add_adj_list_to_edge_list(graph_file): compare_series(destinations_cu, destinations_exp) +@pytest.mark.sg +def test_create_undirected_graph_from_asymmetric_adj_list(): + # karate_asymmetric.get_path() + Mnx = utils.read_csv_for_nx(karate_asymmetric.get_path()) + N = max(max(Mnx["0"]), max(Mnx["1"])) + 1 + Mcsr = scipy.sparse.csr_matrix((Mnx.weight, (Mnx["0"], Mnx["1"])), shape=(N, N)) + + offsets = cudf.Series(Mcsr.indptr) + indices = cudf.Series(Mcsr.indices) + + G = cugraph.Graph(directed=False) + + with pytest.raises(Exception): + # Ifan undirected graph is created with 'symmetrize' set to False, the + # edgelist provided by the user must be symmetric. + G.from_cudf_adjlist(offsets, indices, None, symmetrize=False) + + G = cugraph.Graph(directed=False) + G.from_cudf_adjlist(offsets, indices, None, symmetrize=True) + + # FIXME: Since we have no mechanism to access the symmetrized edgelist + # from the graph_view_t, assert that the edgelist size is unchanged. Once + # exposing 'decompress_to_edgelist', ensure that + # G.number_of_edges() == 2 * karate_asymmetric.get_edgelist()? + assert G.number_of_edges() == len(karate_asymmetric.get_edgelist()) + + # FIXME: Once 'decompress_to_edgelist' is exposed to the + # python API, ensure that the derived edgelist is symmetric + # if symmetrize = True. + + # Test @pytest.mark.sg @pytest.mark.parametrize("graph_file", utils.DATASETS) From 201ff7cdb9a0e894b0e41cdaf25b50b61bf83cf9 Mon Sep 17 00:00:00 2001 From: Rick Ratzel <3039903+rlratzel@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:00:13 -0500 Subject: [PATCH 05/14] Updates README with new dataset, removes mention of script no longer used (#4736) This is a doc-only PR which updates the README for nx-cugraph pytest-based benchmarks: * Adds description of a dataset that's being used * Removes mention of script no longer used --- benchmarks/nx-cugraph/pytest-based/README.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/benchmarks/nx-cugraph/pytest-based/README.md b/benchmarks/nx-cugraph/pytest-based/README.md index 5d2406bfcd5..414a22171a0 100644 --- a/benchmarks/nx-cugraph/pytest-based/README.md +++ b/benchmarks/nx-cugraph/pytest-based/README.md @@ -10,6 +10,7 @@ Our current benchmarks provide the following datasets: | -------- | ------- | ------- | ------- | | netscience | 1,461 | 5,484 | Yes | | email-Eu-core | 1,005 | 25,571 | Yes | +| amazon0302 | 262,111 | 1,234,877 | Yes | | cit-Patents | 3,774,768 | 16,518,948 | Yes | | hollywood | 1,139,905 | 57,515,616 | No | | soc-LiveJournal1 | 4,847,571 | 68,993,773 | Yes | @@ -39,16 +40,8 @@ NOTE: ./run-main-benchmarks.sh ``` -#### 2. `get_graph_bench_dataset.py` -This script downloads the specified dataset using `cugraph.datasets`. - -**Usage:** - ```bash - python get_graph_bench_dataset.py [dataset] - ``` - -#### 3. `create_results_summary_page.py` -This script is designed to be run after `run-gap-benchmarks.sh` in order to generate an HTML page displaying a results table comparing default NetworkX to nx-cugraph. The script also provides information about the current system, so it should be run on the machine on which benchmarks were run. +#### 2. `create_results_summary_page.py` +This script is designed to be run after `run-main-benchmarks.sh` in order to generate an HTML page displaying a results table comparing default NetworkX to nx-cugraph. The script also provides information about the current system, so it should be run on the machine on which benchmarks were run. **Usage:** ```bash From 7390ae2f8e25ec65a222c5a868942bb67615624d Mon Sep 17 00:00:00 2001 From: Chuck Hastings <45364586+ChuckHastings@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:16:09 -0400 Subject: [PATCH 06/14] Address Leiden clustering generating too many clusters (#4730) Our implementation of Leiden was generating too many clusters. This was not obvious in smaller graphs, but as the graphs get larger the problem became more noticeable. The Leiden loop was terminating if the modularity stopped improving. But the Leiden algorithm as defined in the paper allows the refinement phase to reduce modularity in order to improve the quality of the clusters. The convergence criteria defined in the paper was based on making no changes on the iteration rather than strictly monitoring modularity change. Updating this criteria results in the Leiden algorithm running more iterations and converging on better answers. Closes #4529 Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Naim (https://github.com/naimnv) - Joseph Nke (https://github.com/jnke2016) - Seunghwa Kang (https://github.com/seunghwak) URL: https://github.com/rapidsai/cugraph/pull/4730 --- cpp/src/community/detail/refine.hpp | 3 +-- cpp/src/community/detail/refine_impl.cuh | 9 +++++-- cpp/src/community/detail/refine_mg_v32_e32.cu | 6 ++--- cpp/src/community/detail/refine_mg_v64_e64.cu | 6 ++--- cpp/src/community/detail/refine_sg_v32_e32.cu | 6 ++--- cpp/src/community/detail/refine_sg_v64_e64.cu | 6 ++--- cpp/src/community/leiden_impl.cuh | 26 ++++++++++++------- 7 files changed, 33 insertions(+), 29 deletions(-) diff --git a/cpp/src/community/detail/refine.hpp b/cpp/src/community/detail/refine.hpp index a60efee887f..429e0e9e6c2 100644 --- a/cpp/src/community/detail/refine.hpp +++ b/cpp/src/community/detail/refine.hpp @@ -46,8 +46,7 @@ refine_clustering( rmm::device_uvector&& next_clusters_v, edge_src_property_t const& src_vertex_weights_cache, edge_src_property_t const& src_clusters_cache, - edge_dst_property_t const& dst_clusters_cache, - bool up_down); + edge_dst_property_t const& dst_clusters_cache); } } // namespace cugraph diff --git a/cpp/src/community/detail/refine_impl.cuh b/cpp/src/community/detail/refine_impl.cuh index 272e3d71f83..62b66ed5f41 100644 --- a/cpp/src/community/detail/refine_impl.cuh +++ b/cpp/src/community/detail/refine_impl.cuh @@ -150,8 +150,7 @@ refine_clustering( edge_src_property_t const& src_louvain_assignment_cache, edge_dst_property_t const& - dst_louvain_assignment_cache, - bool up_down) + dst_louvain_assignment_cache) { const weight_t POSITIVE_GAIN = 1e-6; using vertex_t = typename GraphViewType::vertex_type; @@ -230,6 +229,7 @@ refine_clustering( cugraph::reduce_op::plus{}, weighted_cut_of_vertices_to_louvain.begin()); + // FIXME: Consider using bit mask logic here. Would reduce memory by 8x rmm::device_uvector singleton_and_connected_flags( graph_view.local_vertex_partition_range_size(), handle.get_stream()); @@ -297,6 +297,11 @@ refine_clustering( edge_dst_property_t dst_leiden_assignment_cache(handle); edge_src_property_t src_singleton_and_connected_flag_cache(handle); + // FIXME: Why is kvstore used here? Can't this be accomplished by + // a direct lookup in louvain_assignment_of_vertices using + // leiden - graph_view.local_vertex_partition_range_first() as the + // index? + // Changing this would save memory and time kv_store_t leiden_to_louvain_map( leiden_assignment.begin(), leiden_assignment.end(), diff --git a/cpp/src/community/detail/refine_mg_v32_e32.cu b/cpp/src/community/detail/refine_mg_v32_e32.cu index d27260c1337..ce46a48ed5c 100644 --- a/cpp/src/community/detail/refine_mg_v32_e32.cu +++ b/cpp/src/community/detail/refine_mg_v32_e32.cu @@ -37,8 +37,7 @@ refine_clustering( edge_src_property_t, int32_t> const& src_clusters_cache, edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); template std::tuple, std::pair, rmm::device_uvector>> @@ -59,8 +58,7 @@ refine_clustering( edge_src_property_t, int32_t> const& src_clusters_cache, edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); } // namespace detail } // namespace cugraph diff --git a/cpp/src/community/detail/refine_mg_v64_e64.cu b/cpp/src/community/detail/refine_mg_v64_e64.cu index 1a2ed665b8a..d870f30cd3c 100644 --- a/cpp/src/community/detail/refine_mg_v64_e64.cu +++ b/cpp/src/community/detail/refine_mg_v64_e64.cu @@ -37,8 +37,7 @@ refine_clustering( edge_src_property_t, int64_t> const& src_clusters_cache, edge_dst_property_t, int64_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); template std::tuple, std::pair, rmm::device_uvector>> @@ -59,8 +58,7 @@ refine_clustering( edge_src_property_t, int64_t> const& src_clusters_cache, edge_dst_property_t, int64_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); } // namespace detail } // namespace cugraph diff --git a/cpp/src/community/detail/refine_sg_v32_e32.cu b/cpp/src/community/detail/refine_sg_v32_e32.cu index ac0ede8225d..803a37474d4 100644 --- a/cpp/src/community/detail/refine_sg_v32_e32.cu +++ b/cpp/src/community/detail/refine_sg_v32_e32.cu @@ -37,8 +37,7 @@ refine_clustering( edge_src_property_t, int32_t> const& src_clusters_cache, edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); template std::tuple, std::pair, rmm::device_uvector>> @@ -59,8 +58,7 @@ refine_clustering( edge_src_property_t, int32_t> const& src_clusters_cache, edge_dst_property_t, int32_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); } // namespace detail } // namespace cugraph diff --git a/cpp/src/community/detail/refine_sg_v64_e64.cu b/cpp/src/community/detail/refine_sg_v64_e64.cu index 97ed43b3de0..7b8bc435bc3 100644 --- a/cpp/src/community/detail/refine_sg_v64_e64.cu +++ b/cpp/src/community/detail/refine_sg_v64_e64.cu @@ -37,8 +37,7 @@ refine_clustering( edge_src_property_t, int64_t> const& src_clusters_cache, edge_dst_property_t, int64_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); template std::tuple, std::pair, rmm::device_uvector>> @@ -59,8 +58,7 @@ refine_clustering( edge_src_property_t, int64_t> const& src_clusters_cache, edge_dst_property_t, int64_t> const& - dst_clusters_cache, - bool up_down); + dst_clusters_cache); } // namespace detail } // namespace cugraph diff --git a/cpp/src/community/leiden_impl.cuh b/cpp/src/community/leiden_impl.cuh index da790a5dd66..c3600ff12e0 100644 --- a/cpp/src/community/leiden_impl.cuh +++ b/cpp/src/community/leiden_impl.cuh @@ -102,7 +102,8 @@ std::pair>, weight_t> leiden( HighResTimer hr_timer{}; #endif - weight_t best_modularity = weight_t{-1.0}; + weight_t final_Q{-1}; + weight_t total_edge_weight = compute_total_edge_weight(handle, current_graph_view, *current_edge_weight_view); @@ -368,9 +369,6 @@ std::pair>, weight_t> leiden( detail::timer_stop(handle, hr_timer); #endif - bool terminate = (cur_Q <= best_modularity); - if (!terminate) { best_modularity = cur_Q; } - #ifdef TIMING detail::timer_start(handle, hr_timer, "contract graph"); #endif @@ -386,8 +384,7 @@ std::pair>, weight_t> leiden( auto nr_unique_louvain_clusters = remove_duplicates(handle, copied_louvain_partition); - terminate = - terminate || (nr_unique_louvain_clusters == current_graph_view.number_of_vertices()); + bool terminate = (nr_unique_louvain_clusters == current_graph_view.number_of_vertices()); rmm::device_uvector refined_leiden_partition(0, handle.get_stream()); std::pair, rmm::device_uvector> leiden_to_louvain_map{ @@ -426,11 +423,19 @@ std::pair>, weight_t> leiden( std::move(louvain_assignment_for_vertices), src_vertex_weights_cache, src_louvain_assignment_cache, - dst_louvain_assignment_cache, - up_down); + dst_louvain_assignment_cache); } // Clear buffer and contract the graph + final_Q = detail::compute_modularity(handle, + current_graph_view, + current_edge_weight_view, + src_louvain_assignment_cache, + dst_louvain_assignment_cache, + louvain_assignment_for_vertices, + cluster_weights, + total_edge_weight, + resolution); cluster_keys.resize(0, handle.get_stream()); cluster_weights.resize(0, handle.get_stream()); @@ -445,6 +450,9 @@ std::pair>, weight_t> leiden( dst_louvain_assignment_cache.clear(handle); if (!terminate) { + src_louvain_assignment_cache.clear(handle); + dst_louvain_assignment_cache.clear(handle); + auto nr_unique_leiden = static_cast(leiden_to_louvain_map.first.size()); if (graph_view_t::is_multi_gpu) { nr_unique_leiden = host_scalar_allreduce( @@ -586,7 +594,7 @@ std::pair>, weight_t> leiden( detail::timer_display(handle, hr_timer, std::cout); #endif - return std::make_pair(std::move(dendrogram), best_modularity); + return std::make_pair(std::move(dendrogram), final_Q); } template From f917ae4ad200258f1afb7d2f70ee200828b88479 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 23 Oct 2024 14:49:59 -0500 Subject: [PATCH 07/14] re-run all CI when files in .github/workflows change (#4723) Removes some exclusions left behind in #4634, to ensure that all CI is re-run when files in `.github/workflows` are chagned. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: https://github.com/rapidsai/cugraph/pull/4723 --- .github/workflows/pr.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b0a1308237e..0a33f5488a6 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -55,16 +55,12 @@ jobs: - '!notebooks/**' - '!python/**' - '!readme_pages/**' - # TODO: Remove this before merging - - '!.github/**' test_notebooks: - '**' - '!.devcontainers/**' - '!CONTRIBUTING.md' - '!README.md' - '!docs/**' - # TODO: Remove this before merging - - '!.github/**' test_python: - '**' - '!.devcontainers/**' @@ -73,8 +69,6 @@ jobs: - '!docs/**' - '!img/**' - '!notebooks/**' - # TODO: Remove this before merging - - '!.github/**' checks: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12 From e892fc27c9d14412a67aaa1171be8eeacd266c6b Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Mon, 28 Oct 2024 14:02:10 +0100 Subject: [PATCH 08/14] devcontainer: replace `VAULT_HOST` with `AWS_ROLE_ARN` (#4732) This PR is replacing the `VAULT_HOST` variable with `AWS_ROLE_ARN`. This is required to use the new token service to get AWS credentials. Authors: - Jordan Jacobelli (https://github.com/jjacobelli) Approvers: - Paul Taylor (https://github.com/trxcllnt) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cugraph/pull/4732 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 190003dd7af..9ff575865e3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ ENV PYTHONDONTWRITEBYTECODE="1" ENV SCCACHE_REGION="us-east-2" ENV SCCACHE_BUCKET="rapids-sccache-devs" -ENV VAULT_HOST="https://vault.ops.k8s.rapids.ai" +ENV AWS_ROLE_ARN="arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs" ENV HISTFILE="/home/coder/.cache/._bash_history" # cugraph_pyg's setup.py needs this defined when building in a conda env From 3224a6539fabe6346747bee6a69cd3c8211366aa Mon Sep 17 00:00:00 2001 From: Chuck Hastings <45364586+ChuckHastings@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:07:37 -0400 Subject: [PATCH 09/14] Delete the deprecated data_type_id_t enum (#4737) Prep work for temporal graphs. We renamed `data_type_id_t` to `cugraph_data_id_t` about 8 months ago, this finishes the transition. We also split the types out into their own file in the C API. Marked as breaking since we are deleting a deprecated type from the C API. Authors: - Chuck Hastings (https://github.com/ChuckHastings) - Ralph Liu (https://github.com/nv-rliu) Approvers: - Seunghwa Kang (https://github.com/seunghwak) - Rick Ratzel (https://github.com/rlratzel) URL: https://github.com/rapidsai/cugraph/pull/4737 --- cpp/include/cugraph_c/resource_handle.h | 17 +---- cpp/include/cugraph_c/types.h | 47 ++++++++++++ cpp/src/c_api/array.cpp | 3 +- cpp/tests/c_api/biased_neighbor_sample_test.c | 70 ++++++++--------- cpp/tests/c_api/c_test_utils.h | 10 +-- cpp/tests/c_api/count_multi_edges_test.c | 10 +-- cpp/tests/c_api/create_graph_test.c | 36 ++++----- cpp/tests/c_api/ecg_test.c | 10 +-- cpp/tests/c_api/egonet_test.c | 10 +-- cpp/tests/c_api/induced_subgraph_test.c | 4 +- cpp/tests/c_api/k_core_test.c | 11 +-- cpp/tests/c_api/k_truss_test.c | 10 +-- cpp/tests/c_api/legacy_spectral_test.c | 20 ++--- cpp/tests/c_api/leiden_test.c | 11 +-- cpp/tests/c_api/louvain_test.c | 10 +-- .../c_api/mg_biased_neighbor_sample_test.c | 40 +++++----- cpp/tests/c_api/mg_count_multi_edges_test.c | 10 +-- cpp/tests/c_api/mg_create_graph_test.c | 18 ++--- cpp/tests/c_api/mg_generate_rmat_test.c | 12 +-- cpp/tests/c_api/mg_induced_subgraph_test.c | 6 +- cpp/tests/c_api/mg_k_truss_test.c | 4 +- cpp/tests/c_api/mg_lookup_src_dst_test.c | 10 +-- cpp/tests/c_api/mg_negative_sampling_test.c | 22 +++--- cpp/tests/c_api/mg_pagerank_test.c | 8 +- cpp/tests/c_api/mg_similarity_test.c | 4 +- cpp/tests/c_api/mg_test_utils.cpp | 38 +++++----- cpp/tests/c_api/mg_test_utils.h | 10 +-- .../c_api/mg_uniform_neighbor_sample_test.c | 40 +++++----- cpp/tests/c_api/negative_sampling_test.c | 22 +++--- cpp/tests/c_api/pagerank_test.c | 8 +- cpp/tests/c_api/similarity_test.c | 8 +- cpp/tests/c_api/test_utils.cpp | 22 +++--- .../c_api/uniform_neighbor_sample_test.c | 76 +++++++++---------- .../pylibcugraph/_cugraph_c/algorithms.pxd | 4 +- .../pylibcugraph/_cugraph_c/array.pxd | 20 ++--- .../_cugraph_c/centrality_algorithms.pxd | 4 +- .../_cugraph_c/community_algorithms.pxd | 4 +- .../_cugraph_c/core_algorithms.pxd | 4 +- .../pylibcugraph/_cugraph_c/graph.pxd | 4 +- .../_cugraph_c/graph_functions.pxd | 4 +- .../_cugraph_c/graph_generators.pxd | 6 +- .../_cugraph_c/labeling_algorithms.pxd | 4 +- .../_cugraph_c/lookup_src_dst.pxd | 4 +- .../_cugraph_c/resource_handle.pxd | 18 ----- .../_cugraph_c/sampling_algorithms.pxd | 4 +- .../_cugraph_c/similarity_algorithms.pxd | 4 +- .../pylibcugraph/_cugraph_c/types.pxd | 40 ++++++++++ .../all_pairs_cosine_coefficients.pyx | 4 +- .../all_pairs_jaccard_coefficients.pyx | 4 +- .../all_pairs_overlap_coefficients.pyx | 4 +- .../all_pairs_sorensen_coefficients.pyx | 4 +- .../pylibcugraph/balanced_cut_clustering.pyx | 4 +- .../pylibcugraph/betweenness_centrality.pyx | 4 +- python/pylibcugraph/pylibcugraph/bfs.pyx | 4 +- .../pylibcugraph/biased_neighbor_sample.pyx | 4 +- .../pylibcugraph/pylibcugraph/core_number.pyx | 5 +- .../pylibcugraph/cosine_coefficients.pyx | 4 +- .../pylibcugraph/count_multi_edges.pyx | 5 +- python/pylibcugraph/pylibcugraph/degrees.pyx | 5 +- python/pylibcugraph/pylibcugraph/ecg.pyx | 4 +- .../edge_betweenness_centrality.pyx | 4 +- python/pylibcugraph/pylibcugraph/egonet.pyx | 5 +- .../pylibcugraph/eigenvector_centrality.pyx | 5 +- .../pylibcugraph/generate_rmat_edgelist.pyx | 4 +- .../pylibcugraph/generate_rmat_edgelists.pyx | 4 +- python/pylibcugraph/pylibcugraph/hits.pyx | 5 +- .../pylibcugraph/induced_subgraph.pyx | 4 +- .../pylibcugraph/jaccard_coefficients.pyx | 4 +- python/pylibcugraph/pylibcugraph/k_core.pyx | 4 +- .../pylibcugraph/k_truss_subgraph.pyx | 4 +- .../pylibcugraph/katz_centrality.pyx | 4 +- python/pylibcugraph/pylibcugraph/leiden.pyx | 6 +- python/pylibcugraph/pylibcugraph/louvain.pyx | 6 +- .../pylibcugraph/negative_sampling.pyx | 4 +- python/pylibcugraph/pylibcugraph/node2vec.pyx | 4 +- .../pylibcugraph/overlap_coefficients.pyx | 4 +- python/pylibcugraph/pylibcugraph/pagerank.pyx | 6 +- .../pylibcugraph/personalized_pagerank.pyx | 6 +- .../pylibcugraph/sorensen_coefficients.pyx | 4 +- .../spectral_modularity_maximization.pyx | 4 +- python/pylibcugraph/pylibcugraph/sssp.pyx | 7 +- .../pylibcugraph/triangle_count.pyx | 4 +- .../pylibcugraph/two_hop_neighbors.pyx | 4 +- .../pylibcugraph/uniform_neighbor_sample.pyx | 4 +- python/pylibcugraph/pylibcugraph/utils.pxd | 9 ++- python/pylibcugraph/pylibcugraph/utils.pyx | 30 ++++---- .../weakly_connected_components.pyx | 4 +- 87 files changed, 562 insertions(+), 407 deletions(-) create mode 100644 cpp/include/cugraph_c/types.h create mode 100644 python/pylibcugraph/pylibcugraph/_cugraph_c/types.pxd diff --git a/cpp/include/cugraph_c/resource_handle.h b/cpp/include/cugraph_c/resource_handle.h index 0e45102aae2..402da451a6f 100644 --- a/cpp/include/cugraph_c/resource_handle.h +++ b/cpp/include/cugraph_c/resource_handle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #pragma once #include +#include #include #include @@ -25,20 +26,6 @@ extern "C" { #endif -typedef enum bool_ { FALSE = 0, TRUE = 1 } bool_t; - -typedef int8_t byte_t; - -/** - * @deprecated - use cugraph_data_type_id_t; - */ -typedef enum data_type_id_ { INT32 = 0, INT64, FLOAT32, FLOAT64, SIZE_T, NTYPES } data_type_id_t; - -/** - * @brief - Enumeration of data types - */ -typedef data_type_id_t cugraph_data_type_id_t; - typedef struct cugraph_resource_handle_ { int32_t align_; } cugraph_resource_handle_t; diff --git a/cpp/include/cugraph_c/types.h b/cpp/include/cugraph_c/types.h new file mode 100644 index 00000000000..dddb802b931 --- /dev/null +++ b/cpp/include/cugraph_c/types.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2022-2024, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum bool_ { FALSE = 0, TRUE = 1 } bool_t; + +typedef int8_t byte_t; + +typedef enum data_type_id_ { + INT8 = 0, + INT16, + INT32, + INT64, + UINT8, + UINT16, + UINT32, + UINT64, + FLOAT32, + FLOAT64, + SIZE_T, + BOOL, + NTYPES +} cugraph_data_type_id_t; + +#ifdef __cplusplus +} +#endif diff --git a/cpp/src/c_api/array.cpp b/cpp/src/c_api/array.cpp index c9c8eaa78ac..5d760f1c1ec 100644 --- a/cpp/src/c_api/array.cpp +++ b/cpp/src/c_api/array.cpp @@ -22,7 +22,8 @@ namespace cugraph { namespace c_api { -size_t data_type_sz[] = {4, 8, 4, 8, 8}; +// FIXME: This is paired with type definition... better solution coming in 24.12 release. +size_t data_type_sz[] = {1, 2, 4, 8, 1, 2, 4, 8, 4, 8, 8, 1}; } // namespace c_api } // namespace cugraph diff --git a/cpp/tests/c_api/biased_neighbor_sample_test.c b/cpp/tests/c_api/biased_neighbor_sample_test.c index 0ccb236f7fc..6f0af3a8e0d 100644 --- a/cpp/tests/c_api/biased_neighbor_sample_test.c +++ b/cpp/tests/c_api/biased_neighbor_sample_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int vertex_id_compare_function(const void* a, const void* b) { @@ -468,11 +468,11 @@ int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, int test_biased_neighbor_sample_with_labels(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 8; size_t num_vertices = 6; @@ -686,11 +686,11 @@ int test_biased_neighbor_sample_with_labels(const cugraph_resource_handle_t* han int test_biased_neighbor_sample_clean(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -740,11 +740,11 @@ int test_biased_neighbor_sample_clean(const cugraph_resource_handle_t* handle) int test_biased_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -794,11 +794,11 @@ int test_biased_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* int test_biased_neighbor_sample_unique_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -848,11 +848,11 @@ int test_biased_neighbor_sample_unique_sources(const cugraph_resource_handle_t* int test_biased_neighbor_sample_carry_over_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -902,11 +902,11 @@ int test_biased_neighbor_sample_carry_over_sources(const cugraph_resource_handle int test_biased_neighbor_sample_renumber_results(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/cpp/tests/c_api/c_test_utils.h b/cpp/tests/c_api/c_test_utils.h index fbbf6333ee3..cddd08e0dfb 100644 --- a/cpp/tests/c_api/c_test_utils.h +++ b/cpp/tests/c_api/c_test_utils.h @@ -83,15 +83,15 @@ int create_test_graph_double(const cugraph_resource_handle_t* p_handle, cugraph_error_t** ret_error); int create_sg_test_graph(const cugraph_resource_handle_t* handle, - data_type_id_t vertex_tid, - data_type_id_t edge_tid, + cugraph_data_type_id_t vertex_tid, + cugraph_data_type_id_t edge_tid, void* h_src, void* h_dst, - data_type_id_t weight_tid, + cugraph_data_type_id_t weight_tid, void* h_wgt, - data_type_id_t edge_type_tid, + cugraph_data_type_id_t edge_type_tid, void* h_edge_type, - data_type_id_t edge_id_tid, + cugraph_data_type_id_t edge_id_tid, void* h_edge_id, size_t num_edges, bool_t store_transposed, diff --git a/cpp/tests/c_api/count_multi_edges_test.c b/cpp/tests/c_api/count_multi_edges_test.c index 222cf12ea36..9e54783b1b1 100644 --- a/cpp/tests/c_api/count_multi_edges_test.c +++ b/cpp/tests/c_api/count_multi_edges_test.c @@ -25,11 +25,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; /* * Create graph and count multi-edges diff --git a/cpp/tests/c_api/create_graph_test.c b/cpp/tests/c_api/create_graph_test.c index a07f31fce57..a4f31391488 100644 --- a/cpp/tests/c_api/create_graph_test.c +++ b/cpp/tests/c_api/create_graph_test.c @@ -48,9 +48,9 @@ int test_create_sg_graph_simple() properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -161,9 +161,9 @@ int test_create_sg_graph_csr() properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -355,9 +355,9 @@ int test_create_sg_graph_symmetric_error() properties.is_symmetric = TRUE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -462,9 +462,9 @@ int test_create_sg_graph_with_isolated_vertices() properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -626,9 +626,9 @@ int test_create_sg_graph_csr_with_isolated() properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -778,9 +778,9 @@ int test_create_sg_graph_with_isolated_vertices_multi_input() properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/ecg_test.c b/cpp/tests/c_api/ecg_test.c index 4f4c29b97b9..cdf1975ef8c 100644 --- a/cpp/tests/c_api/ecg_test.c +++ b/cpp/tests/c_api/ecg_test.c @@ -46,11 +46,11 @@ int generic_ecg_test(vertex_t* h_src, cugraph_graph_t* graph = NULL; cugraph_hierarchical_clustering_result_t* result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/egonet_test.c b/cpp/tests/c_api/egonet_test.c index 1bde50afbad..6d34e27b629 100644 --- a/cpp/tests/c_api/egonet_test.c +++ b/cpp/tests/c_api/egonet_test.c @@ -43,11 +43,11 @@ int generic_egonet_test(vertex_t* h_src, cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; cugraph_resource_handle_t* resource_handle = NULL; cugraph_graph_t* graph = NULL; diff --git a/cpp/tests/c_api/induced_subgraph_test.c b/cpp/tests/c_api/induced_subgraph_test.c index 929d911bf1c..0bd006ef591 100644 --- a/cpp/tests/c_api/induced_subgraph_test.c +++ b/cpp/tests/c_api/induced_subgraph_test.c @@ -57,8 +57,8 @@ int generic_induced_subgraph_test(vertex_t* h_src, cugraph_induced_subgraph_result_t* result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t size_t_tid = SIZE_T; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t size_t_tid = SIZE_T; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/k_core_test.c b/cpp/tests/c_api/k_core_test.c index c60001fc8e7..fdc948e07c2 100644 --- a/cpp/tests/c_api/k_core_test.c +++ b/cpp/tests/c_api/k_core_test.c @@ -15,6 +15,7 @@ */ #include "c_test_utils.h" /* RUN_TEST */ +#include "cugraph_c/types.h" #include #include @@ -43,11 +44,11 @@ int generic_k_core_test(vertex_t* h_src, cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; cugraph_resource_handle_t* resource_handle = NULL; cugraph_graph_t* graph = NULL; diff --git a/cpp/tests/c_api/k_truss_test.c b/cpp/tests/c_api/k_truss_test.c index 1ebacfead9f..621263e5a07 100644 --- a/cpp/tests/c_api/k_truss_test.c +++ b/cpp/tests/c_api/k_truss_test.c @@ -44,11 +44,11 @@ int generic_k_truss_test(vertex_t* h_src, cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; cugraph_resource_handle_t* resource_handle = NULL; cugraph_graph_t* graph = NULL; diff --git a/cpp/tests/c_api/legacy_spectral_test.c b/cpp/tests/c_api/legacy_spectral_test.c index ad695dd0883..5a9f3d3ad29 100644 --- a/cpp/tests/c_api/legacy_spectral_test.c +++ b/cpp/tests/c_api/legacy_spectral_test.c @@ -51,11 +51,11 @@ int generic_spectral_test(vertex_t* h_src, cugraph_graph_t* graph = NULL; cugraph_clustering_result_t* result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, handle != NULL, "resource handle creation failed."); @@ -170,11 +170,11 @@ int generic_balanced_cut_test(vertex_t* h_src, cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; cugraph_resource_handle_t* handle = NULL; cugraph_graph_t* graph = NULL; diff --git a/cpp/tests/c_api/leiden_test.c b/cpp/tests/c_api/leiden_test.c index 57e6e921cce..90441de2d8f 100644 --- a/cpp/tests/c_api/leiden_test.c +++ b/cpp/tests/c_api/leiden_test.c @@ -15,6 +15,7 @@ */ #include "c_test_utils.h" /* RUN_TEST */ +#include "cugraph_c/types.h" #include #include @@ -47,11 +48,11 @@ int generic_leiden_test(vertex_t* h_src, cugraph_graph_t* p_graph = NULL; cugraph_hierarchical_clustering_result_t* p_result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; p_handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, p_handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/louvain_test.c b/cpp/tests/c_api/louvain_test.c index c083dbaa676..7d57930bd18 100644 --- a/cpp/tests/c_api/louvain_test.c +++ b/cpp/tests/c_api/louvain_test.c @@ -46,11 +46,11 @@ int generic_louvain_test(vertex_t* h_src, cugraph_graph_t* p_graph = NULL; cugraph_hierarchical_clustering_result_t* p_result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; p_handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, p_handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/mg_biased_neighbor_sample_test.c b/cpp/tests/c_api/mg_biased_neighbor_sample_test.c index ead86f22ad3..f7103d1e39d 100644 --- a/cpp/tests/c_api/mg_biased_neighbor_sample_test.c +++ b/cpp/tests/c_api/mg_biased_neighbor_sample_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, vertex_t* h_src, @@ -1227,11 +1227,11 @@ int test_biased_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* han int test_biased_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -1277,11 +1277,11 @@ int test_biased_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* int test_biased_neighbor_sample_unique_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -1327,11 +1327,11 @@ int test_biased_neighbor_sample_unique_sources(const cugraph_resource_handle_t* int test_biased_neighbor_sample_carry_over_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/cpp/tests/c_api/mg_count_multi_edges_test.c b/cpp/tests/c_api/mg_count_multi_edges_test.c index 69eaaff40dc..02a5fd75dd1 100644 --- a/cpp/tests/c_api/mg_count_multi_edges_test.c +++ b/cpp/tests/c_api/mg_count_multi_edges_test.c @@ -25,11 +25,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; /* * Create graph and count multi-edges diff --git a/cpp/tests/c_api/mg_create_graph_test.c b/cpp/tests/c_api/mg_create_graph_test.c index 12579f26d06..82fee9dd440 100644 --- a/cpp/tests/c_api/mg_create_graph_test.c +++ b/cpp/tests/c_api/mg_create_graph_test.c @@ -49,9 +49,9 @@ int test_create_mg_graph_simple(const cugraph_resource_handle_t* handle) properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -159,9 +159,9 @@ int test_create_mg_graph_multiple_edge_lists(const cugraph_resource_handle_t* ha properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; const size_t num_local_arrays = 2; @@ -355,9 +355,9 @@ int test_create_mg_graph_multiple_edge_lists_multi_edge(const cugraph_resource_h properties.is_symmetric = FALSE; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; const size_t num_local_arrays = 2; diff --git a/cpp/tests/c_api/mg_generate_rmat_test.c b/cpp/tests/c_api/mg_generate_rmat_test.c index 47b7eb2fae6..339ab251283 100644 --- a/cpp/tests/c_api/mg_generate_rmat_test.c +++ b/cpp/tests/c_api/mg_generate_rmat_test.c @@ -109,9 +109,9 @@ int test_rmat_generation(const cugraph_resource_handle_t* handle) TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "rng_state create failed."); TEST_ALWAYS_ASSERT(ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; ret_code = cugraph_generate_rmat_edgelist( handle, rng_state, 5, 30, 0.57, 0.19, 0.19, FALSE, &coo, &ret_error); @@ -342,9 +342,9 @@ int test_rmat_list_generation(const cugraph_resource_handle_t* handle) TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "rng_state create failed."); TEST_ALWAYS_ASSERT(ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; ret_code = cugraph_generate_rmat_edgelists( handle, rng_state, num_lists, 4, 6, 4, UNIFORM, POWER_LAW, FALSE, &coo_list, &ret_error); diff --git a/cpp/tests/c_api/mg_induced_subgraph_test.c b/cpp/tests/c_api/mg_induced_subgraph_test.c index 39eefb9258c..1866810d270 100644 --- a/cpp/tests/c_api/mg_induced_subgraph_test.c +++ b/cpp/tests/c_api/mg_induced_subgraph_test.c @@ -57,9 +57,9 @@ int generic_induced_subgraph_test(const cugraph_resource_handle_t* handle, cugraph_induced_subgraph_result_t* result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t size_t_tid = SIZE_T; - size_t num_subgraph_vertices = h_subgraph_offsets[num_subgraph_offsets - 1]; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t size_t_tid = SIZE_T; + size_t num_subgraph_vertices = h_subgraph_offsets[num_subgraph_offsets - 1]; ret_code = create_mg_test_graph( handle, h_src, h_dst, h_wgt, num_edges, store_transposed, FALSE, &graph, &ret_error); diff --git a/cpp/tests/c_api/mg_k_truss_test.c b/cpp/tests/c_api/mg_k_truss_test.c index ed385c6ca76..4709926232b 100644 --- a/cpp/tests/c_api/mg_k_truss_test.c +++ b/cpp/tests/c_api/mg_k_truss_test.c @@ -50,8 +50,8 @@ int generic_k_truss_test(const cugraph_resource_handle_t* handle, cugraph_induced_subgraph_result_t* result = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t size_t_tid = SIZE_T; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t size_t_tid = SIZE_T; ret_code = create_mg_test_graph( handle, h_src, h_dst, h_wgt, num_edges, store_transposed, TRUE, &graph, &ret_error); diff --git a/cpp/tests/c_api/mg_lookup_src_dst_test.c b/cpp/tests/c_api/mg_lookup_src_dst_test.c index 8c85d245acc..0840325d8f2 100644 --- a/cpp/tests/c_api/mg_lookup_src_dst_test.c +++ b/cpp/tests/c_api/mg_lookup_src_dst_test.c @@ -27,11 +27,11 @@ typedef int32_t edge_type_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int generic_lookup_src_dst_test(const cugraph_resource_handle_t* handle, vertex_t* h_srcs, diff --git a/cpp/tests/c_api/mg_negative_sampling_test.c b/cpp/tests/c_api/mg_negative_sampling_test.c index 274bad35dfb..c016ebfde0f 100644 --- a/cpp/tests/c_api/mg_negative_sampling_test.c +++ b/cpp/tests/c_api/mg_negative_sampling_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int generic_negative_sampling_test(const cugraph_resource_handle_t* handle, vertex_t* h_src, @@ -210,9 +210,9 @@ int generic_negative_sampling_test(const cugraph_resource_handle_t* handle, int test_negative_sampling_uniform(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -243,9 +243,9 @@ int test_negative_sampling_uniform(const cugraph_resource_handle_t* handle) int test_negative_sampling_biased(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/cpp/tests/c_api/mg_pagerank_test.c b/cpp/tests/c_api/mg_pagerank_test.c index 4616db3f704..274b03d690e 100644 --- a/cpp/tests/c_api/mg_pagerank_test.c +++ b/cpp/tests/c_api/mg_pagerank_test.c @@ -202,8 +202,8 @@ int generic_personalized_pagerank_test(const cugraph_resource_handle_t* handle, cugraph_type_erased_device_array_view_t* personalization_vertices_view = NULL; cugraph_type_erased_device_array_view_t* personalization_values_view = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; ret_code = create_mg_test_graph( handle, h_src, h_dst, h_wgt, num_edges, store_transposed, FALSE, &p_graph, &ret_error); @@ -311,8 +311,8 @@ int generic_personalized_pagerank_nonconverging_test(const cugraph_resource_hand cugraph_type_erased_device_array_view_t* personalization_vertices_view = NULL; cugraph_type_erased_device_array_view_t* personalization_values_view = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; ret_code = create_mg_test_graph( handle, h_src, h_dst, h_wgt, num_edges, store_transposed, FALSE, &p_graph, &ret_error); diff --git a/cpp/tests/c_api/mg_similarity_test.c b/cpp/tests/c_api/mg_similarity_test.c index 637f66e40ed..fee4e264856 100644 --- a/cpp/tests/c_api/mg_similarity_test.c +++ b/cpp/tests/c_api/mg_similarity_test.c @@ -54,8 +54,8 @@ int generic_similarity_test(const cugraph_resource_handle_t* handle, bool_t use_weight, similarity_t test_type) { - int test_ret_value = 0; - data_type_id_t vertex_tid = INT32; + int test_ret_value = 0; + cugraph_data_type_id_t vertex_tid = INT32; cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; diff --git a/cpp/tests/c_api/mg_test_utils.cpp b/cpp/tests/c_api/mg_test_utils.cpp index 98b64014726..f96be61468f 100644 --- a/cpp/tests/c_api/mg_test_utils.cpp +++ b/cpp/tests/c_api/mg_test_utils.cpp @@ -143,9 +143,9 @@ extern "C" int create_mg_test_graph(const cugraph_resource_handle_t* handle, properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -241,9 +241,9 @@ extern "C" int create_mg_test_graph_double(const cugraph_resource_handle_t* hand properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT64; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT64; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -334,9 +334,9 @@ extern "C" int create_mg_test_graph_with_edge_ids(const cugraph_resource_handle_ properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -428,11 +428,11 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t index_tid = INT32; - data_type_id_t type_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t index_tid = INT32; + cugraph_data_type_id_t type_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src = NULL; cugraph_type_erased_device_array_t* dst = NULL; @@ -541,15 +541,15 @@ extern "C" int create_mg_test_graph_with_properties(const cugraph_resource_handl } int create_mg_test_graph_new(const cugraph_resource_handle_t* handle, - data_type_id_t vertex_tid, - data_type_id_t edge_tid, + cugraph_data_type_id_t vertex_tid, + cugraph_data_type_id_t edge_tid, void* h_src, void* h_dst, - data_type_id_t weight_tid, + cugraph_data_type_id_t weight_tid, void* h_wgt, - data_type_id_t edge_type_tid, + cugraph_data_type_id_t edge_type_tid, void* h_edge_type, - data_type_id_t edge_id_tid, + cugraph_data_type_id_t edge_id_tid, void* h_edge_id, size_t num_edges, bool_t store_transposed, diff --git a/cpp/tests/c_api/mg_test_utils.h b/cpp/tests/c_api/mg_test_utils.h index 7461d402b5b..b040d8dc529 100644 --- a/cpp/tests/c_api/mg_test_utils.h +++ b/cpp/tests/c_api/mg_test_utils.h @@ -107,15 +107,15 @@ int create_mg_test_graph_with_properties(const cugraph_resource_handle_t* p_hand cugraph_error_t** ret_error); int create_mg_test_graph_new(const cugraph_resource_handle_t* handle, - data_type_id_t vertex_tid, - data_type_id_t edge_tid, + cugraph_data_type_id_t vertex_tid, + cugraph_data_type_id_t edge_tid, void* h_src, void* h_dst, - data_type_id_t weight_tid, + cugraph_data_type_id_t weight_tid, void* h_wgt, - data_type_id_t edge_type_tid, + cugraph_data_type_id_t edge_type_tid, void* h_edge_type, - data_type_id_t edge_id_tid, + cugraph_data_type_id_t edge_id_tid, void* h_edge_id, size_t num_edges, bool_t store_transposed, diff --git a/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c b/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c index b046b453c1c..f9388a2e565 100644 --- a/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c +++ b/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int generic_uniform_neighbor_sample_test(const cugraph_resource_handle_t* handle, vertex_t* h_src, @@ -1223,11 +1223,11 @@ int test_uniform_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* ha int test_uniform_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -1273,11 +1273,11 @@ int test_uniform_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* int test_uniform_neighbor_sample_unique_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -1323,11 +1323,11 @@ int test_uniform_neighbor_sample_unique_sources(const cugraph_resource_handle_t* int test_uniform_neighbor_sample_carry_over_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/cpp/tests/c_api/negative_sampling_test.c b/cpp/tests/c_api/negative_sampling_test.c index 52360d622dd..8d59435c885 100644 --- a/cpp/tests/c_api/negative_sampling_test.c +++ b/cpp/tests/c_api/negative_sampling_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int generic_negative_sampling_test(const cugraph_resource_handle_t* handle, vertex_t* h_src, @@ -201,9 +201,9 @@ int generic_negative_sampling_test(const cugraph_resource_handle_t* handle, int test_negative_sampling_uniform(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -234,9 +234,9 @@ int test_negative_sampling_uniform(const cugraph_resource_handle_t* handle) int test_negative_sampling_biased(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/cpp/tests/c_api/pagerank_test.c b/cpp/tests/c_api/pagerank_test.c index b0caef58eee..8b23d60bb1f 100644 --- a/cpp/tests/c_api/pagerank_test.c +++ b/cpp/tests/c_api/pagerank_test.c @@ -202,8 +202,8 @@ int generic_personalized_pagerank_test(vertex_t* h_src, cugraph_type_erased_device_array_view_t* personalization_vertices_view = NULL; cugraph_type_erased_device_array_view_t* personalization_values_view = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; p_handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, p_handle != NULL, "resource handle creation failed."); @@ -311,8 +311,8 @@ int generic_personalized_pagerank_nonconverging_test(vertex_t* h_src, cugraph_type_erased_device_array_view_t* personalization_vertices_view = NULL; cugraph_type_erased_device_array_view_t* personalization_values_view = NULL; - data_type_id_t vertex_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; p_handle = cugraph_create_resource_handle(NULL); TEST_ASSERT(test_ret_value, p_handle != NULL, "resource handle creation failed."); diff --git a/cpp/tests/c_api/similarity_test.c b/cpp/tests/c_api/similarity_test.c index ac4dff850fa..2ae413521e1 100644 --- a/cpp/tests/c_api/similarity_test.c +++ b/cpp/tests/c_api/similarity_test.c @@ -41,8 +41,8 @@ int generic_similarity_test(vertex_t* h_src, bool_t use_weight, similarity_t test_type) { - int test_ret_value = 0; - data_type_id_t vertex_tid = INT32; + int test_ret_value = 0; + cugraph_data_type_id_t vertex_tid = INT32; cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; @@ -149,8 +149,8 @@ int generic_all_pairs_similarity_test(vertex_t* h_src, size_t topk, similarity_t test_type) { - int test_ret_value = 0; - data_type_id_t vertex_tid = INT32; + int test_ret_value = 0; + cugraph_data_type_id_t vertex_tid = INT32; cugraph_error_code_t ret_code = CUGRAPH_SUCCESS; cugraph_error_t* ret_error; diff --git a/cpp/tests/c_api/test_utils.cpp b/cpp/tests/c_api/test_utils.cpp index 2df62345784..c657d75b4c4 100644 --- a/cpp/tests/c_api/test_utils.cpp +++ b/cpp/tests/c_api/test_utils.cpp @@ -58,9 +58,9 @@ extern "C" int create_test_graph(const cugraph_resource_handle_t* p_handle, properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -144,9 +144,9 @@ extern "C" int create_test_graph_double(const cugraph_resource_handle_t* p_handl properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT64; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT64; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -271,15 +271,15 @@ extern "C" int run_sg_test_new(int (*test)(const cugraph_resource_handle_t*), } int create_sg_test_graph(const cugraph_resource_handle_t* handle, - data_type_id_t vertex_tid, - data_type_id_t edge_tid, + cugraph_data_type_id_t vertex_tid, + cugraph_data_type_id_t edge_tid, void* h_src, void* h_dst, - data_type_id_t weight_tid, + cugraph_data_type_id_t weight_tid, void* h_wgt, - data_type_id_t edge_type_tid, + cugraph_data_type_id_t edge_type_tid, void* h_edge_type, - data_type_id_t edge_id_tid, + cugraph_data_type_id_t edge_id_tid, void* h_edge_id, size_t num_edges, bool_t store_transposed, diff --git a/cpp/tests/c_api/uniform_neighbor_sample_test.c b/cpp/tests/c_api/uniform_neighbor_sample_test.c index 404e38627ae..931d1fbfe07 100644 --- a/cpp/tests/c_api/uniform_neighbor_sample_test.c +++ b/cpp/tests/c_api/uniform_neighbor_sample_test.c @@ -27,11 +27,11 @@ typedef int32_t vertex_t; typedef int32_t edge_t; typedef float weight_t; -data_type_id_t vertex_tid = INT32; -data_type_id_t edge_tid = INT32; -data_type_id_t weight_tid = FLOAT32; -data_type_id_t edge_id_tid = INT32; -data_type_id_t edge_type_tid = INT32; +cugraph_data_type_id_t vertex_tid = INT32; +cugraph_data_type_id_t edge_tid = INT32; +cugraph_data_type_id_t weight_tid = FLOAT32; +cugraph_data_type_id_t edge_id_tid = INT32; +cugraph_data_type_id_t edge_type_tid = INT32; int vertex_id_compare_function(const void* a, const void* b) { @@ -483,9 +483,9 @@ int create_test_graph_with_edge_ids(const cugraph_resource_handle_t* p_handle, properties.is_symmetric = is_symmetric; properties.is_multigraph = FALSE; - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; cugraph_type_erased_device_array_t* src; cugraph_type_erased_device_array_t* dst; @@ -559,11 +559,11 @@ int create_test_graph_with_edge_ids(const cugraph_resource_handle_t* p_handle, int test_uniform_neighbor_sample_with_labels(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 8; size_t num_vertices = 6; @@ -776,11 +776,11 @@ int test_uniform_neighbor_sample_with_labels(const cugraph_resource_handle_t* ha int test_uniform_neighbor_sample_clean(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -830,11 +830,11 @@ int test_uniform_neighbor_sample_clean(const cugraph_resource_handle_t* handle) int test_uniform_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -884,11 +884,11 @@ int test_uniform_neighbor_sample_dedupe_sources(const cugraph_resource_handle_t* int test_uniform_neighbor_sample_unique_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -938,11 +938,11 @@ int test_uniform_neighbor_sample_unique_sources(const cugraph_resource_handle_t* int test_uniform_neighbor_sample_carry_over_sources(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; @@ -992,11 +992,11 @@ int test_uniform_neighbor_sample_carry_over_sources(const cugraph_resource_handl int test_uniform_neighbor_sample_renumber_results(const cugraph_resource_handle_t* handle) { - data_type_id_t vertex_tid = INT32; - data_type_id_t edge_tid = INT32; - data_type_id_t weight_tid = FLOAT32; - data_type_id_t edge_id_tid = INT32; - data_type_id_t edge_type_tid = INT32; + cugraph_data_type_id_t vertex_tid = INT32; + cugraph_data_type_id_t edge_tid = INT32; + cugraph_data_type_id_t weight_tid = FLOAT32; + cugraph_data_type_id_t edge_id_tid = INT32; + cugraph_data_type_id_t edge_type_tid = INT32; size_t num_edges = 9; size_t num_vertices = 6; diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/algorithms.pxd index aa19ce60908..6d5d5a23cca 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/array.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/array.pxd index 73055c7391e..2bb08508df9 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/array.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/array.pxd @@ -1,4 +1,4 @@ -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -18,10 +18,12 @@ from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, cugraph_error_t, ) +from pylibcugraph._cugraph_c.types cimport ( + cugraph_data_type_id_t, + byte_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - data_type_id_t, - byte_t, ) @@ -42,7 +44,7 @@ cdef extern from "cugraph_c/array.h": cdef cugraph_error_code_t \ cugraph_type_erased_device_array_create( const cugraph_resource_handle_t* handle, - data_type_id_t dtype, + cugraph_data_type_id_t dtype, size_t n_elems, cugraph_type_erased_device_array_t** array, cugraph_error_t** error @@ -67,7 +69,7 @@ cdef extern from "cugraph_c/array.h": cugraph_type_erased_device_array_view_create( void* pointer, size_t n_elems, - data_type_id_t dtype + cugraph_data_type_id_t dtype ) cdef void \ @@ -80,7 +82,7 @@ cdef extern from "cugraph_c/array.h": const cugraph_type_erased_device_array_view_t* p ) - cdef data_type_id_t \ + cdef cugraph_data_type_id_t \ cugraph_type_erased_device_array_view_type( const cugraph_type_erased_device_array_view_t* p ) @@ -93,7 +95,7 @@ cdef extern from "cugraph_c/array.h": cdef cugraph_error_code_t \ cugraph_type_erased_host_array_create( const cugraph_resource_handle_t* handle, - data_type_id_t dtype, + cugraph_data_type_id_t dtype, size_t n_elems, cugraph_type_erased_host_array_t** array, cugraph_error_t** error @@ -118,7 +120,7 @@ cdef extern from "cugraph_c/array.h": cugraph_type_erased_host_array_view_create( void* pointer, size_t n_elems, - data_type_id_t dtype + cugraph_data_type_id_t dtype ) cdef void \ @@ -131,7 +133,7 @@ cdef extern from "cugraph_c/array.h": const cugraph_type_erased_host_array_t* p ) - cdef data_type_id_t \ + cdef cugraph_data_type_id_t \ cugraph_type_erased_host_array_type( const cugraph_type_erased_host_array_t* p ) diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/centrality_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/centrality_algorithms.pxd index 6e9a5432974..fb2c302e66a 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/centrality_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/centrality_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/community_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/community_algorithms.pxd index b8cd6148456..b914233cb2c 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/community_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/community_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/core_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/core_algorithms.pxd index ed25faa33f4..d8e28c7be3e 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/core_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/core_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph.pxd index 5bbe5bc4a87..48412099caa 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_functions.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_functions.pxd index 315c9bd7503..b8f16cb94c8 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_functions.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_functions.pxd @@ -19,9 +19,11 @@ from pylibcugraph._cugraph_c.error cimport ( cugraph_error_t, ) +from pylibcugraph._cugraph_c.types cimport ( + bool_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - bool_t, ) from pylibcugraph._cugraph_c.similarity_algorithms cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_generators.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_generators.pxd index cda47e55f77..d345eac707e 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_generators.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/graph_generators.pxd @@ -14,11 +14,13 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( - cugraph_resource_handle_t, +from pylibcugraph._cugraph_c.types cimport ( cugraph_data_type_id_t, bool_t, ) +from pylibcugraph._cugraph_c.resource_handle cimport ( + cugraph_resource_handle_t, +) from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, cugraph_error_t, diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/labeling_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/labeling_algorithms.pxd index 53c4c382d58..5d2ce168e01 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/labeling_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/labeling_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd index e8a2bbf47ae..0c2f31f9a50 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/lookup_src_dst.pxd @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/resource_handle.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/resource_handle.pxd index f3f43d55dff..f8cf45d7af0 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/resource_handle.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/resource_handle.pxd @@ -14,26 +14,8 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from libc.stdint cimport int8_t - - cdef extern from "cugraph_c/resource_handle.h": - ctypedef enum bool_t: - FALSE - TRUE - - ctypedef enum data_type_id_t: - INT32 - INT64 - FLOAT32 - FLOAT64 - SIZE_T - - ctypedef data_type_id_t cugraph_data_type_id_t - - ctypedef int8_t byte_t - ctypedef struct cugraph_resource_handle_t: pass diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/sampling_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/sampling_algorithms.pxd index c982b12665a..3f7b8b9ae29 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/sampling_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/sampling_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/similarity_algorithms.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/similarity_algorithms.pxd index 71d094a6058..228050abce0 100644 --- a/python/pylibcugraph/pylibcugraph/_cugraph_c/similarity_algorithms.pxd +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/similarity_algorithms.pxd @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/_cugraph_c/types.pxd b/python/pylibcugraph/pylibcugraph/_cugraph_c/types.pxd new file mode 100644 index 00000000000..384b588c79f --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/_cugraph_c/types.pxd @@ -0,0 +1,40 @@ +# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Have cython use python 3 syntax +# cython: language_level = 3 + +from libc.stdint cimport int8_t + + +cdef extern from "cugraph_c/types.h": + + ctypedef enum bool_t: + FALSE + TRUE + + ctypedef enum cugraph_data_type_id_t: + INT8 + INT16 + INT32 + INT64 + UINT8 + UINT16 + UINT32 + UINT64 + FLOAT32 + FLOAT64 + SIZE_T + BOOL + + ctypedef int8_t byte_t diff --git a/python/pylibcugraph/pylibcugraph/all_pairs_cosine_coefficients.pyx b/python/pylibcugraph/pylibcugraph/all_pairs_cosine_coefficients.pyx index b600dd48567..6aa18ac9660 100644 --- a/python/pylibcugraph/pylibcugraph/all_pairs_cosine_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/all_pairs_cosine_coefficients.pyx @@ -17,8 +17,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/all_pairs_jaccard_coefficients.pyx b/python/pylibcugraph/pylibcugraph/all_pairs_jaccard_coefficients.pyx index b65905b6850..23694f89503 100644 --- a/python/pylibcugraph/pylibcugraph/all_pairs_jaccard_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/all_pairs_jaccard_coefficients.pyx @@ -17,8 +17,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/all_pairs_overlap_coefficients.pyx b/python/pylibcugraph/pylibcugraph/all_pairs_overlap_coefficients.pyx index 74f3bc06a94..f4fb721720d 100644 --- a/python/pylibcugraph/pylibcugraph/all_pairs_overlap_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/all_pairs_overlap_coefficients.pyx @@ -17,8 +17,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/all_pairs_sorensen_coefficients.pyx b/python/pylibcugraph/pylibcugraph/all_pairs_sorensen_coefficients.pyx index 5e3fc24a4b4..4702a5ccba9 100644 --- a/python/pylibcugraph/pylibcugraph/all_pairs_sorensen_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/all_pairs_sorensen_coefficients.pyx @@ -17,8 +17,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/balanced_cut_clustering.pyx b/python/pylibcugraph/pylibcugraph/balanced_cut_clustering.pyx index e0ec2f77233..ab1dc215a1e 100644 --- a/python/pylibcugraph/pylibcugraph/balanced_cut_clustering.pyx +++ b/python/pylibcugraph/pylibcugraph/balanced_cut_clustering.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/betweenness_centrality.pyx b/python/pylibcugraph/pylibcugraph/betweenness_centrality.pyx index 85df88b9001..c7bfcc9c4a0 100644 --- a/python/pylibcugraph/pylibcugraph/betweenness_centrality.pyx +++ b/python/pylibcugraph/pylibcugraph/betweenness_centrality.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/bfs.pyx b/python/pylibcugraph/pylibcugraph/bfs.pyx index e65e94a8020..b92afcfd7db 100644 --- a/python/pylibcugraph/pylibcugraph/bfs.pyx +++ b/python/pylibcugraph/pylibcugraph/bfs.pyx @@ -31,8 +31,10 @@ from pylibcugraph._cugraph_c.array cimport ( cugraph_type_erased_device_array_view_t, cugraph_type_erased_device_array_view_create, ) -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/biased_neighbor_sample.pyx b/python/pylibcugraph/pylibcugraph/biased_neighbor_sample.pyx index 2dd138d5d06..244222e3dab 100644 --- a/python/pylibcugraph/pylibcugraph/biased_neighbor_sample.pyx +++ b/python/pylibcugraph/pylibcugraph/biased_neighbor_sample.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/core_number.pyx b/python/pylibcugraph/pylibcugraph/core_number.pyx index 50ce5bfe965..e754ef2c65e 100644 --- a/python/pylibcugraph/pylibcugraph/core_number.pyx +++ b/python/pylibcugraph/pylibcugraph/core_number.pyx @@ -16,9 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/cosine_coefficients.pyx b/python/pylibcugraph/pylibcugraph/cosine_coefficients.pyx index df194fe364e..926fa0f0c60 100644 --- a/python/pylibcugraph/pylibcugraph/cosine_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/cosine_coefficients.pyx @@ -18,8 +18,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf from cython.operator cimport dereference -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/count_multi_edges.pyx b/python/pylibcugraph/pylibcugraph/count_multi_edges.pyx index d3780e53283..e4eab82d363 100644 --- a/python/pylibcugraph/pylibcugraph/count_multi_edges.pyx +++ b/python/pylibcugraph/pylibcugraph/count_multi_edges.pyx @@ -14,9 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/degrees.pyx b/python/pylibcugraph/pylibcugraph/degrees.pyx index 7818da441bd..c6469b99068 100644 --- a/python/pylibcugraph/pylibcugraph/degrees.pyx +++ b/python/pylibcugraph/pylibcugraph/degrees.pyx @@ -16,9 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/ecg.pyx b/python/pylibcugraph/pylibcugraph/ecg.pyx index 4b8d8901d34..0e293cb82f0 100644 --- a/python/pylibcugraph/pylibcugraph/ecg.pyx +++ b/python/pylibcugraph/pylibcugraph/ecg.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/edge_betweenness_centrality.pyx b/python/pylibcugraph/pylibcugraph/edge_betweenness_centrality.pyx index 75a950eaa34..1d5881b0e7e 100644 --- a/python/pylibcugraph/pylibcugraph/edge_betweenness_centrality.pyx +++ b/python/pylibcugraph/pylibcugraph/edge_betweenness_centrality.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/egonet.pyx b/python/pylibcugraph/pylibcugraph/egonet.pyx index 070ea1fdd85..ce5a751eb33 100644 --- a/python/pylibcugraph/pylibcugraph/egonet.pyx +++ b/python/pylibcugraph/pylibcugraph/egonet.pyx @@ -16,9 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/eigenvector_centrality.pyx b/python/pylibcugraph/pylibcugraph/eigenvector_centrality.pyx index baa69eb2e30..b59b08f061f 100644 --- a/python/pylibcugraph/pylibcugraph/eigenvector_centrality.pyx +++ b/python/pylibcugraph/pylibcugraph/eigenvector_centrality.pyx @@ -16,9 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/generate_rmat_edgelist.pyx b/python/pylibcugraph/pylibcugraph/generate_rmat_edgelist.pyx index 4ea96920e61..f79590e022e 100644 --- a/python/pylibcugraph/pylibcugraph/generate_rmat_edgelist.pyx +++ b/python/pylibcugraph/pylibcugraph/generate_rmat_edgelist.pyx @@ -15,9 +15,11 @@ # cython: language_level = 3 +from pylibcugraph._cugraph_c.types cimport ( + bool_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - bool_t, ) from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, diff --git a/python/pylibcugraph/pylibcugraph/generate_rmat_edgelists.pyx b/python/pylibcugraph/pylibcugraph/generate_rmat_edgelists.pyx index 7de48708f80..532f73713e3 100644 --- a/python/pylibcugraph/pylibcugraph/generate_rmat_edgelists.pyx +++ b/python/pylibcugraph/pylibcugraph/generate_rmat_edgelists.pyx @@ -15,9 +15,11 @@ # cython: language_level = 3 +from pylibcugraph._cugraph_c.types cimport ( + bool_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - bool_t, ) from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, diff --git a/python/pylibcugraph/pylibcugraph/hits.pyx b/python/pylibcugraph/pylibcugraph/hits.pyx index 3204ac2ba57..9dbf96ec271 100644 --- a/python/pylibcugraph/pylibcugraph/hits.pyx +++ b/python/pylibcugraph/pylibcugraph/hits.pyx @@ -16,9 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/induced_subgraph.pyx b/python/pylibcugraph/pylibcugraph/induced_subgraph.pyx index 6fd6d7b9af3..ba09841460b 100644 --- a/python/pylibcugraph/pylibcugraph/induced_subgraph.pyx +++ b/python/pylibcugraph/pylibcugraph/induced_subgraph.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/jaccard_coefficients.pyx b/python/pylibcugraph/pylibcugraph/jaccard_coefficients.pyx index 9611f2ad884..70b77ba6306 100644 --- a/python/pylibcugraph/pylibcugraph/jaccard_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/jaccard_coefficients.pyx @@ -18,8 +18,10 @@ from libc.stdint cimport uintptr_t from libc.stdio cimport printf from cython.operator cimport dereference -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/k_core.pyx b/python/pylibcugraph/pylibcugraph/k_core.pyx index 6e37ee778e9..eb08457a24d 100644 --- a/python/pylibcugraph/pylibcugraph/k_core.pyx +++ b/python/pylibcugraph/pylibcugraph/k_core.pyx @@ -17,8 +17,10 @@ from libc.stdint cimport uintptr_t import warnings -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/k_truss_subgraph.pyx b/python/pylibcugraph/pylibcugraph/k_truss_subgraph.pyx index 9ea533c9f28..ef78e652d3e 100644 --- a/python/pylibcugraph/pylibcugraph/k_truss_subgraph.pyx +++ b/python/pylibcugraph/pylibcugraph/k_truss_subgraph.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/katz_centrality.pyx b/python/pylibcugraph/pylibcugraph/katz_centrality.pyx index 1716a4fc9bf..ef4f54b9183 100644 --- a/python/pylibcugraph/pylibcugraph/katz_centrality.pyx +++ b/python/pylibcugraph/pylibcugraph/katz_centrality.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/leiden.pyx b/python/pylibcugraph/pylibcugraph/leiden.pyx index 04f8887551c..aaff3f44535 100644 --- a/python/pylibcugraph/pylibcugraph/leiden.pyx +++ b/python/pylibcugraph/pylibcugraph/leiden.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/louvain.pyx b/python/pylibcugraph/pylibcugraph/louvain.pyx index 58f4f10bc18..12f22870ed1 100644 --- a/python/pylibcugraph/pylibcugraph/louvain.pyx +++ b/python/pylibcugraph/pylibcugraph/louvain.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/negative_sampling.pyx b/python/pylibcugraph/pylibcugraph/negative_sampling.pyx index 610cfa90ccf..d8daee61814 100644 --- a/python/pylibcugraph/pylibcugraph/negative_sampling.pyx +++ b/python/pylibcugraph/pylibcugraph/negative_sampling.pyx @@ -16,9 +16,11 @@ from libc.stdint cimport uintptr_t +from pylibcugraph._cugraph_c.types cimport ( + bool_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - bool_t, ) from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, diff --git a/python/pylibcugraph/pylibcugraph/node2vec.pyx b/python/pylibcugraph/pylibcugraph/node2vec.pyx index b2f2948affe..0e0fd73e6c8 100644 --- a/python/pylibcugraph/pylibcugraph/node2vec.pyx +++ b/python/pylibcugraph/pylibcugraph/node2vec.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/overlap_coefficients.pyx b/python/pylibcugraph/pylibcugraph/overlap_coefficients.pyx index 36f414e71ad..a1b61a0a768 100644 --- a/python/pylibcugraph/pylibcugraph/overlap_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/overlap_coefficients.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/pagerank.pyx b/python/pylibcugraph/pylibcugraph/pagerank.pyx index 9fec1328bbf..bcb8474ddfa 100644 --- a/python/pylibcugraph/pylibcugraph/pagerank.pyx +++ b/python/pylibcugraph/pylibcugraph/pagerank.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/personalized_pagerank.pyx b/python/pylibcugraph/pylibcugraph/personalized_pagerank.pyx index 85addffa694..209d4054491 100644 --- a/python/pylibcugraph/pylibcugraph/personalized_pagerank.pyx +++ b/python/pylibcugraph/pylibcugraph/personalized_pagerank.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,8 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/sorensen_coefficients.pyx b/python/pylibcugraph/pylibcugraph/sorensen_coefficients.pyx index 39814b8ad88..0752a35ee7e 100644 --- a/python/pylibcugraph/pylibcugraph/sorensen_coefficients.pyx +++ b/python/pylibcugraph/pylibcugraph/sorensen_coefficients.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/spectral_modularity_maximization.pyx b/python/pylibcugraph/pylibcugraph/spectral_modularity_maximization.pyx index a2c93e025a8..920784a7406 100644 --- a/python/pylibcugraph/pylibcugraph/spectral_modularity_maximization.pyx +++ b/python/pylibcugraph/pylibcugraph/spectral_modularity_maximization.pyx @@ -15,8 +15,10 @@ # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/sssp.pyx b/python/pylibcugraph/pylibcugraph/sssp.pyx index 56765c4a1b8..7e40a801e94 100644 --- a/python/pylibcugraph/pylibcugraph/sssp.pyx +++ b/python/pylibcugraph/pylibcugraph/sssp.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,9 +14,10 @@ # Have cython use python 3 syntax # cython: language_level = 3 -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, - data_type_id_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/triangle_count.pyx b/python/pylibcugraph/pylibcugraph/triangle_count.pyx index 0cbe9be7f19..5debb92f665 100644 --- a/python/pylibcugraph/pylibcugraph/triangle_count.pyx +++ b/python/pylibcugraph/pylibcugraph/triangle_count.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/two_hop_neighbors.pyx b/python/pylibcugraph/pylibcugraph/two_hop_neighbors.pyx index 4b1a5b74a3f..d45e6394383 100644 --- a/python/pylibcugraph/pylibcugraph/two_hop_neighbors.pyx +++ b/python/pylibcugraph/pylibcugraph/two_hop_neighbors.pyx @@ -15,9 +15,11 @@ # cython: language_level = 3 +from pylibcugraph._cugraph_c.types cimport ( + bool_t, +) from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, - bool_t, ) from pylibcugraph._cugraph_c.error cimport ( cugraph_error_code_t, diff --git a/python/pylibcugraph/pylibcugraph/uniform_neighbor_sample.pyx b/python/pylibcugraph/pylibcugraph/uniform_neighbor_sample.pyx index f3e2336d8f6..d9d19972684 100644 --- a/python/pylibcugraph/pylibcugraph/uniform_neighbor_sample.pyx +++ b/python/pylibcugraph/pylibcugraph/uniform_neighbor_sample.pyx @@ -16,8 +16,10 @@ from libc.stdint cimport uintptr_t -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( diff --git a/python/pylibcugraph/pylibcugraph/utils.pxd b/python/pylibcugraph/pylibcugraph/utils.pxd index 21ab49a1f1e..1f9a7727b6f 100644 --- a/python/pylibcugraph/pylibcugraph/utils.pxd +++ b/python/pylibcugraph/pylibcugraph/utils.pxd @@ -14,8 +14,11 @@ # Have cython use python 3 syntax # cython: language_level = 3 +from pylibcugraph._cugraph_c.types cimport ( + cugraph_data_type_id_t, +) + from pylibcugraph._cugraph_c.resource_handle cimport ( - data_type_id_t, cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.array cimport ( @@ -35,13 +38,13 @@ cdef assert_CAI_type(obj, var_name, allow_None=*) cdef assert_AI_type(obj, var_name, allow_None=*) -cdef get_numpy_type_from_c_type(data_type_id_t c_type) +cdef get_numpy_type_from_c_type(cugraph_data_type_id_t c_type) cdef get_c_type_from_numpy_type(numpy_type) cdef get_c_weight_type_from_numpy_edge_ids_type(numpy_type) -cdef get_numpy_edge_ids_type_from_c_weight_type(data_type_id_t c_type) +cdef get_numpy_edge_ids_type_from_c_weight_type(cugraph_data_type_id_t c_type) cdef copy_to_cupy_array( cugraph_resource_handle_t* c_resource_handle_ptr, diff --git a/python/pylibcugraph/pylibcugraph/utils.pyx b/python/pylibcugraph/pylibcugraph/utils.pyx index 70bef89f4cf..6fc53e2f5dc 100644 --- a/python/pylibcugraph/pylibcugraph/utils.pyx +++ b/python/pylibcugraph/pylibcugraph/utils.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -107,16 +107,16 @@ cdef assert_AI_type(obj, var_name, allow_None=False): raise TypeError(msg) -cdef get_numpy_type_from_c_type(data_type_id_t c_type): - if c_type == data_type_id_t.INT32: +cdef get_numpy_type_from_c_type(cugraph_data_type_id_t c_type): + if c_type == cugraph_data_type_id_t.INT32: return numpy.int32 - elif c_type == data_type_id_t.INT64: + elif c_type == cugraph_data_type_id_t.INT64: return numpy.int64 - elif c_type == data_type_id_t.FLOAT32: + elif c_type == cugraph_data_type_id_t.FLOAT32: return numpy.float32 - elif c_type == data_type_id_t.FLOAT64: + elif c_type == cugraph_data_type_id_t.FLOAT64: return numpy.float64 - elif c_type == data_type_id_t.SIZE_T: + elif c_type == cugraph_data_type_id_t.SIZE_T: return numpy.int64 else: raise RuntimeError("Internal error: got invalid data type enum value " @@ -126,25 +126,25 @@ cdef get_numpy_type_from_c_type(data_type_id_t c_type): cdef get_c_type_from_numpy_type(numpy_type): dt = numpy.dtype(numpy_type) if dt == numpy.int32: - return data_type_id_t.INT32 + return cugraph_data_type_id_t.INT32 elif dt == numpy.int64: - return data_type_id_t.INT64 + return cugraph_data_type_id_t.INT64 elif dt == numpy.float32: - return data_type_id_t.FLOAT32 + return cugraph_data_type_id_t.FLOAT32 elif dt == numpy.float64: - return data_type_id_t.FLOAT64 + return cugraph_data_type_id_t.FLOAT64 else: raise RuntimeError("Internal error: got invalid data type enum value " f"from Numpy: {numpy_type}") cdef get_c_weight_type_from_numpy_edge_ids_type(numpy_type): if numpy_type == numpy.int32: - return data_type_id_t.FLOAT32 + return cugraph_data_type_id_t.FLOAT32 else: - return data_type_id_t.FLOAT64 + return cugraph_data_type_id_t.FLOAT64 -cdef get_numpy_edge_ids_type_from_c_weight_type(data_type_id_t c_weight_type): - if c_weight_type == data_type_id_t.FLOAT32: +cdef get_numpy_edge_ids_type_from_c_weight_type(cugraph_data_type_id_t c_weight_type): + if c_weight_type == cugraph_data_type_id_t.FLOAT32: return numpy.int32 else: return numpy.int64 diff --git a/python/pylibcugraph/pylibcugraph/weakly_connected_components.pyx b/python/pylibcugraph/pylibcugraph/weakly_connected_components.pyx index c9f62be389d..5da8c7065c9 100644 --- a/python/pylibcugraph/pylibcugraph/weakly_connected_components.pyx +++ b/python/pylibcugraph/pylibcugraph/weakly_connected_components.pyx @@ -16,8 +16,10 @@ from pylibcugraph import GraphProperties, SGGraph -from pylibcugraph._cugraph_c.resource_handle cimport ( +from pylibcugraph._cugraph_c.types cimport ( bool_t, +) +from pylibcugraph._cugraph_c.resource_handle cimport ( cugraph_resource_handle_t, ) from pylibcugraph._cugraph_c.error cimport ( From 050d524d88c27cce6d91c6ec4f26350d1fd9b3bb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 30 Oct 2024 17:30:58 -0500 Subject: [PATCH 10/14] print sccache stats in builds (#4719) Contributes to https://github.com/rapidsai/build-planning/issues/111 Proposes some small packaging/CI changes, matching similar changes being made across RAPIDS. * printing `sccache` stats to CI logs * updating to the latest `rapids-dependency-file-generator` (v1.16.0) * always explicitly specifying `cpp` / `python` in calls to `rapids-upload-wheels-to-s3` ## Notes for Reviewers This originally also ran wheel builds with `--no-build-isolation`, but I reverted that based on https://github.com/rapidsai/build-planning/issues/108#issuecomment-2436764212. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: https://github.com/rapidsai/cugraph/pull/4719 --- .pre-commit-config.yaml | 2 +- ci/build_cpp.sh | 2 ++ ci/build_python.sh | 7 +++++++ ci/build_wheel.sh | 10 ++++++++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3687562b48e..b5fbcf9ad42 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,7 +55,7 @@ repos: setup[.]cfg$ - id: verify-alpha-spec - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.13.11 + rev: v1.16.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 859977d76d5..93e5c680d07 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -17,4 +17,6 @@ rapids-logger "Begin cpp build" RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcugraph +sccache --show-adv-stats + rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index c94cc2a0fce..af9c3c56403 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -20,6 +20,8 @@ export RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-logger "Begin py build" +sccache --zero-stats + # TODO: Remove `--no-test` flags once importing on a CPU # node works correctly rapids-conda-retry mambabuild \ @@ -27,12 +29,17 @@ rapids-conda-retry mambabuild \ --channel "${CPP_CHANNEL}" \ conda/recipes/pylibcugraph +sccache --show-adv-stats +sccache --zero-stats + rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph +sccache --show-adv-stats + # NOTE: nothing in nx-cugraph is CUDA-specific, but it is built on each CUDA # platform to ensure it is included in each set of artifacts, since test # scripts only install from one set of artifacts based on the CUDA version used diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index f3979ab3049..944975c55ee 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -15,6 +15,10 @@ rapids-generate-version > ./VERSION cd "${package_dir}" +sccache --zero-stats + +rapids-logger "Building '${package_name}' wheel" + python -m pip wheel \ -w dist \ -v \ @@ -23,12 +27,14 @@ python -m pip wheel \ --extra-index-url https://pypi.nvidia.com \ . +sccache --show-adv-stats + # pure-python packages should be marked as pure, and not have auditwheel run on them. if [[ ${package_name} == "nx-cugraph" ]] || \ [[ ${package_name} == "cugraph-dgl" ]] || \ [[ ${package_name} == "cugraph-pyg" ]] || \ [[ ${package_name} == "cugraph-equivariant" ]]; then - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 dist + RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist else case "${RAPIDS_CUDA_VERSION}" in 12.*) @@ -48,5 +54,5 @@ else mkdir -p final_dist python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/* - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 final_dist + RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist fi From 0e57e65afab421edec4d72ed2b5920b295c38a68 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 7 Nov 2024 15:23:44 -0500 Subject: [PATCH 11/14] Put a ceiling on cuda-python (#4747) This project is incompatible with newer versions of `cuda-python`. This puts ceilings of `<=11.8.3` (CUDA 11) and `<=12.6.0` (CUDA 12) on that library. Those ceilings should be removed and replaced with `!=` constraints once new releases of `cuda-python` are up that this project is compatible with. See https://github.com/rapidsai/build-planning/issues/116 for more information. Authors: - Bradley Dice (https://github.com/bdice) - James Lamb (https://github.com/jameslamb) Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/cugraph/pull/4747 --- conda/recipes/cugraph/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index 9f5a137faba..5a13ba30fd0 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -75,10 +75,10 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit - - cuda-python >=11.7.1,<12.0a0 + - cuda-python >=11.7.1,<12.0a0,<=11.8.3 {% else %} - cuda-cudart - - cuda-python >=12.0,<13.0a0 + - cuda-python >=12.0,<13.0a0,<=12.6.0 {% endif %} - cudf ={{ minor_version }} - cupy >=12.0.0 From 2d1189b82b134cd5e319b0a6456ef723c2ac8de6 Mon Sep 17 00:00:00 2001 From: Chuck Hastings <45364586+ChuckHastings@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:24:33 -0500 Subject: [PATCH 12/14] Remove CMake/C++ references to cugraph-ops (#4744) Delete deprecated cugraph-ops functionality, clean up references to cugraph-ops. Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - James Lamb (https://github.com/jameslamb) - Bradley Dice (https://github.com/bdice) - Seunghwa Kang (https://github.com/seunghwak) - Rick Ratzel (https://github.com/rlratzel) URL: https://github.com/rapidsai/cugraph/pull/4744 --- build.sh | 11 +- cpp/CMakeLists.txt | 23 ---- cpp/cmake/thirdparty/get_libcugraphops.cmake | 83 ------------ cpp/include/cugraph/algorithms.hpp | 74 +---------- .../sample_and_compute_local_nbr_indices.cuh | 11 +- ...r_v_random_select_transform_outgoing_e.cuh | 6 - cpp/src/sampling/neighbor_sampling_impl.hpp | 7 - cpp/src/sampling/neighborhood.cu | 122 ------------------ cpp/tests/c_api/biased_neighbor_sample_test.c | 10 -- .../c_api/mg_biased_neighbor_sample_test.c | 20 --- .../c_api/mg_uniform_neighbor_sample_test.c | 20 --- .../c_api/uniform_neighbor_sample_test.c | 10 -- .../sampling/mg_uniform_neighbor_sampling.cpp | 22 ---- .../sampling/uniform_neighbor_sampling.cpp | 21 --- python/cugraph/CMakeLists.txt | 9 -- .../cugraph/tests/docs/test_doctests.py | 9 +- python/cugraph/pytest.ini | 1 - 17 files changed, 6 insertions(+), 453 deletions(-) delete mode 100644 cpp/cmake/thirdparty/get_libcugraphops.cmake delete mode 100644 cpp/src/sampling/neighborhood.cu diff --git a/build.sh b/build.sh index 24ce8c08e8d..29abd48166a 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,6 @@ VALIDARGS=" --pydevelop --allgpuarch --skip_cpp_tests - --without_cugraphops --cmake_default_generator --clean -h @@ -74,7 +73,6 @@ HELP="$0 [ ...] [ ...] --pydevelop - install the Python packages in editable mode --allgpuarch - build for all supported GPU architectures --skip_cpp_tests - do not build the SG test binaries as part of the libcugraph and libcugraph_etl targets - --without_cugraphops - do not build algos that require cugraph-ops --cmake_default_generator - use the default cmake generator instead of ninja --clean - clean an individual target (note: to do a complete rebuild, use the clean target described above) -h - print this text @@ -107,7 +105,6 @@ BUILD_CPP_TESTS=ON BUILD_CPP_MG_TESTS=OFF BUILD_CPP_MTMG_TESTS=OFF BUILD_ALL_GPU_ARCH=0 -BUILD_WITH_CUGRAPHOPS=ON CMAKE_GENERATOR_OPTION="-G Ninja" PYTHON_ARGS_FOR_INSTALL="-m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true" @@ -170,9 +167,6 @@ fi if hasArg --skip_cpp_tests; then BUILD_CPP_TESTS=OFF fi -if hasArg --without_cugraphops; then - BUILD_WITH_CUGRAPHOPS=OFF -fi if hasArg cpp-mtmgtests; then BUILD_CPP_MTMG_TESTS=ON fi @@ -268,7 +262,6 @@ if buildDefault || hasArg libcugraph || hasArg all; then -DBUILD_TESTS=${BUILD_CPP_TESTS} \ -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS} \ -DBUILD_CUGRAPH_MTMG_TESTS=${BUILD_CPP_MTMG_TESTS} \ - -DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS} \ ${CMAKE_GENERATOR_OPTION} \ ${CMAKE_VERBOSE_OPTION} cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} ${INSTALL_TARGET} ${VERBOSE_FLAG} @@ -312,7 +305,7 @@ if buildDefault || hasArg pylibcugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/pylibcugraph else - SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ + SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS}" \ python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/pylibcugraph fi fi @@ -322,7 +315,7 @@ if buildDefault || hasArg cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph else - SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ + SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS}" \ python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph fi fi diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index fc3dbb57e1f..2cea2e504ab 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -54,17 +54,11 @@ option(BUILD_SHARED_LIBS "Build cuGraph shared libraries" ON) option(BUILD_CUGRAPH_MG_TESTS "Build cuGraph multigpu algorithm tests" OFF) option(CMAKE_CUDA_LINEINFO "Enable the -lineinfo option for nvcc (useful for cuda-memcheck / profiler" OFF) option(BUILD_TESTS "Configure CMake to build tests" ON) -option(USE_CUGRAPH_OPS "Enable all functions that call cugraph-ops" ON) option(USE_RAFT_STATIC "Build raft as a static library" OFF) option(CUGRAPH_COMPILE_RAFT_LIB "Compile the raft library instead of using it header-only" ON) option(CUDA_STATIC_RUNTIME "Statically link the CUDA toolkit runtime and libraries" OFF) -option(CUGRAPH_USE_CUGRAPH_OPS_STATIC "Build and statically link the cugraph-ops library" OFF) -option(CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL "Exclude cugraph-ops targets from cuGraph's 'all' target" OFF) -option(ALLOW_CLONE_CUGRAPH_OPS "Whether to attempt to clone cugraph-ops when a local version is not available" OFF) message(VERBOSE "CUGRAPH: CUDA_STATIC_RUNTIME=${CUDA_STATIC_RUNTIME}") -message(VERBOSE "CUGRAPH: CUGRAPH_USE_CUGRAPH_OPS_STATIC=${CUGRAPH_USE_CUGRAPH_OPS_STATIC}") -message(VERBOSE "CUGRAPH: CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL=${CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL}") ################################################################################ # - compiler options ----------------------------------------------------------- @@ -115,13 +109,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug) list(APPEND CUGRAPH_CUDA_FLAGS -G -Xcompiler=-rdynamic) endif() -if(NOT USE_CUGRAPH_OPS) - message(STATUS "Disabling functions that reference cugraph-ops") - list(APPEND CUGRAPH_C_FLAGS -DNO_CUGRAPH_OPS) - list(APPEND CUGRAPH_CXX_FLAGS -DNO_CUGRAPH_OPS) - list(APPEND CUGRAPH_CUDA_FLAGS -DNO_CUGRAPH_OPS) -endif() - ################################################################################################### # - find CPM based dependencies ------------------------------------------------------------------ @@ -151,10 +138,6 @@ include(${rapids-cmake-dir}/cpm/cuco.cmake) rapids_cpm_cuco(BUILD_EXPORT_SET cugraph-exports INSTALL_EXPORT_SET cugraph-exports) include(cmake/thirdparty/get_raft.cmake) -if(USE_CUGRAPH_OPS) - include(cmake/thirdparty/get_libcugraphops.cmake) -endif() - if(BUILD_TESTS) include(${rapids-cmake-dir}/cpm/gtest.cmake) rapids_cpm_gtest(BUILD_STATIC) @@ -438,12 +421,6 @@ set(CUGRAPH_SOURCES src/mtmg/vertex_pairs_result_mg_v64_e64.cu ) -if(USE_CUGRAPH_OPS) - list(APPEND CUGRAPH_SOURCES - src/sampling/neighborhood.cu - ) -endif() - add_library(cugraph ${CUGRAPH_SOURCES}) set_target_properties(cugraph diff --git a/cpp/cmake/thirdparty/get_libcugraphops.cmake b/cpp/cmake/thirdparty/get_libcugraphops.cmake deleted file mode 100644 index b10af300a98..00000000000 --- a/cpp/cmake/thirdparty/get_libcugraphops.cmake +++ /dev/null @@ -1,83 +0,0 @@ -#============================================================================= -# Copyright (c) 2022, NVIDIA CORPORATION. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -set(CUGRAPH_MIN_VERSION_cugraph_ops "${CUGRAPH_VERSION_MAJOR}.${CUGRAPH_VERSION_MINOR}.00") - -if(NOT DEFINED CUGRAPH_CUGRAPH_OPS_VERSION) - set(CUGRAPH_CUGRAPH_OPS_VERSION "${CUGRAPH_VERSION_MAJOR}.${CUGRAPH_VERSION_MINOR}") -endif() - -if(NOT DEFINED CUGRAPH_CUGRAPH_OPS_BRANCH) - set(CUGRAPH_CUGRAPH_OPS_BRANCH "branch-${CUGRAPH_CUGRAPH_OPS_VERSION}") -endif() - -if(NOT DEFINED CUGRAPH_CUGRAPH_OPS_REPOSITORY) - set(CUGRAPH_CUGRAPH_OPS_REPOSITORY "git@github.com:rapidsai/cugraph-ops.git") -endif() - -function(find_and_configure_cugraph_ops) - - set(oneValueArgs VERSION REPO PINNED_TAG BUILD_STATIC EXCLUDE_FROM_ALL ALLOW_CLONE_CUGRAPH_OPS) - cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN}) - - if(PKG_ALLOW_CLONE_CUGRAPH_OPS) - if(NOT PKG_PINNED_TAG STREQUAL "branch-${CUGRAPH_CUGRAPH_OPS_VERSION}") - message("Pinned tag found: ${PKG_PINNED_TAG}. Cloning cugraph-ops locally.") - set(CPM_DOWNLOAD_cugraph-ops ON) - elseif(PKG_BUILD_STATIC AND (NOT CPM_cugraph-ops_SOURCE)) - message(STATUS "CUGRAPH: Cloning cugraph-ops locally to build static libraries.") - set(CPM_DOWNLOAD_cugraph-ops ON) - endif() - endif() - - set(CUGRAPH_OPS_BUILD_SHARED_LIBS ON) - if(PKG_BUILD_STATIC) - set(CUGRAPH_OPS_BUILD_SHARED_LIBS OFF) - endif() - - rapids_cpm_find(cugraph-ops ${PKG_VERSION} REQUIRED - GLOBAL_TARGETS cugraph-ops::cugraph-ops++ - BUILD_EXPORT_SET cugraph-exports - INSTALL_EXPORT_SET cugraph-exports - CPM_ARGS - SOURCE_SUBDIR cpp - GIT_REPOSITORY ${PKG_REPO} - GIT_TAG ${PKG_PINNED_TAG} - EXCLUDE_FROM_ALL ${PKG_EXCLUDE_FROM_ALL} - OPTIONS - "BUILD_CUGRAPH_OPS_CPP_TESTS OFF" - "BUILD_SHARED_LIBS ${CUGRAPH_OPS_BUILD_SHARED_LIBS}" - ) -endfunction() - -### -# Change pinned tag and fork here to test a commit in CI -# -# To use a locally-built cugraph-ops package, set the CMake variable -# `-D cugraph-ops_ROOT=/path/to/cugraph-ops/build` -### -find_and_configure_cugraph_ops(VERSION ${CUGRAPH_MIN_VERSION_cugraph_ops} - REPO ${CUGRAPH_CUGRAPH_OPS_REPOSITORY} - PINNED_TAG ${CUGRAPH_CUGRAPH_OPS_BRANCH} - BUILD_STATIC ${CUGRAPH_USE_CUGRAPH_OPS_STATIC} - EXCLUDE_FROM_ALL ${CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL} - # Allow cloning cugraph-ops in cases when we - # expect the local copy of cugraph-ops to not be - # the one that we want. Cases include static - # linking such that we need to compile a static - # lib or during development when using a - # different branch of cugraph-ops. - ALLOW_CLONE_CUGRAPH_OPS ${ALLOW_CLONE_CUGRAPH_OPS}) diff --git a/cpp/include/cugraph/algorithms.hpp b/cpp/include/cugraph/algorithms.hpp index 7e5af4ac686..60f4d21822f 100644 --- a/cpp/include/cugraph/algorithms.hpp +++ b/cpp/include/cugraph/algorithms.hpp @@ -23,16 +23,12 @@ #include #include -#include - -#ifndef NO_CUGRAPH_OPS -#include -#endif - #include #include #include +#include + #include #include @@ -1678,72 +1674,6 @@ node2vec_random_walks(raft::handle_t const& handle, weight_t p, weight_t q); -#ifndef NO_CUGRAPH_OPS -/** - * @brief generate sub-sampled graph as an adjacency list (CSR format) given input graph, - * list of vertices and sample size per vertex. The output graph consists of the given - * vertices with each vertex having at most `sample_size` neighbors from the original graph - * - * @deprecated This API will be deprecated. uniform_neighbor_sample can be used instead. - * - * @tparam graph_t Type of input graph/view (typically, graph_view_t, non-transposed and - * single-gpu). - * @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and - * handles to various CUDA libraries) to run graph algorithms. - * @param rng_state The RngState instance holding pseudo-random number generator state. - * @param graph Graph (view )object to sub-sample. - * @param ptr_d_start Device pointer to set of starting vertex indices for the sub-sampling. - * @param num_start_vertices = number(vertices) to use for sub-sampling. - * @param sampling_size = max number of neighbors per output vertex. - * @param sampling_algo = the sampling algorithm (algo R/algo L/etc.) used to produce outputs. - * @return std::tuple, - * rmm::device_uvector> - * Tuple consisting of two arrays representing the offsets and indices of - * the sub-sampled graph. - */ -template -std::tuple, rmm::device_uvector> -sample_neighbors_adjacency_list(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - vertex_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); - -/** - * @brief generate sub-sampled graph as an edge list (COO format) given input graph, - * list of vertices and sample size per vertex. The output graph consists of the given - * vertices with each vertex having at most `sample_size` neighbors from the original graph - * - * @deprecated This API will be deprecated. uniform_neighbor_sample can be used instead. - * - * @tparam graph_t Type of input graph/view (typically, graph_view_t, non-transposed and - * single-gpu). - * @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and - * handles to various CUDA libraries) to run graph algorithms. - * @param rng_state The RngState instance holding pseudo-random number generator state. - * @param graph Graph (view )object to sub-sample. - * @param ptr_d_start Device pointer to set of starting vertex indices for the sub-sampling. - * @param num_start_vertices = number(vertices) to use for sub-sampling. - * @param sampling_size = max number of neighbors per output vertex. - * @param sampling_algo = the sampling algorithm (algo R/algo L/etc.) used to produce outputs. - * @return std::tuple, - * rmm::device_uvector> - * Tuple consisting of two arrays representing the source and destination nodes of - * the sub-sampled graph. - */ -template -std::tuple, rmm::device_uvector> sample_neighbors_edgelist( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - vertex_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); -#endif - /** * @brief Finds (weakly-connected-)component IDs of each vertices in the input graph. * diff --git a/cpp/src/prims/detail/sample_and_compute_local_nbr_indices.cuh b/cpp/src/prims/detail/sample_and_compute_local_nbr_indices.cuh index a6a164d36c1..5ebc3dc8aea 100644 --- a/cpp/src/prims/detail/sample_and_compute_local_nbr_indices.cuh +++ b/cpp/src/prims/detail/sample_and_compute_local_nbr_indices.cuh @@ -597,7 +597,6 @@ rmm::device_uvector compute_uniform_sampling_index_without_replacement( raft::random::RngState& rng_state, size_t K) { -#ifndef NO_CUGRAPH_OPS assert(cugraph::invalid_edge_id_v == cugraph::ops::graph::INVALID_ID); edge_t mid_partition_degree_range_last = static_cast(K * 10); // tuning parameter @@ -978,9 +977,6 @@ rmm::device_uvector compute_uniform_sampling_index_without_replacement( frontier_degrees.shrink_to_fit(handle.get_stream()); return nbr_indices; -#else - CUGRAPH_FAIL("unimplemented."); -#endif } template @@ -1572,7 +1568,7 @@ uniform_sample_and_compute_local_nbr_indices( bool with_replacement) { using edge_t = typename GraphViewType::edge_type; -#ifndef NO_CUGRAPH_OPS + assert(cugraph::invalid_edge_id_v == cugraph::ops::graph::INVALID_ID); using vertex_t = typename GraphViewType::vertex_type; @@ -1673,11 +1669,6 @@ uniform_sample_and_compute_local_nbr_indices( return std::make_tuple( std::move(local_nbr_indices), std::move(key_indices), std::move(local_frontier_sample_offsets)); -#else - CUGRAPH_FAIL("unimplemented."); - return std::make_tuple( - rmm::device_uvector(0, handle.get_stream()), std::nullopt, std::vector()); -#endif } template invalid_value, bool do_expensive_check) { -#ifndef NO_CUGRAPH_OPS using vertex_t = typename GraphViewType::vertex_type; using edge_t = typename GraphViewType::edge_type; using key_t = typename VertexFrontierBucketType::key_type; @@ -590,11 +589,6 @@ per_v_random_select_transform_e(raft::handle_t const& handle, } return std::make_tuple(std::move(sample_offsets), std::move(sample_e_op_results)); -#else - CUGRAPH_FAIL("unimplemented."); - return std::make_tuple(std::nullopt, - allocate_dataframe_buffer(size_t{0}, rmm::cuda_stream_view{})); -#endif } } // namespace detail diff --git a/cpp/src/sampling/neighbor_sampling_impl.hpp b/cpp/src/sampling/neighbor_sampling_impl.hpp index 1785f934426..d8e8cc2b756 100644 --- a/cpp/src/sampling/neighbor_sampling_impl.hpp +++ b/cpp/src/sampling/neighbor_sampling_impl.hpp @@ -67,12 +67,6 @@ neighbor_sample_impl( raft::random::RngState& rng_state, bool do_expensive_check) { -#ifdef NO_CUGRAPH_OPS // FIXME: this is relevant only when edge_bias_view.has_value() is false, - // this ifdef statement will be removed once we migrate relevant cugraph-ops - // functions to cugraph - CUGRAPH_FAIL( - "neighbor_sample_impl not supported in this configuration, built with NO_CUGRAPH_OPS"); -#else static_assert(std::is_floating_point_v); CUGRAPH_EXPECTS(fan_out.size() > 0, "Invalid input argument: number of levels must be non-zero."); @@ -336,7 +330,6 @@ neighbor_sample_impl( std::move(result_hops), std::move(result_labels), label_to_output_comm_rank); -#endif } } // namespace detail diff --git a/cpp/src/sampling/neighborhood.cu b/cpp/src/sampling/neighborhood.cu deleted file mode 100644 index e75b08136ea..00000000000 --- a/cpp/src/sampling/neighborhood.cu +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2021-2024, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "utilities/cugraph_ops_utils.hpp" - -#include -#include - -#include - -#include - -namespace cugraph { - -template -std::tuple, rmm::device_uvector> -sample_neighbors_adjacency_list(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - vertex_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo) -{ - using base_vertex_t = std::decay_t; - using base_edge_t = std::decay_t; - static_assert(std::is_same_v, - "cugraph-ops sampling not yet implemented for different node and edge types"); - - const auto ops_graph = detail::get_graph(graph_view); - return ops::graph::uniform_sample_csc(rng_state, - ops_graph, - ptr_d_start, - num_start_vertices, - sampling_size, - sampling_algo, - ops_graph.dst_max_in_degree, - handle.get_stream()); -} - -template -std::tuple, rmm::device_uvector> sample_neighbors_edgelist( - raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& graph_view, - vertex_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo) -{ - using base_vertex_t = std::decay_t; - using base_edge_t = std::decay_t; - static_assert(std::is_same_v, - "cugraph-ops sampling not yet implemented for different node and edge types"); - - const auto ops_graph = detail::get_graph(graph_view); - return ops::graph::uniform_sample_coo(rng_state, - ops_graph, - ptr_d_start, - num_start_vertices, - sampling_size, - sampling_algo, - ops_graph.dst_max_in_degree, - handle.get_stream()); -} - -// template explicit instantiation directives (EIDir's): -// -// CSR SG FP32{ -template std::tuple, rmm::device_uvector> -sample_neighbors_adjacency_list(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& gview, - int32_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); - -template std::tuple, rmm::device_uvector> -sample_neighbors_adjacency_list(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& gview, - int64_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); -//} -// -// COO SG FP32{ -template std::tuple, rmm::device_uvector> -sample_neighbors_edgelist(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& gview, - int32_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); - -template std::tuple, rmm::device_uvector> -sample_neighbors_edgelist(raft::handle_t const& handle, - raft::random::RngState& rng_state, - graph_view_t const& gview, - int64_t const* ptr_d_start, - size_t num_start_vertices, - size_t sampling_size, - ops::graph::SamplingAlgoT sampling_algo); -//} - -} // namespace cugraph diff --git a/cpp/tests/c_api/biased_neighbor_sample_test.c b/cpp/tests/c_api/biased_neighbor_sample_test.c index 6f0af3a8e0d..e0c9945e091 100644 --- a/cpp/tests/c_api/biased_neighbor_sample_test.c +++ b/cpp/tests/c_api/biased_neighbor_sample_test.c @@ -149,10 +149,6 @@ int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -459,7 +455,6 @@ int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -584,10 +579,6 @@ int test_biased_neighbor_sample_with_labels(const cugraph_resource_handle_t* han &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -678,7 +669,6 @@ int test_biased_neighbor_sample_with_labels(const cugraph_resource_handle_t* han cugraph_sample_result_free(result); cugraph_sampling_options_free(sampling_options); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); diff --git a/cpp/tests/c_api/mg_biased_neighbor_sample_test.c b/cpp/tests/c_api/mg_biased_neighbor_sample_test.c index f7103d1e39d..ba06ffb254d 100644 --- a/cpp/tests/c_api/mg_biased_neighbor_sample_test.c +++ b/cpp/tests/c_api/mg_biased_neighbor_sample_test.c @@ -142,10 +142,6 @@ int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -430,7 +426,6 @@ int generic_biased_neighbor_sample_test(const cugraph_resource_handle_t* handle, } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -576,10 +571,6 @@ int test_biased_neighbor_from_alex(const cugraph_resource_handle_t* handle) &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed"); -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -673,7 +664,6 @@ int test_biased_neighbor_from_alex(const cugraph_resource_handle_t* handle) M[h_srcs[i]][h_dsts[i]] >= 0, "biased_neighbor_sample got edge that doesn't exist"); } -#endif cugraph_sample_result_free(result); @@ -854,10 +844,6 @@ int test_biased_neighbor_sample_alex_bug(const cugraph_resource_handle_t* handle &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -939,7 +925,6 @@ int test_biased_neighbor_sample_alex_bug(const cugraph_resource_handle_t* handle test_ret_value, result_offsets_size == expected_size[rank], "incorrect number of results"); cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -1114,10 +1099,6 @@ int test_biased_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* han &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "biased_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "biased_neighbor_sample failed."); @@ -1219,7 +1200,6 @@ int test_biased_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* han } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); diff --git a/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c b/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c index f9388a2e565..7322b7379d3 100644 --- a/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c +++ b/cpp/tests/c_api/mg_uniform_neighbor_sample_test.c @@ -141,10 +141,6 @@ int generic_uniform_neighbor_sample_test(const cugraph_resource_handle_t* handle &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -429,7 +425,6 @@ int generic_uniform_neighbor_sample_test(const cugraph_resource_handle_t* handle } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -574,10 +569,6 @@ int test_uniform_neighbor_from_alex(const cugraph_resource_handle_t* handle) &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed"); -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -671,7 +662,6 @@ int test_uniform_neighbor_from_alex(const cugraph_resource_handle_t* handle) M[h_srcs[i]][h_dsts[i]] >= 0, "uniform_neighbor_sample got edge that doesn't exist"); } -#endif cugraph_sample_result_free(result); @@ -851,10 +841,6 @@ int test_uniform_neighbor_sample_alex_bug(const cugraph_resource_handle_t* handl &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -936,7 +922,6 @@ int test_uniform_neighbor_sample_alex_bug(const cugraph_resource_handle_t* handl test_ret_value, result_offsets_size == expected_size[rank], "incorrect number of results"); cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -1110,10 +1095,6 @@ int test_uniform_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* ha &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -1215,7 +1196,6 @@ int test_uniform_neighbor_sample_sort_by_hop(const cugraph_resource_handle_t* ha } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); diff --git a/cpp/tests/c_api/uniform_neighbor_sample_test.c b/cpp/tests/c_api/uniform_neighbor_sample_test.c index 931d1fbfe07..d37c8b9ffdc 100644 --- a/cpp/tests/c_api/uniform_neighbor_sample_test.c +++ b/cpp/tests/c_api/uniform_neighbor_sample_test.c @@ -148,10 +148,6 @@ int generic_uniform_neighbor_sample_test(const cugraph_resource_handle_t* handle &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -458,7 +454,6 @@ int generic_uniform_neighbor_sample_test(const cugraph_resource_handle_t* handle } cugraph_sample_result_free(result); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); @@ -674,10 +669,6 @@ int test_uniform_neighbor_sample_with_labels(const cugraph_resource_handle_t* ha &result, &ret_error); -#ifdef NO_CUGRAPH_OPS - TEST_ASSERT( - test_ret_value, ret_code != CUGRAPH_SUCCESS, "uniform_neighbor_sample should have failed") -#else TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, cugraph_error_message(ret_error)); TEST_ASSERT(test_ret_value, ret_code == CUGRAPH_SUCCESS, "uniform_neighbor_sample failed."); @@ -768,7 +759,6 @@ int test_uniform_neighbor_sample_with_labels(const cugraph_resource_handle_t* ha cugraph_sample_result_free(result); cugraph_sampling_options_free(sampling_options); -#endif cugraph_graph_free(graph); cugraph_error_free(ret_error); diff --git a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp index 0dd63e4fb06..dc9043e0c02 100644 --- a/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp +++ b/cpp/tests/sampling/mg_uniform_neighbor_sampling.cpp @@ -155,27 +155,6 @@ class Tests_MGUniform_Neighbor_Sampling random_sources.size(), handle_->get_stream()); -#ifdef NO_CUGRAPH_OPS - EXPECT_THROW( - cugraph::uniform_neighbor_sample( - *handle_, - mg_graph_view, - mg_edge_weight_view, - std::optional>{std::nullopt}, - std::optional>{std::nullopt}, - raft::device_span{random_sources_copy.data(), random_sources.size()}, - std::make_optional( - raft::device_span{batch_number.data(), batch_number.size()}), - std::make_optional(std::make_tuple( - raft::device_span{unique_batches.data(), unique_batches.size()}, - raft::device_span{comm_ranks.data(), comm_ranks.size()})), - raft::host_span(uniform_neighbor_sampling_usecase.fanout.data(), - uniform_neighbor_sampling_usecase.fanout.size()), - rng_state, - true, - uniform_neighbor_sampling_usecase.with_replacement), - std::exception); -#else if (cugraph::test::g_perf) { RAFT_CUDA_TRY(cudaDeviceSynchronize()); // for consistent performance measurement handle_->get_comms().barrier(); @@ -291,7 +270,6 @@ class Tests_MGUniform_Neighbor_Sampling } } } -#endif } private: diff --git a/cpp/tests/sampling/uniform_neighbor_sampling.cpp b/cpp/tests/sampling/uniform_neighbor_sampling.cpp index 87524b03acf..db4123d2476 100644 --- a/cpp/tests/sampling/uniform_neighbor_sampling.cpp +++ b/cpp/tests/sampling/uniform_neighbor_sampling.cpp @@ -131,26 +131,6 @@ class Tests_Uniform_Neighbor_Sampling std::optional, raft::device_span>> label_to_output_comm_rank_mapping{std::nullopt}; -#ifdef NO_CUGRAPH_OPS - EXPECT_THROW( - cugraph::uniform_neighbor_sample( - handle, - graph_view, - edge_weight_view, - std::optional>{std::nullopt}, - std::optional>{std::nullopt}, - raft::device_span{random_sources_copy.data(), random_sources.size()}, - batch_number ? std::make_optional(raft::device_span{batch_number->data(), - batch_number->size()}) - : std::nullopt, - label_to_output_comm_rank_mapping, - raft::host_span(uniform_neighbor_sampling_usecase.fanout.data(), - uniform_neighbor_sampling_usecase.fanout.size()), - rng_state, - true, - uniform_neighbor_sampling_usecase.flag_replacement), - std::exception); -#else if (cugraph::test::g_perf) { RAFT_CUDA_TRY(cudaDeviceSynchronize()); // for consistent performance measurement hr_timer.start("Uniform neighbor sampling"); @@ -224,7 +204,6 @@ class Tests_Uniform_Neighbor_Sampling uniform_neighbor_sampling_usecase.fanout.size())); } } -#endif } }; diff --git a/python/cugraph/CMakeLists.txt b/python/cugraph/CMakeLists.txt index ca38b5551c9..117f7cf5142 100644 --- a/python/cugraph/CMakeLists.txt +++ b/python/cugraph/CMakeLists.txt @@ -32,13 +32,8 @@ project( option(FIND_CUGRAPH_CPP "Search for existing CUGRAPH C++ installations before defaulting to local files" OFF ) -option(USE_CUGRAPH_OPS "Enable all functions that call cugraph-ops" ON) option(USE_CUDA_MATH_WHEELS "Use the CUDA math wheels instead of the system libraries" OFF) -if(NOT USE_CUGRAPH_OPS) - message(STATUS "Disabling libcugraph functions that reference cugraph-ops") - add_compile_definitions(NO_CUGRAPH_OPS) -endif() # If the user requested it, we attempt to find CUGRAPH. if(FIND_CUGRAPH_CPP) @@ -54,14 +49,10 @@ if(NOT cugraph_FOUND) set(BUILD_TESTS OFF) set(BUILD_CUGRAPH_MG_TESTS OFF) - set(BUILD_CUGRAPH_OPS_CPP_TESTS OFF) set(CUDA_STATIC_RUNTIME ON) set(CUDA_STATIC_MATH_LIBRARIES ON) set(USE_RAFT_STATIC ON) set(CUGRAPH_COMPILE_RAFT_LIB ON) - set(CUGRAPH_USE_CUGRAPH_OPS_STATIC ON) - set(CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL ON) - set(ALLOW_CLONE_CUGRAPH_OPS ON) if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.0) set(CUDA_STATIC_MATH_LIBRARIES OFF) diff --git a/python/cugraph/cugraph/tests/docs/test_doctests.py b/python/cugraph/cugraph/tests/docs/test_doctests.py index 44ab16410ca..2095fd41fe9 100644 --- a/python/cugraph/cugraph/tests/docs/test_doctests.py +++ b/python/cugraph/cugraph/tests/docs/test_doctests.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -186,11 +186,4 @@ def test_docstring(self, docstring): f"{docstring.name}:\n{doctest_stdout.getvalue()}" ) except AssertionError: - # If some failed but all the failures were due to lack of - # cugraph-ops support, we can skip. - out = doctest_stdout.getvalue() - if ("CUGRAPH_UNKNOWN_ERROR" in out and "unimplemented" in out) or ( - "built with NO_CUGRAPH_OPS" in out - ): - pytest.skip("Doctest requires cugraph-ops support.") raise diff --git a/python/cugraph/pytest.ini b/python/cugraph/pytest.ini index 2f01a0cc51b..5cbc4631664 100644 --- a/python/cugraph/pytest.ini +++ b/python/cugraph/pytest.ini @@ -41,7 +41,6 @@ markers = nx_types: use NetworkX input types matrix_types: use SciPy/CuPy matrix input types slow: slow-running tests/benchmarks - cugraph_ops: Tests requiring cugraph-ops mg: Test MG code paths - number of gpu > 1 sg: Test SG code paths and dask sg tests - number of gpu == 1 ci: Tests that should be run in ci From a5fdc8be19f23fc3cac8f10e4eb6ea881ac9c730 Mon Sep 17 00:00:00 2001 From: Ralph Liu <137829296+nv-rliu@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:27:28 -0500 Subject: [PATCH 13/14] Remove `nx-cugraph` build/test/publish from cugraph (#4748) Closes https://github.com/rapidsai/graph_dl/issues/646 As part of the repo migration effort, this PR removes steps relevant to build/test/publish of `nx-cugraph` from this repo. Changes are ready but just to be safe **DO NOT MERGE** until we begin publishing packages from the new repo. Authors: - Ralph Liu (https://github.com/nv-rliu) Approvers: - James Lamb (https://github.com/jameslamb) - Ray Douglass (https://github.com/raydouglass) - Bradley Dice (https://github.com/bdice) - Erik Welch (https://github.com/eriknw) URL: https://github.com/rapidsai/cugraph/pull/4748 --- .github/workflows/build.yaml | 20 ---------------- .github/workflows/pr.yaml | 17 -------------- .github/workflows/test.yaml | 9 ------- ci/build_python.sh | 10 -------- ci/build_wheel.sh | 3 +-- ci/build_wheel_nx-cugraph.sh | 6 ----- ci/release/update-version.sh | 2 -- ci/run_nx_cugraph_pytests.sh | 10 -------- ci/test_python.sh | 39 ------------------------------- ci/test_wheel.sh | 9 ++----- ci/test_wheel_nx-cugraph.sh | 11 --------- ci/wheel_smoke_test_nx-cugraph.py | 38 ------------------------------ 12 files changed, 3 insertions(+), 171 deletions(-) delete mode 100755 ci/build_wheel_nx-cugraph.sh delete mode 100755 ci/run_nx_cugraph_pytests.sh delete mode 100755 ci/test_wheel_nx-cugraph.sh delete mode 100644 ci/wheel_smoke_test_nx-cugraph.py diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b272fb43e35..96387b13d11 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -113,26 +113,6 @@ jobs: sha: ${{ inputs.sha }} date: ${{ inputs.date }} package-name: cugraph - wheel-build-nx-cugraph: - needs: wheel-publish-pylibcugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel_nx-cugraph.sh - wheel-publish-nx-cugraph: - needs: wheel-build-nx-cugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: nx-cugraph wheel-build-cugraph-dgl: needs: wheel-publish-cugraph secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 0a33f5488a6..3797086ad5d 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -25,8 +25,6 @@ jobs: - wheel-tests-pylibcugraph - wheel-build-cugraph - wheel-tests-cugraph - - wheel-build-nx-cugraph - - wheel-tests-nx-cugraph - wheel-build-cugraph-dgl - wheel-tests-cugraph-dgl - wheel-build-cugraph-pyg @@ -167,21 +165,6 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cugraph.sh - wheel-build-nx-cugraph: - needs: wheel-tests-pylibcugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_nx-cugraph.sh - wheel-tests-nx-cugraph: - needs: [wheel-build-nx-cugraph, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_nx-cugraph.sh wheel-build-cugraph-dgl: needs: wheel-tests-cugraph secrets: inherit diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5fbdd276bd6..4e4caf11500 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -58,15 +58,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} script: ci/test_wheel_cugraph.sh - wheel-tests-nx-cugraph: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_nx-cugraph.sh wheel-tests-cugraph-dgl: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 diff --git a/ci/build_python.sh b/ci/build_python.sh index af9c3c56403..5ddd764737a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -40,16 +40,6 @@ rapids-conda-retry mambabuild \ sccache --show-adv-stats -# NOTE: nothing in nx-cugraph is CUDA-specific, but it is built on each CUDA -# platform to ensure it is included in each set of artifacts, since test -# scripts only install from one set of artifacts based on the CUDA version used -# for the test run. -rapids-conda-retry mambabuild \ - --no-test \ - --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - conda/recipes/nx-cugraph - # NOTE: nothing in the cugraph-service packages are CUDA-specific, but they are # built on each CUDA platform to ensure they are included in each set of # artifacts, since test scripts only install from one set of artifacts based on diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 944975c55ee..8c4eb94cf86 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -30,8 +30,7 @@ python -m pip wheel \ sccache --show-adv-stats # pure-python packages should be marked as pure, and not have auditwheel run on them. -if [[ ${package_name} == "nx-cugraph" ]] || \ - [[ ${package_name} == "cugraph-dgl" ]] || \ +if [[ ${package_name} == "cugraph-dgl" ]] || \ [[ ${package_name} == "cugraph-pyg" ]] || \ [[ ${package_name} == "cugraph-equivariant" ]]; then RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist diff --git a/ci/build_wheel_nx-cugraph.sh b/ci/build_wheel_nx-cugraph.sh deleted file mode 100755 index 4481de1283d..00000000000 --- a/ci/build_wheel_nx-cugraph.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright (c) 2023, NVIDIA CORPORATION. - -set -euo pipefail - -./ci/build_wheel.sh nx-cugraph python/nx-cugraph diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 5859ebde953..be1988e31dd 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -106,8 +106,6 @@ for FILE in .github/workflows/*.yaml; do sed_runner "s/dask-cuda.git@branch-[0-9][0-9].[0-9][0-9]/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/branch-.*/branch-${NEXT_SHORT_TAG}/g" python/nx-cugraph/README.md - # .devcontainer files find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}" diff --git a/ci/run_nx_cugraph_pytests.sh b/ci/run_nx_cugraph_pytests.sh deleted file mode 100755 index 0e309d1e2d4..00000000000 --- a/ci/run_nx_cugraph_pytests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -set -euo pipefail - -# Support invoking run_nx_cugraph_pytests.sh outside the script directory -cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/nx-cugraph/nx_cugraph - -NX_CUGRAPH_USE_COMPAT_GRAPHS=False pytest --capture=no --cache-clear --benchmark-disable "$@" tests -NX_CUGRAPH_USE_COMPAT_GRAPHS=True pytest --capture=no --cache-clear --benchmark-disable "$@" tests diff --git a/ci/test_python.sh b/ci/test_python.sh index 29b4c7be190..57d60bf42ed 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -39,7 +39,6 @@ rapids-mamba-retry install \ "libcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "pylibcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "nx-cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph-service-server=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph-service-client=${RAPIDS_VERSION_MAJOR_MINOR}.*" @@ -91,44 +90,6 @@ rapids-logger "pytest cugraph" rapids-logger "pytest cugraph benchmarks (run as tests)" ./ci/run_cugraph_benchmark_pytests.sh --verbose -rapids-logger "pytest nx-cugraph" -./ci/run_nx_cugraph_pytests.sh \ - --verbose \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-nx-cugraph.xml" \ - --cov-config=../../.coveragerc \ - --cov=nx_cugraph \ - --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/nx-cugraph-coverage.xml" \ - --cov-report=term - -rapids-logger "pytest networkx using nx-cugraph backend" -pushd python/nx-cugraph/nx_cugraph -../run_nx_tests.sh -# run_nx_tests.sh outputs coverage data, so check that total coverage is >0.0% -# in case nx-cugraph failed to load but fallback mode allowed the run to pass. -_coverage=$(coverage report|grep "^TOTAL") -echo "nx-cugraph coverage from networkx tests: $_coverage" -echo $_coverage | awk '{ if ($NF == "0.0%") exit 1 }' -# Ensure all algorithms were called by comparing covered lines to function lines. -# Run our tests again (they're fast enough) to add their coverage, then create coverage.json -NX_CUGRAPH_USE_COMPAT_GRAPHS=False pytest \ - --pyargs nx_cugraph \ - --config-file=../pyproject.toml \ - --cov-config=../pyproject.toml \ - --cov=nx_cugraph \ - --cov-append \ - --cov-report= -coverage report \ - --include="*/nx_cugraph/algorithms/*" \ - --omit=__init__.py \ - --show-missing \ - --rcfile=../pyproject.toml -coverage json --rcfile=../pyproject.toml -python -m nx_cugraph.tests.ensure_algos_covered -# Exercise (and show results of) scripts that show implemented networkx algorithms -python -m nx_cugraph.scripts.print_tree --dispatch-name --plc --incomplete --different -python -m nx_cugraph.scripts.print_table -popd - rapids-logger "pytest cugraph-service (single GPU)" ./ci/run_cugraph_service_pytests.sh \ --verbose \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index dfba25bbe1a..b5cd90996c7 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -10,12 +10,8 @@ python_package_name=$(echo ${package_name}|sed 's/-/_/g') mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -# nx-cugraph is a pure wheel, which is part of generating the download path -if [[ "${package_name}" == "nx-cugraph" ]]; then - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist -else - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -fi +RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist + # use 'ls' to expand wildcard before adding `[extra]` requires for pip # pip creates wheels using python package names python -m pip install $(ls ./dist/${python_package_name}*.whl)[test] @@ -36,7 +32,6 @@ else DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="1000s" \ DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="1000s" \ DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT="1000s" \ - NX_CUGRAPH_USE_COMPAT_GRAPHS=False \ python -m pytest \ -v \ --import-mode=append \ diff --git a/ci/test_wheel_nx-cugraph.sh b/ci/test_wheel_nx-cugraph.sh deleted file mode 100755 index 024169ae698..00000000000 --- a/ci/test_wheel_nx-cugraph.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Copyright (c) 2023-2024, NVIDIA CORPORATION. - -set -eoxu pipefail - -# Download wheels built during this job. -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-deps -python -m pip install ./local-deps/*.whl - -./ci/test_wheel.sh nx-cugraph diff --git a/ci/wheel_smoke_test_nx-cugraph.py b/ci/wheel_smoke_test_nx-cugraph.py deleted file mode 100644 index 10d26e3aac7..00000000000 --- a/ci/wheel_smoke_test_nx-cugraph.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2023, 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import math - -import networkx as nx -import nx_cugraph as nxcg - - -if __name__ == "__main__": - G = nx.Graph() - G.add_edges_from([(0, 1), (1, 2), (2, 3)]) - - nx_result = nx.betweenness_centrality(G) - # nx_cugraph is intended to be called via the NetworkX dispatcher, like - # this: - # nxcu_result = nx.betweenness_centrality(G, backend="cugraph") - # - # but here it is being called directly since the NetworkX version that - # supports the "backend" kwarg may not be available in the testing env. - nxcu_result = nxcg.betweenness_centrality(G) - - nx_nodes, nxcu_nodes = nx_result.keys(), nxcu_result.keys() - assert nxcu_nodes == nx_nodes - for node_id in nx_nodes: - nx_bc, nxcu_bc = nx_result[node_id], nxcu_result[node_id] - assert math.isclose(nx_bc, nxcu_bc, rel_tol=1e-6), \ - f"bc for {node_id=} exceeds tolerance: {nx_bc=}, {nxcu_bc=}" From c712a9857abac9d033fda41278cc07ce51059d34 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 14 Nov 2024 11:56:25 -0600 Subject: [PATCH 14/14] remove cugraph-dgl and cugraph-pyg building/testing/publishing (#4752) Similar to #4748, but for `cugraph-dgl` and `cugraph-pyg`. This PR removes all building, publishing, and testing code related to `cugraph-dgl` and `cugraph-pyg`. Those projects will very soon start publishing packages from https://github.com/rapidsai/cugraph-gnn instead. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Ralph Liu (https://github.com/nv-rliu) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cugraph/pull/4752 --- .github/workflows/build.yaml | 40 -------------- .github/workflows/pr.yaml | 36 ------------ .github/workflows/test.yaml | 20 ------- ci/build_python.sh | 23 -------- ci/build_wheel.sh | 4 +- ci/build_wheel_cugraph-dgl.sh | 6 -- ci/build_wheel_cugraph-pyg.sh | 6 -- ci/test_python.sh | 101 +--------------------------------- ci/test_wheel_cugraph-dgl.sh | 38 ------------- ci/test_wheel_cugraph-pyg.sh | 57 ------------------- 10 files changed, 3 insertions(+), 328 deletions(-) delete mode 100755 ci/build_wheel_cugraph-dgl.sh delete mode 100755 ci/build_wheel_cugraph-pyg.sh delete mode 100755 ci/test_wheel_cugraph-dgl.sh delete mode 100755 ci/test_wheel_cugraph-pyg.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 96387b13d11..9a055d1dc51 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -113,46 +113,6 @@ jobs: sha: ${{ inputs.sha }} date: ${{ inputs.date }} package-name: cugraph - wheel-build-cugraph-dgl: - needs: wheel-publish-cugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel_cugraph-dgl.sh - wheel-publish-cugraph-dgl: - needs: wheel-build-cugraph-dgl - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: cugraph-dgl - wheel-build-cugraph-pyg: - needs: wheel-publish-cugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel_cugraph-pyg.sh - wheel-publish-cugraph-pyg: - needs: wheel-build-cugraph-pyg - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: cugraph-pyg wheel-build-cugraph-equivariant: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3797086ad5d..bac56fec9f5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -25,10 +25,6 @@ jobs: - wheel-tests-pylibcugraph - wheel-build-cugraph - wheel-tests-cugraph - - wheel-build-cugraph-dgl - - wheel-tests-cugraph-dgl - - wheel-build-cugraph-pyg - - wheel-tests-cugraph-pyg - wheel-build-cugraph-equivariant - wheel-tests-cugraph-equivariant - devcontainer @@ -165,38 +161,6 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cugraph.sh - wheel-build-cugraph-dgl: - needs: wheel-tests-cugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_cugraph-dgl.sh - wheel-tests-cugraph-dgl: - needs: [wheel-build-cugraph-dgl, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_cugraph-dgl.sh - matrix_filter: map(select(.ARCH == "amd64")) - wheel-build-cugraph-pyg: - needs: wheel-tests-cugraph - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_cugraph-pyg.sh - wheel-tests-cugraph-pyg: - needs: [wheel-build-cugraph-pyg, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_cugraph-pyg.sh - matrix_filter: map(select(.ARCH == "amd64")) wheel-build-cugraph-equivariant: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4e4caf11500..245ac018cec 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -58,26 +58,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} script: ci/test_wheel_cugraph.sh - wheel-tests-cugraph-dgl: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_cugraph-dgl.sh - matrix_filter: map(select(.ARCH == "amd64")) - wheel-tests-cugraph-pyg: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_cugraph-pyg.sh - matrix_filter: map(select(.ARCH == "amd64")) wheel-tests-cugraph-equivariant: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 diff --git a/ci/build_python.sh b/ci/build_python.sh index 5ddd764737a..9a8f1227488 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -50,29 +50,6 @@ rapids-conda-retry mambabuild \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph-service -RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" - -if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then - # Only CUDA 11 is supported right now due to PyTorch requirement. - rapids-conda-retry mambabuild \ - --no-test \ - --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel pytorch \ - --channel pytorch-nightly \ - conda/recipes/cugraph-pyg - - # Only CUDA 11 is supported right now due to PyTorch requirement. - rapids-conda-retry mambabuild \ - --no-test \ - --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - --channel dglteam/label/th23_cu118 \ - --channel pytorch \ - --channel pytorch-nightly \ - conda/recipes/cugraph-dgl -fi - rapids-conda-retry mambabuild \ --no-test \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 8c4eb94cf86..3c89d63538c 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -30,9 +30,7 @@ python -m pip wheel \ sccache --show-adv-stats # pure-python packages should be marked as pure, and not have auditwheel run on them. -if [[ ${package_name} == "cugraph-dgl" ]] || \ - [[ ${package_name} == "cugraph-pyg" ]] || \ - [[ ${package_name} == "cugraph-equivariant" ]]; then +if [[ ${package_name} == "cugraph-equivariant" ]]; then RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist else case "${RAPIDS_CUDA_VERSION}" in diff --git a/ci/build_wheel_cugraph-dgl.sh b/ci/build_wheel_cugraph-dgl.sh deleted file mode 100755 index d62f810cba4..00000000000 --- a/ci/build_wheel_cugraph-dgl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -set -euo pipefail - -./ci/build_wheel.sh cugraph-dgl python/cugraph-dgl diff --git a/ci/build_wheel_cugraph-pyg.sh b/ci/build_wheel_cugraph-pyg.sh deleted file mode 100755 index 97baa243f73..00000000000 --- a/ci/build_wheel_cugraph-pyg.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -set -euo pipefail - -./ci/build_wheel.sh cugraph-pyg python/cugraph-pyg diff --git a/ci/test_python.sh b/ci/test_python.sh index 57d60bf42ed..a3a177dcfc6 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -100,109 +100,12 @@ rapids-logger "pytest cugraph-service (single GPU)" --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-service-coverage.xml" \ --cov-report=term -if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then - if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then - # we are only testing in a single cuda version - # because of pytorch and rapids compatibilty problems - rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_dgl - - # activate test_cugraph_dgl environment for dgl - set +u - conda activate test_cugraph_dgl - set -u - rapids-mamba-retry install \ - --channel "${CPP_CHANNEL}" \ - --channel "${PYTHON_CHANNEL}" \ - --channel conda-forge \ - --channel dglteam/label/th23_cu118 \ - --channel nvidia \ - "libcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "pylibcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "pylibcugraphops=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "cugraph-dgl=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - 'pytorch>=2.3,<2.4' \ - 'cuda-version=11.8' - - rapids-print-env - - rapids-logger "pytest cugraph_dgl (single GPU)" - ./ci/run_cugraph_dgl_pytests.sh \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-dgl.xml" \ - --cov-config=../../.coveragerc \ - --cov=cugraph_dgl \ - --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-dgl-coverage.xml" \ - --cov-report=term - - # Reactivate the test environment back - set +u - conda deactivate - conda activate test - set -u - else - rapids-logger "skipping cugraph_dgl pytest on ARM64" - fi -else - rapids-logger "skipping cugraph_dgl pytest on CUDA!=11.8" -fi - -if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then - if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then - rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_pyg - - # Temporarily allow unbound variables for conda activation. - set +u - conda activate test_cugraph_pyg - set -u - - rapids-print-env - - # TODO re-enable logic once CUDA 12 is testable - #if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then - CONDA_CUDA_VERSION="11.8" - PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu118.html" - #else - # CONDA_CUDA_VERSION="12.1" - # PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu121.html" - #fi - - # Will automatically install built dependencies of cuGraph-PyG - rapids-mamba-retry install \ - --channel "${CPP_CHANNEL}" \ - --channel "${PYTHON_CHANNEL}" \ - "cugraph-pyg=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "pytorch>=2.3,<2.4" \ - "ogb" - - rapids-print-env - - rapids-logger "pytest cugraph_pyg (single GPU)" - # rmat is not tested because of multi-GPU testing - ./ci/run_cugraph_pyg_pytests.sh \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-pyg.xml" \ - --cov-config=../../.coveragerc \ - --cov=cugraph_pyg \ - --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-pyg-coverage.xml" \ - --cov-report=term - - # Reactivate the test environment back - set +u - conda deactivate - conda activate test - set -u - else - rapids-logger "skipping cugraph_pyg pytest on ARM64" - fi -else - rapids-logger "skipping cugraph_pyg pytest on CUDA!=11.8" -fi - # test cugraph-equivariant if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then - # Reuse cugraph-dgl's test env for cugraph-equivariant + rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_equivariant set +u - conda activate test_cugraph_dgl + conda activate test_cugraph_equivariant set -u rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ diff --git a/ci/test_wheel_cugraph-dgl.sh b/ci/test_wheel_cugraph-dgl.sh deleted file mode 100755 index d7558d43b6d..00000000000 --- a/ci/test_wheel_cugraph-dgl.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -set -eoxu pipefail - -package_name="cugraph-dgl" - -mkdir -p ./dist -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" - -# Download the pylibcugraph, cugraph, and cugraph-dgl built in the previous step -RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-deps -RAPIDS_PY_WHEEL_NAME="cugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-deps -RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist - -# determine pytorch and DGL sources -PKG_CUDA_VER="$(echo ${CUDA_VERSION} | cut -d '.' -f1,2 | tr -d '.')" -PKG_CUDA_VER_MAJOR=${PKG_CUDA_VER:0:2} -if [[ "${PKG_CUDA_VER_MAJOR}" == "12" ]]; then - PYTORCH_CUDA_VER="121" -else - PYTORCH_CUDA_VER=$PKG_CUDA_VER -fi -PYTORCH_URL="https://download.pytorch.org/whl/cu${PYTORCH_CUDA_VER}" -DGL_URL="https://data.dgl.ai/wheels/torch-2.3/cu${PYTORCH_CUDA_VER}/repo.html" - -# echo to expand wildcard before adding `[extra]` requires for pip -python -m pip install \ - -v \ - --extra-index-url "${PYTORCH_URL}" \ - --find-links "${DGL_URL}" \ - "$(echo ./local-deps/pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \ - "$(echo ./local-deps/cugraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \ - "$(echo ./dist/cugraph_dgl_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" \ - 'dgl==2.4.0' \ - 'torch>=2.3.0,<2.4' - -python -m pytest python/cugraph-dgl/tests diff --git a/ci/test_wheel_cugraph-pyg.sh b/ci/test_wheel_cugraph-pyg.sh deleted file mode 100755 index 2f508ee830b..00000000000 --- a/ci/test_wheel_cugraph-pyg.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION. - -set -eoxu pipefail - -package_name="cugraph-pyg" - -mkdir -p ./dist -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" - -# Download the pylibcugraph, cugraph, and cugraph-pyg built in the previous step -RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-deps -RAPIDS_PY_WHEEL_NAME="cugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-deps -RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist - -# determine pytorch and pyg sources -if [[ "${CUDA_VERSION}" == "11.8.0" ]]; then - PYTORCH_URL="https://download.pytorch.org/whl/cu118" - PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu118.html" -else - PYTORCH_URL="https://download.pytorch.org/whl/cu121" - PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu121.html" -fi - -# echo to expand wildcard before adding `[extra]` requires for pip -python -m pip install \ - -v \ - --extra-index-url "${PYTORCH_URL}" \ - --find-links "${PYG_URL}" \ - "$(echo ./local-deps/pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \ - "$(echo ./local-deps/cugraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \ - "$(echo ./dist/cugraph_pyg_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" \ - 'ogb' \ - 'pyg_lib' \ - 'torch>=2.3.0,<2.4' \ - 'torch-geometric>=2.5,<2.6' \ - 'torch_scatter' \ - 'torch_sparse' - -# RAPIDS_DATASET_ROOT_DIR is used by test scripts -export RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)" - -# Used to skip certain examples in CI due to memory limitations -export CI_RUN=1 - -rapids-logger "pytest cugraph-pyg (single GPU)" -pushd python/cugraph-pyg/cugraph_pyg -python -m pytest \ - --cache-clear \ - --benchmark-disable \ - tests -# Test examples -for e in "$(pwd)"/examples/*.py; do - rapids-logger "running example $e" - (yes || true) | python $e -done -popd