Skip to content
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

Allow uint64 indices in dpt.take_along_axis and dpt.put_along_axis #1934

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Allow uint64 indices in dpt.take_along_axis and dpt.put_along_axis #1934

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
f50813e
Allow uint64 indices in take_along_axis and put_along_axis
ndgrigorian Dec 13, 2024
7602b4f
Changes per PR review
ndgrigorian Dec 13, 2024
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
12 changes: 10 additions & 2 deletions dpctl/tensor/_indexing_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,11 @@ def take_along_axis(x, indices, /, *, axis=-1, mode="wrap"):
"from input arguments. "
)
mode_i = _get_indexing_mode(mode)
indexes_dt = ti.default_device_index_type(exec_q.sycl_device)
indexes_dt = (
dpt.uint64
if indices.dtype == dpt.uint64
else ti.default_device_index_type(exec_q.sycl_device)
)
_ind = tuple(
(
indices
Expand Down Expand Up @@ -567,7 +571,11 @@ def put_along_axis(x, indices, vals, /, *, axis=-1, mode="wrap"):
)
out_usm_type = dpctl.utils.get_coerced_usm_type(usm_types_)
mode_i = _get_indexing_mode(mode)
indexes_dt = ti.default_device_index_type(exec_q.sycl_device)
indexes_dt = (
dpt.uint64
if indices.dtype == dpt.uint64
else ti.default_device_index_type(exec_q.sycl_device)
)
_ind = tuple(
(
indices
Expand Down
32 changes: 32 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 @@ -1858,3 +1858,35 @@ def test_put_indices_oob_py_ssize_t(mode):

assert dpt.all(x[:-1] == -1)
assert x[-1] == i


def test_take_along_axis_uint64_indices():
get_queue_or_skip()

inds = dpt.arange(1, 10, 2, dtype="u8")
x = dpt.tile(dpt.asarray([0, -1], dtype="i4"), 5)
res = dpt.take_along_axis(x, inds)
assert dpt.all(res == -1)

sh0 = 2
inds = dpt.broadcast_to(inds, (sh0,) + inds.shape)
x = dpt.broadcast_to(x, (sh0,) + x.shape)
res = dpt.take_along_axis(x, inds, axis=1)
assert dpt.all(res == -1)


def test_put_along_axis_uint64_indices():
get_queue_or_skip()

inds = dpt.arange(1, 10, 2, dtype="u8")
x = dpt.zeros(10, dtype="i4")
dpt.put_along_axis(x, inds, dpt.asarray(2, dtype=x.dtype))
expected = dpt.tile(dpt.asarray([0, 2], dtype="i4"), 5)
assert dpt.all(x == expected)

sh0 = 2
inds = dpt.broadcast_to(inds, (sh0,) + inds.shape)
x = dpt.zeros((sh0,) + x.shape, dtype="i4")
dpt.put_along_axis(x, inds, dpt.asarray(2, dtype=x.dtype), axis=1)
expected = dpt.tile(dpt.asarray([0, 2], dtype="i4"), (2, 5))
assert dpt.all(expected == x)
Loading