Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
538 changes: 224 additions & 314 deletions cpp/src/sampling/detail/deduplicate_edges_by_minor_impl.cuh

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ template CUGRAPH_EXPORT std::tuple<rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>,
std::optional<rmm::device_uvector<int32_t>>,
rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
arithmetic_device_uvector_t,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>>
deduplicate_edges_by_minor<int32_t, int32_t, true>(
raft::handle_t const&,
graph_view_t<int32_t, int32_t, false, true> const&,
rmm::device_uvector<int32_t>&&,
rmm::device_uvector<int32_t>&&,
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&,
bool);
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&);

} // namespace detail
} // namespace cugraph
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ template CUGRAPH_EXPORT std::tuple<rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>,
std::optional<rmm::device_uvector<int64_t>>,
rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
arithmetic_device_uvector_t,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>>
deduplicate_edges_by_minor<int64_t, int64_t, true>(
raft::handle_t const&,
graph_view_t<int64_t, int64_t, false, true> const&,
rmm::device_uvector<int64_t>&&,
rmm::device_uvector<int64_t>&&,
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&,
bool);
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&);

} // namespace detail
} // namespace cugraph
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ template CUGRAPH_EXPORT std::tuple<rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>,
std::optional<rmm::device_uvector<int32_t>>,
rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
arithmetic_device_uvector_t,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>>
deduplicate_edges_by_minor<int32_t, int32_t, false>(
raft::handle_t const&,
graph_view_t<int32_t, int32_t, false, false> const&,
rmm::device_uvector<int32_t>&&,
rmm::device_uvector<int32_t>&&,
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&,
bool);
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&);

} // namespace detail
} // namespace cugraph
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ template CUGRAPH_EXPORT std::tuple<rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>,
std::optional<rmm::device_uvector<int64_t>>,
rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
arithmetic_device_uvector_t,
arithmetic_device_uvector_t,
std::optional<rmm::device_uvector<int32_t>>>
deduplicate_edges_by_minor<int64_t, int64_t, false>(
raft::handle_t const&,
graph_view_t<int64_t, int64_t, false, false> const&,
rmm::device_uvector<int64_t>&&,
rmm::device_uvector<int64_t>&&,
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&,
bool);
arithmetic_device_uvector_t&&,
std::optional<rmm::device_uvector<int32_t>>&&);

} // namespace detail
} // namespace cugraph
24 changes: 15 additions & 9 deletions cpp/src/sampling/detail/gather_one_hop_impl.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,21 @@ gather_one_hop_edgelist_to_unvisited_neighbors(
}
}

std::tie(
result_majors, result_minors, tmp_edge_indices, result_labels, std::ignore, std::ignore) =
deduplicate_edges_by_minor(handle,
graph_view,
std::move(result_majors),
std::move(result_minors),
std::move(tmp_edge_indices),
std::move(result_labels),
false);
std::tie(result_majors,
result_minors,
tmp_edge_indices,
result_labels,
std::ignore,
std::ignore,
std::ignore,
std::ignore,
std::ignore) = deduplicate_edges_by_minor(handle,
graph_view,
std::move(result_majors),
std::move(result_minors),
std::move(tmp_edge_indices),
arithmetic_device_uvector_t{std::monostate{}},
std::move(result_labels));

std::tie(visited_minors, visited_minor_labels) =
detail::update_dst_visited_vertices_and_labels<vertex_t, edge_t, multi_gpu>(
Expand Down
Loading
Loading