fixes scoped device id guard test

ginkgo-project · Oct 31, 2022 · b59a9dd · b59a9dd
1 parent 8f8f5a0
commit b59a9dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cuda/test/base/scoped_device_id.cu b/cuda/test/base/scoped_device_id.cu
@@ -66,7 +66,9 @@ TEST_F(ScopedDeviceIdGuard, SetsId)
 
     gko::detail::cuda_scoped_device_id_guard g{new_device_id};
 
-    ASSERT_EQ(cuda->get_device_id(), new_device_id);
+    int device_id;
+    cudaGetDevice(&device_id);
+    ASSERT_EQ(device_id, new_device_id);
 }
 
 
@@ -79,7 +81,9 @@ TEST_F(ScopedDeviceIdGuard, ResetsId)
         gko::detail::cuda_scoped_device_id_guard g{new_device_id};
     }
 
-    ASSERT_EQ(cuda->get_device_id(), old_device_id);
+    int device_id;
+    cudaGetDevice(&device_id);
+    ASSERT_EQ(device_id, old_device_id);
 }
 
 

diff --git a/hip/test/base/scoped_device_id.hip.cpp b/hip/test/base/scoped_device_id.hip.cpp
@@ -66,7 +66,9 @@ TEST_F(ScopedDeviceIdGuard, SetsId)
 
     gko::detail::hip_scoped_device_id_guard g{new_device_id};
 
-    ASSERT_EQ(hip->get_device_id(), new_device_id);
+    int device_id;
+    hipGetDevice(&device_id);
+    ASSERT_EQ(device_id, new_device_id);
 }
 
 
@@ -79,7 +81,9 @@ TEST_F(ScopedDeviceIdGuard, ResetsId)
         gko::detail::hip_scoped_device_id_guard g{new_device_id};
     }
 
-    ASSERT_EQ(hip->get_device_id(), old_device_id);
+    int device_id;
+    hipGetDevice(&device_id);
+    ASSERT_EQ(device_id, old_device_id);
 }