From 74f6d9fb3390639e1a5d2b7cb230f3ac83974dd8 Mon Sep 17 00:00:00 2001 From: ksimpson Date: Tue, 11 Mar 2025 13:52:34 -0700 Subject: [PATCH 1/3] clean up device initialization in test --- cuda_core/tests/test_device.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cuda_core/tests/test_device.py b/cuda_core/tests/test_device.py index 852ccc6d9..d561b65ae 100644 --- a/cuda_core/tests/test_device.py +++ b/cuda_core/tests/test_device.py @@ -37,18 +37,20 @@ def test_device_set_current(deinit_cuda): assert handle_return(driver.cuCtxGetCurrent()) is not None -def test_device_repr(): +def test_device_repr(deinit_cuda): device = Device(0) + device.set_current() assert str(device).startswith(" Date: Wed, 12 Mar 2025 10:27:59 -0700 Subject: [PATCH 2/3] typos --- cuda_core/tests/test_device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cuda_core/tests/test_device.py b/cuda_core/tests/test_device.py index d561b65ae..059fbe862 100644 --- a/cuda_core/tests/test_device.py +++ b/cuda_core/tests/test_device.py @@ -50,7 +50,7 @@ def test_device_alloc(deinit_cuda): device.sync() assert buffer.handle != 0 assert buffer.size == 1024 - assert buffer.device_id == cuda.cudaGetDevice() + assert buffer.device_id == handle_return(runtime.cudaGetDevice()) def test_device_create_stream(init_cuda): From aa007aff143247fbddee0d7e77edf4d3fb2fc1cd Mon Sep 17 00:00:00 2001 From: ksimpson Date: Wed, 12 Mar 2025 11:44:03 -0700 Subject: [PATCH 3/3] simplify existing test and add device_id test --- cuda_core/tests/test_device.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cuda_core/tests/test_device.py b/cuda_core/tests/test_device.py index 059fbe862..3fed6c32a 100644 --- a/cuda_core/tests/test_device.py +++ b/cuda_core/tests/test_device.py @@ -50,7 +50,13 @@ def test_device_alloc(deinit_cuda): device.sync() assert buffer.handle != 0 assert buffer.size == 1024 - assert buffer.device_id == handle_return(runtime.cudaGetDevice()) + assert buffer.device_id == int(device) + + +def test_device_id(deinit_cuda): + for device in cuda.core.experimental.system.devices: + device.set_current() + assert device.device_id == handle_return(runtime.cudaGetDevice()) def test_device_create_stream(init_cuda):