Skip to content

Improved coverage of _types.pxi #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 1, 2021
Merged

Improved coverage of _types.pxi #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43f32df
Improved coverage of _types.pxi
oleksandr-pavlyk Aug 28, 2021
0ee8e5f
Improved coverage of _typing.pxi
oleksandr-pavlyk Aug 30, 2021
4530026
Allow shape to be an integer in the constructor, e.g. `usm_ndarray(10…
oleksandr-pavlyk Aug 31, 2021
cd27e22
Test constructor for shape being an int
oleksandr-pavlyk Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dpctl/tensor/_usmarray.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,17 @@ cdef class usm_ndarray:
cdef Py_ssize_t _offset = offset
cdef Py_ssize_t ary_min_displacement = 0
cdef Py_ssize_t ary_max_displacement = 0
cdef Py_ssize_t tmp = 0
cdef char * data_ptr = NULL

self._reset()
if (not isinstance(shape, (list, tuple))
and not hasattr(shape, 'tolist')):
raise TypeError("Argument shape must be a list of a tuple.")
try:
tmp = <Py_ssize_t> shape
shape = [shape, ]
except Exception:
raise TypeError("Argument shape must be a list or a tuple.")
nd = len(shape)
typenum = dtype_to_typenum(dtype)
itemsize = type_bytesize(typenum)
Expand Down
11 changes: 11 additions & 0 deletions dpctl/tests/test_usm_ndarray_ctor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
(4, 5),
(2, 5, 2),
(2, 2, 2, 2, 2, 2, 2, 2),
5,
],
)
@pytest.mark.parametrize("usm_type", ["shared", "host", "device"])
Expand Down Expand Up @@ -74,13 +75,23 @@ def test_allocate_usm_ndarray(shape, usm_type):
"f8",
"c8",
"c16",
b"float32",
np.dtype("d"),
np.half,
],
)
def test_dtypes(dtype):
Xusm = dpt.usm_ndarray((1,), dtype=dtype)
assert Xusm.itemsize == np.dtype(dtype).itemsize
expected_fmt = (np.dtype(dtype).str)[1:]
actual_fmt = Xusm.__sycl_usm_array_interface__["typestr"][1:]
assert expected_fmt == actual_fmt


@pytest.mark.parametrize("dtype", ["", ">f4", "invalid", 123])
def test_dtypes_invalid(dtype):
with pytest.raises((TypeError, ValueError)):
dpt.usm_ndarray((1,), dtype=dtype)


def test_properties():
Expand Down