Skip to content

Fix copy of src with offset #1504

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 2 commits into from
Jan 25, 2024
Merged

Fix copy of src with offset #1504

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
5cf7cd8
Use offset parameter when creating broadcasted version of rhs array f…
oleksandr-pavlyk Jan 24, 2024
5cd7ba2
Added test based on reproducing example from gh-1503
oleksandr-pavlyk Jan 24, 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/_copy_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,22 @@ def _copy_from_usm_ndarray_to_usm_ndarray(dst, src):
src.shape, src.strides, len(common_shape)
)
src_same_shape = dpt.usm_ndarray(
common_shape, dtype=src.dtype, buffer=src, strides=new_src_strides
common_shape,
dtype=src.dtype,
buffer=src,
strides=new_src_strides,
offset=src._element_offset,
)
elif src.ndim == len(common_shape):
new_src_strides = _broadcast_strides(
src.shape, src.strides, len(common_shape)
)
src_same_shape = dpt.usm_ndarray(
common_shape, dtype=src.dtype, buffer=src, strides=new_src_strides
common_shape,
dtype=src.dtype,
buffer=src,
strides=new_src_strides,
offset=src._element_offset,
)
else:
# since broadcasting succeeded, src.ndim is greater because of
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 @@ -1035,6 +1035,7 @@ def test_setitem_same_dtype(dtype, src_usm_type, dst_usm_type):


def test_setitem_broadcasting():
"See gh-1503"
get_queue_or_skip()
dst = dpt.ones((2, 3, 4), dtype="u4")
src = dpt.zeros((3, 1), dtype=dst.dtype)
Expand All @@ -1043,6 +1044,16 @@ def test_setitem_broadcasting():
assert np.array_equal(dpt.asnumpy(dst), expected)


def test_setitem_broadcasting_offset():
get_queue_or_skip()
dt = dpt.int32
x = dpt.asarray([[1, 2, 3], [6, 7, 8]], dtype=dt)
y = dpt.asarray([4, 5], dtype=dt)
x[0] = y[1]
expected = dpt.asarray([[5, 5, 5], [6, 7, 8]], dtype=dt)
assert dpt.all(x == expected)


def test_setitem_broadcasting_empty_dst_validation():
"Broadcasting rules apply, except exception"
get_queue_or_skip()
Expand Down