Skip to content

Fix boolean mask asignment scalar #1101

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
Mar 6, 2023
Merged

Fix boolean mask asignment scalar #1101

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
d6733b9
Allow x[cond] = non_usm_array
oleksandr-pavlyk Mar 6, 2023
c162c2a
Added tests for assignment of Pythons scalar.
oleksandr-pavlyk Mar 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
14 changes: 9 additions & 5 deletions dpctl/tensor/_copy_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,17 @@ def _place_impl(ary, ary_mask, vals, axis=0):
raise TypeError(
f"Expecting type dpctl.tensor.usm_ndarray, got {type(ary_mask)}"
)
if not isinstance(vals, dpt.usm_ndarray):
raise TypeError(
f"Expecting type dpctl.tensor.usm_ndarray, got {type(ary_mask)}"
)
exec_q = dpctl.utils.get_execution_queue(
(ary.sycl_queue, ary_mask.sycl_queue, vals.sycl_queue)
(
ary.sycl_queue,
ary_mask.sycl_queue,
)
)
if exec_q is not None:
if not isinstance(vals, dpt.usm_ndarray):
vals = dpt.asarray(vals, dtype=ary.dtype, sycl_queue=exec_q)
else:
exec_q = dpctl.utils.get_execution_queue((exec_q, vals.sycl_queue))
if exec_q is None:
raise dpctl.utils.ExecutionPlacementError(
"arrays have different associated queues. "
Expand Down
12 changes: 12 additions & 0 deletions dpctl/tests/test_usm_ndarray_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,15 @@ def test_nonzero():
x = dpt.concat((dpt.zeros(3), dpt.ones(4), dpt.zeros(3)))
(i,) = dpt.nonzero(x)
assert (dpt.asnumpy(i) == np.array([3, 4, 5, 6])).all()


def test_assign_scalar():
get_queue_or_skip()
x = dpt.arange(-5, 5, dtype="i8")
cond = dpt.asarray(
[True, True, True, True, True, False, False, False, False, False]
)
x[cond] = 0 # no error expected
x[dpt.nonzero(cond)] = -1
expected = np.array([-1, -1, -1, -1, -1, 0, 1, 2, 3, 4], dtype=x.dtype)
assert (dpt.asnumpy(x) == expected).all()