Merge pull request #1403 from JackAKirk/fix-events-wait-context

[cuda][hip] Removed bad event wait constraint / use scopedContext correctly.
oneapi-src · Mar 18, 2024 · db4b0c1 · db4b0c1
2 parents 94af6e3 + f2573e8
commit db4b0c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/source/adapters/cuda/event.cpp b/source/adapters/cuda/event.cpp
@@ -220,13 +220,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventSetCallback(ur_event_handle_t,
 UR_APIEXPORT ur_result_t UR_APICALL
 urEventWait(uint32_t numEvents, const ur_event_handle_t *phEventWaitList) {
   try {
-    auto Context = phEventWaitList[0]->getContext();
-    ScopedContext Active(Context);
+    ScopedContext Active(phEventWaitList[0]->getContext());
 
-    auto WaitFunc = [Context](ur_event_handle_t Event) -> ur_result_t {
+    auto WaitFunc = [](ur_event_handle_t Event) -> ur_result_t {
       UR_ASSERT(Event, UR_RESULT_ERROR_INVALID_EVENT);
-      UR_ASSERT(Event->getContext() == Context,
-                UR_RESULT_ERROR_INVALID_CONTEXT);
 
       return Event->wait();
     };

diff --git a/source/adapters/hip/event.cpp b/source/adapters/hip/event.cpp
@@ -190,14 +190,9 @@ urEventWait(uint32_t numEvents, const ur_event_handle_t *phEventWaitList) {
   UR_ASSERT(numEvents > 0, UR_RESULT_ERROR_INVALID_VALUE);
 
   try {
-
-    auto Context = phEventWaitList[0]->getContext();
     ScopedContext Active(phEventWaitList[0]->getDevice());
-
-    auto WaitFunc = [Context](ur_event_handle_t Event) -> ur_result_t {
+    auto WaitFunc = [](ur_event_handle_t Event) -> ur_result_t {
       UR_ASSERT(Event, UR_RESULT_ERROR_INVALID_EVENT);
-      UR_ASSERT(Event->getContext() == Context,
-                UR_RESULT_ERROR_INVALID_CONTEXT);
 
       return Event->wait();
     };