Skip to content

Roll must reduce shift steps by size along axis #1869

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 7 commits into from
Oct 21, 2024
Merged

Roll must reduce shift steps by size along axis #1869

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d58cba5
Roll must reduce shift steps by size along axis
oleksandr-pavlyk Oct 18, 2024
a3d3509
Change to avoid branch to fix decrease in coverage
oleksandr-pavlyk Oct 18, 2024
6054b1f
Fix division by zero exception found by array API tests suite
oleksandr-pavlyk Oct 18, 2024
275fdba
Added tests based on division by zero test failure
oleksandr-pavlyk Oct 18, 2024
10f5706
Renamed X to x as per docstring, add parens to inline if
oleksandr-pavlyk Oct 19, 2024
23fd986
Corrected select statement for shift normalization
oleksandr-pavlyk Oct 19, 2024
bd0c9b2
Use operator.index to normalize shift
oleksandr-pavlyk Oct 20, 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
7 changes: 4 additions & 3 deletions dpctl/tensor/_manipulation_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def roll(X, /, shift, *, axis=None):
hev, roll_ev = ti._copy_usm_ndarray_for_roll_1d(
src=X,
dst=res,
shift=shift,
shift=(shift % X.size),
sycl_queue=exec_q,
depends=dep_evs,
)
Expand All @@ -369,9 +369,10 @@ def roll(X, /, shift, *, axis=None):
shifts = [
0,
] * X.ndim
shape = X.shape
for sh, ax in broadcasted:
shifts[ax] += sh

n_i = shape[ax]
shifts[ax] = int(shifts[ax] + sh) % int(n_i) if n_i > 0 else 0
res = dpt.empty(
X.shape, dtype=X.dtype, usm_type=X.usm_type, sycl_queue=exec_q
)
Expand Down
10 changes: 10 additions & 0 deletions dpctl/tests/test_usm_ndarray_manipulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,16 @@ def test_roll_2d(data):
assert_array_equal(Ynp, dpt.asnumpy(Y))


def test_roll_out_bounds_shifts():
"See gh-1857"
get_queue_or_skip()

x = dpt.arange(4)
y = dpt.roll(x, np.uint64(2**63 + 2))
expected = dpt.roll(x, 2)
assert dpt.all(y == expected)


def test_roll_validation():
get_queue_or_skip()

Expand Down
Loading