Skip to content

[UR][HIP] Make ur_context_handle_t_ destructor non-throwing #20887

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
kekaczma wants to merge 3 commits into
base: sycl
Choose a base branch
from
+19 −9
Open

[UR][HIP] Make ur_context_handle_t_ destructor non-throwing #20887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de49746
[UR][HIP] Make ur_context_handle_t_ destructor non-throwing
kekaczma Dec 12, 2025
ed4bf2b
[UR][CUDA] Avoid throwing from ur_context_handle_t_ destructor
kekaczma Dec 15, 2025
75e1a35
Remove dead code from CUDA/HIP context destructors
kekaczma Dec 17, 2025
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
19 changes: 12 additions & 7 deletions unified-runtime/source/adapters/cuda/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,19 @@ struct ur_context_handle_t_ : ur::cuda::handle_base {
UR_CHECK_ERROR(urAdapterRetain(ur::cuda::adapter));
};

~ur_context_handle_t_() {
if (MemoryPoolHost) {
umfPoolDestroy(MemoryPoolHost);
~ur_context_handle_t_() noexcept {
try {
if (MemoryPoolHost) {
umfPoolDestroy(MemoryPoolHost);
}
if (MemoryProviderHost) {
umfMemoryProviderDestroy(MemoryProviderHost);
}
urAdapterRelease(ur::cuda::adapter);
Copy link
Contributor

@kswiecicki kswiecicki Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think any of those functions (umfPoolDestroy/umfMemoryProviderDestroy/urAdapterRelease) can throw a reasonable exception. Since urAdapterRelease isn't wrapped with UR_CHECK_ERROR the try catch block seems redundant.

} catch (...) {
UR_LOG(ERR, "Exception in context destructor");
assert(false && "Exception in context destructor");
}
if (MemoryProviderHost) {
umfMemoryProviderDestroy(MemoryProviderHost);
}
UR_CHECK_ERROR(urAdapterRelease(ur::cuda::adapter));
}

void invokeExtendedDeleters() {
Expand Down
9 changes: 7 additions & 2 deletions unified-runtime/source/adapters/hip/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,13 @@ struct ur_context_handle_t_ : ur::hip::handle_base {
UR_CHECK_ERROR(urAdapterRetain(ur::hip::adapter));
};

~ur_context_handle_t_() {
UR_CHECK_ERROR(urAdapterRelease(ur::hip::adapter));
~ur_context_handle_t_() noexcept {
try {
urAdapterRelease(ur::hip::adapter);
} catch (...) {
UR_LOG(ERR, "Exception in context destructor");
assert(false && "Exception in context destructor");
}
}

ur_context_handle_t_(const ur_context_handle_t_ &) = delete;
Expand Down