Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

extract_if_e bug fix. #2096

Merged
merged 2 commits into from
Mar 1, 2022
Merged

extract_if_e bug fix. #2096

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b59272
bug fix
seunghwak Feb 26, 2022
d06d3a3
Merge branch 'branch-22.04' of github.com:rapidsai/cugraph into bug_e…
seunghwak Mar 1, 2022
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
30 changes: 20 additions & 10 deletions cpp/include/cugraph/prims/extract_if_e.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, NVIDIA CORPORATION.
* Copyright (c) 2020-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.
Expand Down Expand Up @@ -156,6 +156,15 @@ extract_if_e(raft::handle_t const& handle,
auto matrix_partition =
matrix_partition_device_view_t<vertex_t, edge_t, weight_t, GraphViewType::is_multi_gpu>(
graph_view.get_matrix_partition_view(i));

auto matrix_partition_row_value_input = adj_matrix_row_value_input;
auto matrix_partition_col_value_input = adj_matrix_col_value_input;
if constexpr (GraphViewType::is_adj_matrix_transposed) {
matrix_partition_col_value_input.set_local_adj_matrix_partition_idx(i);
} else {
matrix_partition_row_value_input.set_local_adj_matrix_partition_idx(i);
}

detail::decompress_matrix_partition_to_edgelist(
handle,
matrix_partition,
Expand All @@ -169,15 +178,16 @@ extract_if_e(raft::handle_t const& handle,
edgelist_majors.begin(), edgelist_minors.begin(), (*edgelist_weights).begin()));
cur_size += static_cast<size_t>(thrust::distance(
edge_first + cur_size,
thrust::remove_if(
handle.get_thrust_policy(),
edge_first + cur_size,
edge_first + cur_size + edgelist_edge_counts[i],
detail::call_e_op_t<GraphViewType,
AdjMatrixRowValueInputWrapper,
AdjMatrixColValueInputWrapper,
EdgeOp>{
matrix_partition, adj_matrix_row_value_input, adj_matrix_col_value_input, e_op})));
thrust::remove_if(handle.get_thrust_policy(),
edge_first + cur_size,
edge_first + cur_size + edgelist_edge_counts[i],
detail::call_e_op_t<GraphViewType,
AdjMatrixRowValueInputWrapper,
AdjMatrixColValueInputWrapper,
EdgeOp>{matrix_partition,
matrix_partition_row_value_input,
matrix_partition_col_value_input,
e_op})));
} else {
auto edge_first = thrust::make_zip_iterator(
thrust::make_tuple(edgelist_majors.begin(), edgelist_minors.begin()));
Expand Down