Skip to content

Fix coverity issue in linalg and clip dispatchers #1535

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
Feb 7, 2024
Merged

Fix coverity issue in linalg and clip dispatchers #1535

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
1531a63
Coverity report fix for _linear_agebra_functions
oleksandr-pavlyk Feb 7, 2024
1db33c6
Coverity report fix for _clip
oleksandr-pavlyk Feb 7, 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
82 changes: 26 additions & 56 deletions dpctl/tensor/_clip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,25 +298,25 @@ def _clip_none(x, val, out, order, _binary_fn):
else:
val_ary = dpt.asarray(val, dtype=val_dtype, sycl_queue=exec_q)

if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
val_ary,
)
)
else "C"
)
if val_dtype == res_dt:
if out is None:
if order == "K":
out = _empty_like_pair_orderK(
x, val_ary, res_dt, res_shape, res_usm_type, exec_q
)
else:
if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
val_ary,
)
)
else "C"
)
out = dpt.empty(
res_shape,
dtype=res_dt,
Expand Down Expand Up @@ -347,8 +347,6 @@ def _clip_none(x, val, out, order, _binary_fn):
if order == "K":
buf = _empty_like_orderK(val_ary, res_dt)
else:
if order == "A":
order = "F" if x.flags.f_contiguous else "C"
buf = dpt.empty_like(val_ary, dtype=res_dt, order=order)
ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
src=val_ary, dst=buf, sycl_queue=exec_q
Expand Down Expand Up @@ -473,8 +471,6 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
if order == "K":
out = _empty_like_orderK(x, x.dtype)
else:
if order == "A":
order = "F" if x.flags.f_contiguous else "C"
out = dpt.empty_like(x, order=order)

ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
Expand Down Expand Up @@ -659,6 +655,19 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
else:
a_max = dpt.asarray(max, dtype=max_dtype, sycl_queue=exec_q)

if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
a_min,
a_max,
)
)
else "C"
)
if buf1_dt is None and buf2_dt is None:
if out is None:
if order == "K":
Expand All @@ -672,19 +681,6 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
exec_q,
)
else:
if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
a_min,
a_max,
)
)
else "C"
)
out = dpt.empty(
res_shape,
dtype=res_dt,
Expand Down Expand Up @@ -718,18 +714,6 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
if order == "K":
buf2 = _empty_like_orderK(a_max, buf2_dt)
else:
if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
a_min,
)
)
else "C"
)
buf2 = dpt.empty_like(a_max, dtype=buf2_dt, order=order)
ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
src=a_max, dst=buf2, sycl_queue=exec_q
Expand Down Expand Up @@ -784,18 +768,6 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
if order == "K":
buf1 = _empty_like_orderK(a_min, buf1_dt)
else:
if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x,
a_max,
)
)
else "C"
)
buf1 = dpt.empty_like(a_min, dtype=buf1_dt, order=order)
ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
src=a_min, dst=buf1, sycl_queue=exec_q
Expand Down Expand Up @@ -846,7 +818,7 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
ht_binary_ev.wait()
return out

if order in ["K", "A"]:
if order == "K":
if (
x.flags.f_contiguous
and a_min.flags.f_contiguous
Expand All @@ -859,8 +831,6 @@ def clip(x, /, min=None, max=None, out=None, order="K"):
and a_max.flags.c_contiguous
):
order = "C"
else:
order = "C" if order == "A" else "K"
if order == "K":
buf1 = _empty_like_orderK(a_min, buf1_dt)
else:
Expand Down
33 changes: 14 additions & 19 deletions dpctl/tensor/_linear_algebra_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,25 +765,26 @@ def matmul(x1, x2, out=None, dtype=None, order="K"):
# after being checked against x1
out = dpt.empty_like(out)

if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x1,
x2,
)
)
else "C"
)

if buf1_dt is None and buf2_dt is None:
if out is None:
if order == "K":
out = _empty_like_pair_orderK(
x1, x2, res_dt, res_shape, res_usm_type, exec_q
)
else:
if order == "A":
order = (
"F"
if all(
arr.flags.f_contiguous
for arr in (
x1,
x2,
)
)
else "C"
)
out = dpt.empty(
res_shape,
dtype=res_dt,
Expand Down Expand Up @@ -823,8 +824,6 @@ def matmul(x1, x2, out=None, dtype=None, order="K"):
if order == "K":
buf2 = _empty_like_orderK(x2, buf2_dt)
else:
if order == "A":
order = "F" if x1.flags.f_contiguous else "C"
buf2 = dpt.empty_like(x2, dtype=buf2_dt, order=order)
ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
src=x2, dst=buf2, sycl_queue=exec_q
Expand Down Expand Up @@ -878,8 +877,6 @@ def matmul(x1, x2, out=None, dtype=None, order="K"):
if order == "K":
buf1 = _empty_like_orderK(x1, buf1_dt)
else:
if order == "A":
order = "F" if x1.flags.f_contiguous else "C"
buf1 = dpt.empty_like(x1, dtype=buf1_dt, order=order)
ht_copy_ev, copy_ev = ti._copy_usm_ndarray_into_usm_ndarray(
src=x1, dst=buf1, sycl_queue=exec_q
Expand Down Expand Up @@ -929,13 +926,11 @@ def matmul(x1, x2, out=None, dtype=None, order="K"):
out = dpt.squeeze(out, tuple(appended_axes))
return out

if order in ["K", "A"]:
if order == "K":
if x1.flags.f_contiguous and x2.flags.f_contiguous:
order = "F"
elif x1.flags.c_contiguous and x2.flags.c_contiguous:
order = "C"
else:
order = "C" if order == "A" else "K"
if order == "K":
buf1 = _empty_like_orderK(x1, buf1_dt)
else:
Expand Down