Skip to content

cudax/stf: migrate stream/interfaces/ from cuda_safe_call to cuda_try #9268

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

Open
andralex wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −18
Open

cudax/stf: migrate stream/interfaces/ from cuda_safe_call to cuda_try #9268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6dd048
cudax/stf: migrate stream/interfaces/ from cuda_safe_call to cuda_try
andralex Jun 5, 2026
3ae7ba1
cudax/stf: use runtime-status cuda_try for cudaMemcpyAsync (overload …
andralex Jun 5, 2026
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
29 changes: 20 additions & 9 deletions cudax/include/cuda/experimental/__stf/stream/interfaces/hashtable_linearprobing.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include <cuda/experimental/__stf/internal/hashtable_linearprobing.cuh>
#include <cuda/experimental/__stf/stream/stream_data_interface.cuh>
#include <cuda/experimental/__stf/utility/scope_guard.cuh>

namespace cuda::experimental::stf
{
Expand Down Expand Up @@ -77,7 +78,9 @@ public:
size_t sz = this->shape.get_capacity() * sizeof(reserved::KeyValue);

// NAIVE method !
cuda_safe_call(cudaMemcpyAsync((void*) dst, (void*) src, sz, kind, s));
// cudaMemcpyAsync is an overload set (cuda_runtime.h alternate-spelling wrapper),
// so it keeps the runtime-status cuda_try form.
cuda_try(cudaMemcpyAsync((void*) dst, (void*) src, sz, kind, s));
}

void stream_data_allocate(
Expand All @@ -95,18 +98,26 @@ public:

if (memory_node.is_host())
{
// Fallback to a synchronous method
cuda_safe_call(cudaStreamSynchronize(stream));
cuda_safe_call(cudaHostAlloc(&base_ptr, s, cudaHostAllocMapped));
// Fallback to a synchronous method. cudaHostAlloc is an overload set
// (cuda_runtime.h templated wrapper), so it keeps the runtime-status form.
cuda_try<cudaStreamSynchronize>(stream);
cuda_try(cudaHostAlloc(&base_ptr, s, cudaHostAllocMapped));
memset(base_ptr, 0xff, s);
}
else
{
cuda_safe_call(cudaMallocAsync(&base_ptr, s, stream));
// cudaMallocAsync is an overload set (templated wrapper), so it keeps the
// runtime-status form.
cuda_try(cudaMallocAsync(&base_ptr, s, stream));
// Free the buffer if the initialization below throws.
SCOPE(fail)
{
cuda_safe_call(cudaFreeAsync(base_ptr, stream));
};

// We also need to initialize the hashtable
static_assert(reserved::kEmpty == 0xffffffff, "memset expected kEmpty=0xffffffff");
cuda_safe_call(cudaMemsetAsync(base_ptr, 0xff, s, stream));
cuda_try<cudaMemsetAsync>(base_ptr, 0xff, s, stream);
}

local_desc.addr = base_ptr;
Expand All @@ -123,12 +134,12 @@ public:
if (memory_node.is_host())
{
// Fallback to a synchronous method
cuda_safe_call(cudaStreamSynchronize(stream));
cuda_safe_call(cudaFreeHost(local_desc.addr));
cuda_try<cudaStreamSynchronize>(stream);
cuda_try<cudaFreeHost>(local_desc.addr);
}
else
{
cuda_safe_call(cudaFreeAsync(local_desc.addr, stream));
cuda_try<cudaFreeAsync>(local_desc.addr, stream);
}
local_desc.addr = nullptr; // not strictly necessary, but helps debugging
}
Expand Down
15 changes: 8 additions & 7 deletions cudax/include/cuda/experimental/__stf/stream/interfaces/slice.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,30 +232,32 @@ public:

if constexpr (dimensions == 0)
{
cuda_safe_call(cudaMemcpyAsync(dst_ptr, src_ptr, sizeof(T), kind, s));
// cudaMemcpyAsync is an overload set (cuda_runtime.h adds an alternate-spelling
// wrapper), so it keeps the runtime-status cuda_try form.
cuda_try(cudaMemcpyAsync(dst_ptr, src_ptr, sizeof(T), kind, s));
}
else if constexpr (dimensions == 1)
{
cuda_safe_call(cudaMemcpyAsync(dst_ptr, src_ptr, b.extent(0) * sizeof(T), kind, s));
cuda_try(cudaMemcpyAsync(dst_ptr, src_ptr, b.extent(0) * sizeof(T), kind, s));
}
else if constexpr (dimensions == 2)
{
cuda_safe_call(cudaMemcpy2DAsync(
cuda_try<cudaMemcpy2DAsync>(
dst_ptr,
dst_instance.stride(1) * sizeof(T),
src_ptr,
src_instance.stride(1) * sizeof(T),
b.extent(0) * sizeof(T),
b.extent(1),
kind,
s));
s);
}
else
{
// We only support higher dimensions if they are contiguous !
if ((contiguous_dims(src_instance) == dimensions) && (contiguous_dims(dst_instance) == dimensions))
{
cuda_safe_call(cudaMemcpyAsync(dst_ptr, src_ptr, b.size() * sizeof(T), kind, s));
cuda_try(cudaMemcpyAsync(dst_ptr, src_ptr, b.size() * sizeof(T), kind, s));
}
else
{
Expand All @@ -281,8 +283,7 @@ public:
{
auto s = this->instance(instance_id);

cudaPointerAttributes attributes{};
cuda_safe_call(cudaPointerGetAttributes(&attributes, s.data_handle()));
const auto attributes = cuda_try<cudaPointerGetAttributes>(s.data_handle());

// Implicitly converted to an optional
return attributes.type;
Expand Down
4 changes: 2 additions & 2 deletions cudax/include/cuda/experimental/__stf/stream/interfaces/slice_reduction_ops.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public:
if (e.affine_data_place().is_host())
{
// TODO make a callback when the situation gets better
cuda_safe_call(cudaStreamSynchronize(s));
cuda_try<cudaStreamSynchronize>(s);
// slice_print(in, "in before op");
// slice_print(inout, "inout before op");

Expand Down Expand Up @@ -160,7 +160,7 @@ public:
if (e.affine_data_place().is_host())
{
// TODO make a callback when the situation gets better
cuda_safe_call(cudaStreamSynchronize(s));
cuda_try<cudaStreamSynchronize>(s);
if constexpr (dimensions == 1)
{
for (size_t i = 0; i < out.extent(0); i++)
Expand Down
Loading