Skip to content

Commit 74b67b1

Browse files
authored
(-) fix conflicts caused by merging two PRs and lack of merge queue (#160)
fix bugs introduced by merging two PRs that had conlficts with each other Authors: - Amin Aramoon (https://github.com/aminaramoon) Approvers: - https://github.com/felipeblazing URL: #160
1 parent 6a45dfb commit 74b67b1

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

include/cucascade/memory/fixed_size_host_memory_resource.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ class fixed_size_host_memory_resource : public chunked_resource_info {
342342

343343
void* allocate_sync(std::size_t bytes, std::size_t alignment = alignof(std::max_align_t))
344344
{
345-
auto* ptr = allocate(cuda::stream_ref{cudaStream_t{nullptr}}, bytes, alignment);
345+
auto* ptr = allocate(::cuda::stream_ref{cudaStream_t{nullptr}}, bytes, alignment);
346346
rmm::cuda_stream_default.synchronize();
347347
return ptr;
348348
}
@@ -351,7 +351,7 @@ class fixed_size_host_memory_resource : public chunked_resource_info {
351351
std::size_t bytes,
352352
std::size_t alignment = alignof(std::max_align_t)) noexcept
353353
{
354-
deallocate(cuda::stream_ref{cudaStream_t{nullptr}}, ptr, bytes, alignment);
354+
deallocate(::cuda::stream_ref{cudaStream_t{nullptr}}, ptr, bytes, alignment);
355355
rmm::cuda_stream_default.synchronize_no_throw();
356356
}
357357

src/io/rest/rest_reactor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ void rest_reactor::worker_loop(const std::stop_token& stop_token)
10401040
}
10411041

10421042
auto poll_copy_completions = [&]() {
1043-
using query_status = cucascade::cuda::cuda_event::query_status;
1043+
using query_status = cucascade::cuda::event::query_result;
10441044
// Credit (or fail) each bounce-staged chunk only now that its H2D copy is
10451045
// actually done — the device bytes were not valid until this point. On
10461046
// success report the chunk complete; on a copy error fail the request

src/io/uring/uring_reactor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ void uring_reactor::worker_loop(const std::stop_token& stop_token)
902902
int inflight = 0;
903903

904904
auto poll_copy_completions = [&]() {
905-
using query_status = cucascade::cuda::cuda_event::query_status;
905+
using query_status = cucascade::cuda::event::query_result;
906906
copying_slots.erase(std::remove_if(copying_slots.begin(),
907907
copying_slots.end(),
908908
[&](slot_token const& token) {

0 commit comments

Comments
 (0)