Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[REVIEW] pass size_t* instead of int_t[] for raft allgatherv's input parameter displs #1158

Merged
merged 5 commits into from
Sep 25, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- PR #1131 Show style checker errors with set +e
- PR #1150 Update RAFT git tag
- PR #1155 Remove RMM library dependency and CXX11 ABI handling
- PR #1158 Pass size_t* & size_t* instead of size_t[] & int[] for raft allgatherv's input parameters recvcounts & displs


# cuGraph 0.15.0 (26 Aug 2020)
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ else(DEFINED ENV{RAFT_PATH})

ExternalProject_Add(raft
GIT_REPOSITORY https://github.com/rapidsai/raft.git
GIT_TAG 516106e3b515b25c863776fcc51fb12df6c0a186
GIT_TAG 53c1e2dde4045f386f9cc4bb7d3dc99d5690b886
PREFIX ${RAFT_DIR}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/traversal/mg/common_utils.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ return_t collect_vectors(raft::handle_t const &handle,
// h_buffer_offsets has to be int because raft allgatherv expects
// int array for displacement vector. This should be changed in
// raft so that the displacement is templated
thrust::host_vector<int> h_buffer_offsets(h_buffer_len.size());
thrust::host_vector<size_t> h_buffer_offsets(h_buffer_len.size());

thrust::exclusive_scan(
thrust::host, h_buffer_len.begin(), h_buffer_len.end(), h_buffer_offsets.begin());
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/utilities/spmv_1D.cu
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ void MGcsrmv<vertex_t, edge_t, weight_t>::run(weight_t *x)
auto const &comm{handle_.get_comms()}; // local

std::vector<size_t> recvbuf(comm.get_size());
std::vector<size_t> displs(comm.get_size());
std::copy(local_vertices_, local_vertices_ + comm.get_size(), recvbuf.begin());
comm.allgatherv(y_loc_.data().get(), x, recvbuf.data(), part_off_, stream);
std::copy(part_off_, part_off_ + comm.get_size(), displs.begin());
comm.allgatherv(y_loc_.data().get(), x, recvbuf.data(), displs.data(), stream);
}

template class MGcsrmv<int32_t, int32_t, double>;
Expand Down