Skip to content

Added missing usm_type to tril() and triu() functions. #1062

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
oleksandr-pavlyk merged 2 commits into from
Feb 6, 2023
Merged

Added missing usm_type to tril() and triu() functions. #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b79ff
Added missing usm_type to tril() and triu() functions.
npolina4 Feb 6, 2023
ec8509f
Added tests for tril/triu usm_type, queue
oleksandr-pavlyk Feb 6, 2023
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
36 changes: 30 additions & 6 deletions dpctl/tensor/_ctors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,19 +1247,31 @@ def tril(X, k=0):

if k >= shape[nd - 1] - 1:
res = dpt.empty(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
hev, _ = ti._copy_usm_ndarray_into_usm_ndarray(
src=X, dst=res, sycl_queue=X.sycl_queue
)
hev.wait()
elif k < -shape[nd - 2]:
res = dpt.zeros(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
else:
res = dpt.empty(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
hev, _ = ti._tril(src=X, dst=res, k=k, sycl_queue=X.sycl_queue)
hev.wait()
Expand Down Expand Up @@ -1290,19 +1302,31 @@ def triu(X, k=0):

if k > shape[nd - 1]:
res = dpt.zeros(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
elif k <= -shape[nd - 2] + 1:
res = dpt.empty(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
hev, _ = ti._copy_usm_ndarray_into_usm_ndarray(
src=X, dst=res, sycl_queue=X.sycl_queue
)
hev.wait()
else:
res = dpt.empty(
X.shape, dtype=X.dtype, order=order, sycl_queue=X.sycl_queue
X.shape,
dtype=X.dtype,
order=order,
usm_type=X.usm_type,
sycl_queue=X.sycl_queue,
)
hev, _ = ti._triu(src=X, dst=res, k=k, sycl_queue=X.sycl_queue)
hev.wait()
Expand Down
22 changes: 22 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 @@ -1503,6 +1503,28 @@ def test_triu(dtype):
assert np.array_equal(Ynp, dpt.asnumpy(Y))


@pytest.mark.parametrize("tri_fn", [dpt.tril, dpt.triu])
@pytest.mark.parametrize("usm_type", ["device", "shared", "host"])
def test_tri_usm_type(tri_fn, usm_type):
q = get_queue_or_skip()
dtype = dpt.uint16

shape = (2, 3, 4, 5, 5)
size = np.prod(shape)
X = dpt.reshape(
dpt.arange(size, dtype=dtype, usm_type=usm_type, sycl_queue=q), shape
)
Y = tri_fn(X) # main execution branch
assert Y.usm_type == X.usm_type
assert Y.sycl_queue == q
Y = tri_fn(X, k=-6) # special case of Y == X
assert Y.usm_type == X.usm_type
assert Y.sycl_queue == q
Y = tri_fn(X, k=6) # special case of Y == 0
assert Y.usm_type == X.usm_type
assert Y.sycl_queue == q


def test_tril_slice():
q = get_queue_or_skip()

Expand Down