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

Fix for gh-1468 in arithmetic reduction when type promotion is needed #1470

Merged
merged 4 commits into from
Nov 8, 2023
Merged

Fix for gh-1468 in arithmetic reduction when type promotion is needed #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07c075b
Corrected argmin/argmax docstring
oleksandr-pavlyk Nov 7, 2023
80e2f29
Fixed gh-1468
oleksandr-pavlyk Nov 7, 2023
ff9b5eb
Added a test based on gh-1468
oleksandr-pavlyk Nov 7, 2023
ca2c6aa
Removed redundant asdtype function call
oleksandr-pavlyk Nov 7, 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
83 changes: 55 additions & 28 deletions dpctl/tensor/_reduction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,12 @@ def _reduction_over_axis(
res_shape = res_shape + (1,) * red_nd
inv_perm = sorted(range(nd), key=lambda d: perm[d])
res_shape = tuple(res_shape[i] for i in inv_perm)
return dpt.astype(
dpt.full(
res_shape,
_identity,
dtype=_default_reduction_type_fn(inp_dt, q),
usm_type=res_usm_type,
sycl_queue=q,
),
res_dt,
return dpt.full(
res_shape,
_identity,
dtype=res_dt,
usm_type=res_usm_type,
sycl_queue=q,
)
if red_nd == 0:
return dpt.astype(x, res_dt, copy=False)
Expand All @@ -142,21 +139,51 @@ def _reduction_over_axis(
"Automatically determined reduction data type does not "
"have direct implementation"
)
tmp_dt = _default_reduction_type_fn(inp_dt, q)
tmp = dpt.empty(
res_shape, dtype=tmp_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e_tmp, r_e = _reduction_fn(
src=arr2, trailing_dims_to_reduce=red_nd, dst=tmp, sycl_queue=q
)
host_tasks_list.append(ht_e_tmp)
res = dpt.empty(
res_shape, dtype=res_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e, _ = ti._copy_usm_ndarray_into_usm_ndarray(
src=tmp, dst=res, sycl_queue=q, depends=[r_e]
)
host_tasks_list.append(ht_e)
if _dtype_supported(res_dt, res_dt, res_usm_type, q):
tmp = dpt.empty(
arr2.shape, dtype=res_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e_cpy, cpy_e = ti._copy_usm_ndarray_into_usm_ndarray(
src=arr2, dst=tmp, sycl_queue=q
)
host_tasks_list.append(ht_e_cpy)
res = dpt.empty(
res_shape, dtype=res_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e_red, _ = _reduction_fn(
src=tmp,
trailing_dims_to_reduce=red_nd,
dst=res,
sycl_queue=q,
depends=[cpy_e],
)
host_tasks_list.append(ht_e_red)
else:
buf_dt = _default_reduction_type_fn(inp_dt, q)
tmp = dpt.empty(
arr2.shape, dtype=buf_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e_cpy, cpy_e = ti._copy_usm_ndarray_into_usm_ndarray(
src=arr2, dst=tmp, sycl_queue=q
)
tmp_res = dpt.empty(
res_shape, dtype=buf_dt, usm_type=res_usm_type, sycl_queue=q
)
host_tasks_list.append(ht_e_cpy)
res = dpt.empty(
res_shape, dtype=res_dt, usm_type=res_usm_type, sycl_queue=q
)
ht_e_red, r_e = _reduction_fn(
src=tmp,
trailing_dims_to_reduce=red_nd,
dst=tmp_res,
sycl_queue=q,
depends=[cpy_e],
)
ht_e_cpy2, _ = ti._copy_usm_ndarray_into_usm_ndarray(
src=tmp_res, dst=res, sycl_queue=q, depends=[r_e]
)
host_tasks_list.append(ht_e_cpy2)

if keepdims:
res_shape = res_shape + (1,) * red_nd
Expand Down Expand Up @@ -445,7 +472,7 @@ def _comparison_over_axis(x, axis, keepdims, _reduction_fn):


def max(x, axis=None, keepdims=False):
"""max(x, axis=None, dtype=None, keepdims=False)
"""max(x, axis=None, keepdims=False)

Calculates the maximum value of the input array `x`.

Expand Down Expand Up @@ -473,7 +500,7 @@ def max(x, axis=None, keepdims=False):


def min(x, axis=None, keepdims=False):
"""min(x, axis=None, dtype=None, keepdims=False)
"""min(x, axis=None, keepdims=False)

Calculates the minimum value of the input array `x`.

Expand Down Expand Up @@ -550,7 +577,7 @@ def _search_over_axis(x, axis, keepdims, _reduction_fn):


def argmax(x, axis=None, keepdims=False):
"""argmax(x, axis=None, dtype=None, keepdims=False)
"""argmax(x, axis=None, keepdims=False)

Returns the indices of the maximum values of the input array `x` along a
specified axis.
Expand Down Expand Up @@ -582,7 +609,7 @@ def argmax(x, axis=None, keepdims=False):


def argmin(x, axis=None, keepdims=False):
"""argmin(x, axis=None, dtype=None, keepdims=False)
"""argmin(x, axis=None, keepdims=False)

Returns the indices of the minimum values of the input array `x` along a
specified axis.
Expand Down
9 changes: 9 additions & 0 deletions dpctl/tests/test_tensor_sum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,12 @@ def test_prod_arg_out_dtype_matrix(arg_dtype, out_dtype):
assert isinstance(r, dpt.usm_ndarray)
assert r.dtype == dpt.dtype(out_dtype)
assert dpt.all(r == 1)


def test_gh_1468():
"See https://github.com/IntelPython/dpctl/issues/1468"
get_queue_or_skip()

a = dpt.full((2, 3, 4), 123456789, dtype=dpt.int32)
t = dpt.sum(a, dtype="f4")
assert t > 0
Loading