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.

Sign up for GitHub

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

Pass stream to device_scalar::value() calls. #259

Merged
merged 4 commits into from
Jun 8, 2021
Merged

Pass stream to device_scalar::value() calls. #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13326c2
Update Raft's get_rmm.cmake to better support CalVer
harrism Jun 8, 2021
57de195
Pass stream to device_scalar::value() calls.
harrism Jun 8, 2021
5443df1
Merge branch 'branch-21.08' into fix-get_rmm-calver
harrism Jun 8, 2021
fea92f5
Merge branch 'fix-get_rmm-calver' into fix-device_scalar-explicit-stream
harrism Jun 8, 2021
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
10 changes: 8 additions & 2 deletions cpp/cmake/thirdparty/get_rmm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,19 @@ function(find_and_configure_rmm VERSION)
return()
endif()

if(${VERSION} MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
set(MAJOR_AND_MINOR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
else()
set(MAJOR_AND_MINOR "${VERSION}")
endif()

rapids_cpm_find(rmm ${VERSION}
GLOBAL_TARGETS rmm::rmm
BUILD_EXPORT_SET raft-exports
INSTALL_EXPORT_SET raft-exports
CPM_ARGS
GIT_REPOSITORY https://github.com/rapidsai/rmm.git
GIT_TAG branch-${VERSION}
GIT_TAG branch-${MAJOR_AND_MINOR}
GIT_SHALLOW TRUE
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
Expand All @@ -36,6 +42,6 @@ function(find_and_configure_rmm VERSION)

endfunction()

set(RAFT_MIN_VERSION_rmm "${RAFT_VERSION_MAJOR}.${RAFT_VERSION_MINOR}")
set(RAFT_MIN_VERSION_rmm "${RAFT_VERSION_MAJOR}.${RAFT_VERSION_MINOR}.00")

find_and_configure_rmm(${RAFT_MIN_VERSION_rmm})
6 changes: 3 additions & 3 deletions cpp/include/raft/comms/test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ bool test_pointToPoint_device_send_or_recv(const handle_t &h, int numTrials) {

communicator.sync_stream(stream);

if (!sender && received_data.value() != rank - 1) {
if (!sender && received_data.value(stream) != rank - 1) {
ret = false;
}

Expand Down Expand Up @@ -424,8 +424,8 @@ bool test_pointToPoint_device_sendrecv(const handle_t &h, int numTrials) {

communicator.sync_stream(stream);

if (((rank % 2 == 0) && (received_data.value() != rank + 1)) ||
((rank % 2 == 1) && (received_data.value() != rank - 1))) {
if (((rank % 2 == 0) && (received_data.value(stream) != rank + 1)) ||
((rank % 2 == 1) && (received_data.value(stream) != rank - 1))) {
ret = false;
}

Expand Down