Skip to content

Commit 6dd0231

Browse files
Modify test_sycl_device.py to run if DPC++ sees no devices
1 parent f3edec3 commit 6dd0231

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

dpctl/tests/test_sycl_device.py

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"""
1919

2020
import pytest
21+
from helper import get_queue_or_skip
2122

2223
import dpctl
2324
from dpctl import SyclDeviceCreationError
@@ -29,18 +30,18 @@ def test_standard_selectors(device_selector, check):
2930
"""
3031
try:
3132
device = device_selector()
32-
check(device)
3333
except dpctl.SyclDeviceCreationError:
34-
pytest.skip()
34+
pytest.skip("Could not create default-selected device")
35+
check(device)
3536

3637

3738
def test_current_device(check):
3839
"""Test is the device for the current queue is valid."""
40+
q = get_queue_or_skip()
3941
try:
40-
q = dpctl.get_current_queue()
41-
except Exception:
42-
pytest.fail("Encountered an exception inside get_current_queue().")
43-
device = q.get_sycl_device()
42+
device = q.get_sycl_device()
43+
except dpctl.SyclDeviceCreationError:
44+
pytest.skip("Could not create default-selected device")
4445
check(device)
4546

4647

@@ -125,13 +126,20 @@ def test_hashing_of_device():
125126
a dictionary key.
126127
127128
"""
128-
device_dict = {dpctl.SyclDevice(): "default_device"}
129+
try:
130+
device = dpctl.SyclDevice()
131+
except dpctl.SyclDeviceCreationError:
132+
pytest.skip("Could not create default-constructed device")
133+
device_dict = {device: "default_device"}
129134
assert device_dict
130135

131136

132137
def test_equal():
133-
d1 = dpctl.SyclDevice()
134-
d2 = dpctl.SyclDevice()
138+
try:
139+
d1 = dpctl.SyclDevice()
140+
d2 = dpctl.SyclDevice()
141+
except dpctl.SyclDeviceCreationError:
142+
pytest.skip("Could not create default-selected device")
135143
assert d1 != Ellipsis
136144
assert d1 == d2
137145

@@ -178,7 +186,7 @@ def test_supported_aspect(supported_aspect):
178186
try:
179187
d = dpctl.SyclDevice()
180188
has_it = getattr(d, "has_aspect_" + supported_aspect)
181-
except dpctl.SyclDevieCreationError:
189+
except dpctl.SyclDeviceCreationError:
182190
has_it = False
183191
try:
184192
d_wa = dpctl.select_device_with_aspects(supported_aspect)
@@ -212,7 +220,10 @@ def test_cpython_api_SyclDevice_GetDeviceRef():
212220
import ctypes
213221
import sys
214222

215-
d = dpctl.SyclDevice()
223+
try:
224+
d = dpctl.SyclDevice()
225+
except dpctl.SyclDeviceCreationError:
226+
pytest.skip("Could not create default-constructed device")
216227
mod = sys.modules[d.__class__.__module__]
217228
# get capsule storing SyclDevice_GetDeviceRef function ptr
218229
d_ref_fn_cap = mod.__pyx_capi__["SyclDevice_GetDeviceRef"]
@@ -235,7 +246,10 @@ def test_cpython_api_SyclDevice_Make():
235246
import ctypes
236247
import sys
237248

238-
d = dpctl.SyclDevice()
249+
try:
250+
d = dpctl.SyclDevice()
251+
except dpctl.SyclDeviceCreationError:
252+
pytest.skip("Could not create default-constructed device")
239253
mod = sys.modules[d.__class__.__module__]
240254
# get capsule storign SyclContext_Make function ptr
241255
make_d_fn_cap = mod.__pyx_capi__["SyclDevice_Make"]

0 commit comments

Comments
 (0)