From df6452631ed2056512066642eef359f7d9748dfe Mon Sep 17 00:00:00 2001 From: Seunghwa Kang Date: Thu, 24 Sep 2020 14:25:20 -0400 Subject: [PATCH 1/4] accomodate the change of raft allgahterv's input parameter displs type from int[] to size_t[] --- cpp/src/traversal/mg/common_utils.cuh | 2 +- cpp/src/utilities/spmv_1D.cu | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cpp/src/traversal/mg/common_utils.cuh b/cpp/src/traversal/mg/common_utils.cuh index 6199730c28f..2cda827b471 100644 --- a/cpp/src/traversal/mg/common_utils.cuh +++ b/cpp/src/traversal/mg/common_utils.cuh @@ -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 h_buffer_offsets(h_buffer_len.size()); + thrust::host_vector h_buffer_offsets(h_buffer_len.size()); thrust::exclusive_scan( thrust::host, h_buffer_len.begin(), h_buffer_len.end(), h_buffer_offsets.begin()); diff --git a/cpp/src/utilities/spmv_1D.cu b/cpp/src/utilities/spmv_1D.cu index 4aec86919c9..8a7378e69d3 100644 --- a/cpp/src/utilities/spmv_1D.cu +++ b/cpp/src/utilities/spmv_1D.cu @@ -75,8 +75,10 @@ void MGcsrmv::run(weight_t *x) auto const &comm{handle_.get_comms()}; // local std::vector recvbuf(comm.get_size()); + std::vector 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; From d2fa4d0b2da3c223d77026888c0a791080a1648b Mon Sep 17 00:00:00 2001 From: Seunghwa Kang Date: Thu, 24 Sep 2020 14:30:31 -0400 Subject: [PATCH 2/4] update change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23297165ca3..e15c7934a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,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[] instead of int[] for raft allgatherv's input parameter displs # cuGraph 0.15.0 (26 Aug 2020) From 96de28cb550fba2eae2daf972cdad9df0ef3129f Mon Sep 17 00:00:00 2001 From: Seunghwa Kang Date: Thu, 24 Sep 2020 15:06:10 -0400 Subject: [PATCH 3/4] update change log --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e15c7934a26..5d5a1db1b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,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[] instead of int[] for raft allgatherv's input parameter displs +- 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) From b40d6ecadbea245669f212fb7099b7c15bd7aee9 Mon Sep 17 00:00:00 2001 From: Seunghwa Kang Date: Thu, 24 Sep 2020 16:25:38 -0400 Subject: [PATCH 4/4] update RAFT tag --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 52faf34be01..cca1f5f4cf6 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -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 ""