Skip to content

Commit

Permalink
clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@seunghwak
seunghwak committed Jul 20, 2023
1 parent 7010081 commit d4d5407
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 46 deletions.
50 changes: 25 additions & 25 deletions cpp/src/sampling/renumber_sampled_edgelist_impl.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,11 @@ namespace {

template <typename vertex_t, typename label_t, typename label_index_t>
std::tuple<rmm::device_uvector<vertex_t>, std::optional<rmm::device_uvector<label_index_t>>>
compute_renumber_map(
raft::handle_t const& handle,
raft::device_span<vertex_t const> edgelist_srcs,
std::optional<raft::device_span<int32_t const>> edgelist_hops,
raft::device_span<vertex_t const> edgelist_dsts,
std::optional<raft::device_span<size_t const>>
label_offsets)
compute_renumber_map(raft::handle_t const& handle,
raft::device_span<vertex_t const> edgelist_srcs,
std::optional<raft::device_span<int32_t const>> edgelist_hops,
raft::device_span<vertex_t const> edgelist_dsts,
std::optional<raft::device_span<size_t const>> label_offsets)
{
auto approx_edges_to_sort_per_iteration =
static_cast<size_t>(handle.get_device_properties().multiProcessorCount) *
Expand All @@ -69,8 +67,7 @@ compute_renumber_map(
thrust::make_counting_iterator(edgelist_srcs.size()),
(*edgelist_label_indices).begin(),
[offsets = raft::device_span<size_t const>(
(*label_offsets).data() + 1,
(*label_offsets).size() - 1)] __device__(size_t i) {
(*label_offsets).data() + 1, (*label_offsets).size() - 1)] __device__(size_t i) {
return static_cast<size_t>(thrust::distance(
offsets.begin(), thrust::upper_bound(thrust::seq, offsets.begin(), offsets.end(), i)));
});
Expand Down Expand Up @@ -309,12 +306,12 @@ compute_renumber_map(

rmm::device_uvector<std::byte> d_tmp_storage(0, handle.get_stream());

auto [h_label_offsets, h_edge_offsets] = detail::compute_offset_aligned_edge_chunks(
handle,
(*label_offsets).data(),
static_cast<size_t>((*label_offsets).size() - 1),
dsts.size(),
approx_edges_to_sort_per_iteration);
auto [h_label_offsets, h_edge_offsets] =
detail::compute_offset_aligned_edge_chunks(handle,
(*label_offsets).data(),
static_cast<size_t>((*label_offsets).size() - 1),
dsts.size(),
approx_edges_to_sort_per_iteration);
auto num_chunks = h_label_offsets.size() - 1;

for (size_t i = 0; i < num_chunks; ++i) {
Expand Down Expand Up @@ -517,12 +514,15 @@ renumber_sampled_edgelist(

// 2. compute renumber_map

auto [renumber_map, renumber_map_label_indices] = compute_renumber_map<vertex_t, label_t, label_index_t>(
handle,
raft::device_span<vertex_t const>(edgelist_srcs.data(), edgelist_srcs.size()),
edgelist_hops,
raft::device_span<vertex_t const>(edgelist_dsts.data(), edgelist_dsts.size()),
label_offsets ? std::make_optional<raft::device_span<size_t const>>(std::get<1>(*label_offsets)) : std::nullopt);
auto [renumber_map, renumber_map_label_indices] =
compute_renumber_map<vertex_t, label_t, label_index_t>(
handle,
raft::device_span<vertex_t const>(edgelist_srcs.data(), edgelist_srcs.size()),
edgelist_hops,
raft::device_span<vertex_t const>(edgelist_dsts.data(), edgelist_dsts.size()),
label_offsets
? std::make_optional<raft::device_span<size_t const>>(std::get<1>(*label_offsets))
: std::nullopt);

// 3. compute renumber map offsets for each label

Expand Down Expand Up @@ -640,7 +640,8 @@ renumber_sampled_edgelist(
new_vertices.shrink_to_fit(handle.get_stream());
d_tmp_storage.shrink_to_fit(handle.get_stream());

rmm::device_uvector<label_index_t> edgelist_label_indices(edgelist_srcs.size(), handle.get_stream());
rmm::device_uvector<label_index_t> edgelist_label_indices(edgelist_srcs.size(),
handle.get_stream());
thrust::transform(
handle.get_thrust_policy(),
thrust::make_counting_iterator(size_t{0}),
Expand All @@ -651,7 +652,7 @@ renumber_sampled_edgelist(
std::get<1>(*label_offsets).size() - 1)] __device__(size_t i) {
return static_cast<size_t>(thrust::distance(
offsets.begin(), thrust::upper_bound(thrust::seq, offsets.begin(), offsets.end(), i)));
});
});

auto pair_first =
thrust::make_zip_iterator(edgelist_srcs.begin(), edgelist_label_indices.begin());
Expand Down Expand Up @@ -679,8 +680,7 @@ renumber_sampled_edgelist(
return *(new_vertices.begin() + thrust::distance(old_vertices.begin(), it));
});

pair_first =
thrust::make_zip_iterator(edgelist_dsts.begin(), edgelist_label_indices.begin());
pair_first = thrust::make_zip_iterator(edgelist_dsts.begin(), edgelist_label_indices.begin());
thrust::transform(
handle.get_thrust_policy(),
pair_first,
Expand Down
18 changes: 8 additions & 10 deletions cpp/src/sampling/renumber_sampled_edgelist_sg.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@

namespace cugraph {

template
std::tuple<rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
std::optional<rmm::device_uvector<size_t>>>
template std::tuple<rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
rmm::device_uvector<int32_t>,
std::optional<rmm::device_uvector<size_t>>>
renumber_sampled_edgelist(
raft::handle_t const& handle,
rmm::device_uvector<int32_t>&& edgelist_srcs,
Expand All @@ -34,11 +33,10 @@ renumber_sampled_edgelist(
label_offsets,
bool do_expensive_check);

template
std::tuple<rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
std::optional<rmm::device_uvector<size_t>>>
template std::tuple<rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
rmm::device_uvector<int64_t>,
std::optional<rmm::device_uvector<size_t>>>
renumber_sampled_edgelist(
raft::handle_t const& handle,
rmm::device_uvector<int64_t>&& edgelist_srcs,
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/structure/detail/structure_utils.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@ void sort_adjacency_list(raft::handle_t const& handle,
if constexpr (std::is_arithmetic_v<edge_value_t>) {
for (size_t i = 0; i < num_chunks; ++i) {
size_t tmp_storage_bytes{0};
auto offset_first = thrust::make_transform_iterator(
offsets.data() + h_vertex_offsets[i], shift_left_t<edge_t>{h_edge_offsets[i]});
auto offset_first = thrust::make_transform_iterator(offsets.data() + h_vertex_offsets[i],
shift_left_t<edge_t>{h_edge_offsets[i]});
cub::DeviceSegmentedSort::SortPairs(static_cast<void*>(nullptr),
tmp_storage_bytes,
index_first + h_edge_offsets[i],
Expand Down Expand Up @@ -402,8 +402,8 @@ void sort_adjacency_list(raft::handle_t const& handle,
edge_t{0});
for (size_t i = 0; i < num_chunks; ++i) {
size_t tmp_storage_bytes{0};
auto offset_first = thrust::make_transform_iterator(
offsets.data() + h_vertex_offsets[i], shift_left_t<edge_t>{h_edge_offsets[i]});
auto offset_first = thrust::make_transform_iterator(offsets.data() + h_vertex_offsets[i],
shift_left_t<edge_t>{h_edge_offsets[i]});
cub::DeviceSegmentedSort::SortPairs(static_cast<void*>(nullptr),
tmp_storage_bytes,
index_first + h_edge_offsets[i],
Expand Down
14 changes: 7 additions & 7 deletions cpp/tests/sampling/renumber_sampled_edgelist_test.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,13 +426,13 @@ TEST_P(Tests_RenumberSampledEdgelist, CheckInt64)
run_current_test<int64_t>(param);
}

INSTANTIATE_TEST_SUITE_P(small_test,
Tests_RenumberSampledEdgelist,
::testing::Values(RenumberSampledEdgelist_Usecase{1024, 4096, 1, 1, true},
RenumberSampledEdgelist_Usecase{1024, 4096, 3, 1, true},
RenumberSampledEdgelist_Usecase{
1024, 32768, 1, 256, true},
RenumberSampledEdgelist_Usecase{1024, 32768, 3, 256, true}));
INSTANTIATE_TEST_SUITE_P(
small_test,
Tests_RenumberSampledEdgelist,
::testing::Values(RenumberSampledEdgelist_Usecase{1024, 4096, 1, 1, true},
RenumberSampledEdgelist_Usecase{1024, 4096, 3, 1, true},
RenumberSampledEdgelist_Usecase{1024, 32768, 1, 256, true},
RenumberSampledEdgelist_Usecase{1024, 32768, 3, 256, true}));

INSTANTIATE_TEST_SUITE_P(
benchmark_test,
Expand Down

0 comments on commit d4d5407

Please sign in to comment.