Skip to content

Commit e9709f8

Browse files
authoredJul 30, 2024··
Merge pull request #4546 from rapidsai/branch-24.08
Forward-merge branch-24.08 into branch-24.10
2 parents f592bdb + 94e60f0 commit e9709f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1293
-774
lines changed
 

‎cpp/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ set(CUGRAPH_SOURCES
284284
src/community/k_truss_sg_v64_e64.cu
285285
src/community/k_truss_sg_v32_e32.cu
286286
src/community/k_truss_sg_v32_e64.cu
287+
src/community/k_truss_mg_v64_e64.cu
288+
src/community/k_truss_mg_v32_e32.cu
289+
src/community/k_truss_mg_v32_e64.cu
287290
src/lookup/lookup_src_dst_mg_v32_e32.cu
288291
src/lookup/lookup_src_dst_mg_v32_e64.cu
289292
src/lookup/lookup_src_dst_mg_v64_e64.cu

‎cpp/include/cugraph/detail/shuffle_wrappers.hpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ std::tuple<rmm::device_uvector<vertex_t>,
5353
rmm::device_uvector<vertex_t>,
5454
std::optional<rmm::device_uvector<weight_t>>,
5555
std::optional<rmm::device_uvector<edge_t>>,
56-
std::optional<rmm::device_uvector<edge_type_id_t>>>
56+
std::optional<rmm::device_uvector<edge_type_id_t>>,
57+
std::vector<size_t>>
5758
shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
5859
raft::handle_t const& handle,
5960
rmm::device_uvector<vertex_t>&& majors,
@@ -86,14 +87,15 @@ shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
8687
* (exclusive) vertex ID.
8788
*
8889
* @return Tuple of vectors storing shuffled major vertices, minor vertices and optional weights,
89-
* edge ids and edge types
90+
* edge ids and edge types and rx counts
9091
*/
9192
template <typename vertex_t, typename edge_t, typename weight_t, typename edge_type_id_t>
9293
std::tuple<rmm::device_uvector<vertex_t>,
9394
rmm::device_uvector<vertex_t>,
9495
std::optional<rmm::device_uvector<weight_t>>,
9596
std::optional<rmm::device_uvector<edge_t>>,
96-
std::optional<rmm::device_uvector<edge_type_id_t>>>
97+
std::optional<rmm::device_uvector<edge_type_id_t>>,
98+
std::vector<size_t>>
9799
shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
98100
raft::handle_t const& handle,
99101
rmm::device_uvector<vertex_t>&& majors,

0 commit comments

Comments
 (0)
Please sign in to comment.