From 4c68d8cde9c79c400678fc9b0546990ac3518f33 Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Thu, 20 May 2021 11:33:09 -0400 Subject: [PATCH] RMM is making streams explicit in the device_buffer --- hornet/include/Core/SoA/impl/SoADataSort.i.cuh | 6 +++--- xlib/include/Device/Primitives/CubWrapper.cuh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hornet/include/Core/SoA/impl/SoADataSort.i.cuh b/hornet/include/Core/SoA/impl/SoADataSort.i.cuh index 8fb3a4c5..05bf9043 100644 --- a/hornet/include/Core/SoA/impl/SoADataSort.i.cuh +++ b/hornet/include/Core/SoA/impl/SoADataSort.i.cuh @@ -310,7 +310,7 @@ cub_segmented_sort(CSoAPtr &soa, degree_t capacity, degree_t segme cub::DeviceSegmentedRadixSort::SortKeys( NULL, tempStorageBytes, in_edges, out_edges, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); - rmm::device_buffer tempStorage(tempStorageBytes); + rmm::device_buffer tempStorage(tempStorageBytes, cuda_stream_view{}); cub::DeviceSegmentedRadixSort::SortKeys( tempStorage.data(), tempStorageBytes, in_edges, out_edges, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); @@ -344,7 +344,7 @@ cub_segmented_sort(CSoAPtr &soa, degree_t capacity, degree_t segme cub::DeviceSegmentedRadixSort::SortPairs( NULL, tempStorageBytes, in_key, out_key, in_val, out_val, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); - rmm::device_buffer tempStorage(tempStorageBytes); + rmm::device_buffer tempStorage(tempStorageBytes, cuda_stream_view{}); cub::DeviceSegmentedRadixSort::SortPairs( tempStorage.data(), tempStorageBytes, in_key, out_key, in_val, out_val, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); @@ -382,7 +382,7 @@ cub_segmented_sort(CSoAPtr &soa, degree_t capacity, degree_t segme cub::DeviceSegmentedRadixSort::SortPairs( NULL, tempStorageBytes, in_key, out_key, in_val, out_val, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); - rmm::device_buffer tempStorage(tempStorageBytes); + rmm::device_buffer tempStorage(tempStorageBytes, cuda_stream_view{}); cub::DeviceSegmentedRadixSort::SortPairs( tempStorage.data(), tempStorageBytes, in_key, out_key, in_val, out_val, capacity, offsets.size() - 1, offsets.data().get(), offsets.data().get() + 1); diff --git a/xlib/include/Device/Primitives/CubWrapper.cuh b/xlib/include/Device/Primitives/CubWrapper.cuh index 0889c775..ca7fb27e 100644 --- a/xlib/include/Device/Primitives/CubWrapper.cuh +++ b/xlib/include/Device/Primitives/CubWrapper.cuh @@ -64,7 +64,7 @@ protected: explicit CubWrapper(const int num_items) noexcept : _num_items(num_items) {} ~CubWrapper() noexcept { release(); } - mutable rmm::device_buffer _d_temp_storage { 0 }; + mutable rmm::device_buffer _d_temp_storage { 0, cuda_stream_view{} }; size_t _temp_storage_bytes { 0 }; int _num_items { 0 }; };