Skip to content

Commit 60d8783

Browse files
author
khaled
committed
Remove driver.py and move tests/types tests into tests/core/types
Refactored tests/core/types/USMNdArray/test_array_creation_errors.py, since we got rid of filter_string and USMNdArray allocates int64 by default, not float64, like they do in numpy and dpnp Need to use dpctl._sycl_queue_manager
1 parent f3c7509 commit 60d8783

File tree

3 files changed

+18
-28
lines changed

3 files changed

+18
-28
lines changed

driver.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

numba_dpex/tests/core/types/USMNdAArray/test_array_creation_errors.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
def test_init():
88
usma = USMNdArray(1, device=None, queue=None)
9-
assert usma.dtype.name == "float64"
9+
assert usma.dtype.name == "int64"
1010
assert usma.ndim == 1
1111
assert usma.layout == "C"
1212
assert usma.addrspace == 1
@@ -16,16 +16,21 @@ def test_init():
1616
or str(usma.queue.sycl_device.device_type) == "device_type.gpu"
1717
)
1818

19-
usma = USMNdArray(1, device="cpu", queue=None)
20-
assert usma.dtype.name == "float64"
19+
device = dpctl.SyclDevice().filter_string
20+
21+
usma = USMNdArray(1, device=device, queue=None)
22+
assert usma.dtype.name == "int64"
2123
assert usma.ndim == 1
2224
assert usma.layout == "C"
2325
assert usma.addrspace == 1
2426
assert usma.usm_type == "device"
25-
assert str(usma.queue.sycl_device.device_type) == "device_type.cpu"
27+
assert (
28+
str(usma.queue.sycl_device.device_type) == "device_type.cpu"
29+
or str(usma.queue.sycl_device.device_type) == "device_type.gpu"
30+
)
2631

2732
# usma = USMNdArray(1, device="gpu", queue=None)
28-
# assert usma.dtype.name == "float64"
33+
# assert usma.dtype.name == "int64"
2934
# assert usma.ndim == 1
3035
# assert usma.layout == "C"
3136
# assert usma.addrspace == 1
@@ -34,15 +39,15 @@ def test_init():
3439

3540
queue = dpctl.SyclQueue()
3641
usma = USMNdArray(1, device=None, queue=queue)
37-
assert usma.dtype.name == "float64"
42+
assert usma.dtype.name == "int64"
3843
assert usma.ndim == 1
3944
assert usma.layout == "C"
4045
assert usma.addrspace == 1
4146
assert usma.usm_type == "device"
4247
assert usma.queue.addressof_ref() > 0
4348

4449
try:
45-
usma = USMNdArray(1, device="cpu", queue=queue)
50+
usma = USMNdArray(1, device=device, queue=queue)
4651
except Exception as e:
4752
assert "exclusive keywords" in str(e)
4853

numba_dpex/tests/core/types/USMNdAArray/test_usm_ndarray_creation.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def test_default_type_construction():
1818
assert usma.usm_type == "device"
1919

2020
default_device = dpctl.SyclDevice()
21-
cached_queue = dpctl.get_device_cached_queue(default_device)
21+
cached_queue = dpctl._sycl_queue_manager.get_device_cached_queue(
22+
default_device
23+
)
2224

2325
assert usma.device == default_device.filter_string
2426
assert usma.queue == cached_queue
@@ -38,7 +40,9 @@ def test_type_creation_with_device():
3840

3941
assert usma.device == default_device_str
4042

41-
cached_queue = dpctl.get_device_cached_queue(default_device_str)
43+
cached_queue = dpctl._sycl_queue_manager.get_device_cached_queue(
44+
default_device_str
45+
)
4246

4347
assert usma.queue == cached_queue
4448

0 commit comments

Comments
 (0)