Skip to content

Commit 6d7d088

Browse files
authored
Merge 2dfa892 into 1b3da83
2 parents 1b3da83 + 2dfa892 commit 6d7d088

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

dpnp/dpnp_iface_mathematical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,7 @@ def ediff1d(ary, to_end=None, to_begin=None):
17361736
Parameters
17371737
----------
17381738
x : {dpnp.ndarray, usm_ndarray}
1739-
Input array, expected to have a real-valued data type.
1739+
Input array, expected to have a boolean or real-valued data type.
17401740
out : {None, dpnp.ndarray, usm_ndarray}, optional
17411741
Output array to populate.
17421742
Array must have the correct shape and the expected data type.

dpnp/tests/test_mathematical.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,20 +2240,11 @@ def test_out(self, func, dt_in, dt_out):
22402240
if dt_in != dt_out:
22412241
if numpy.can_cast(dt_in, dt_out, casting="same_kind"):
22422242
# NumPy allows "same_kind" casting, dpnp does not
2243-
if func != "fix" and dt_in == dpnp.bool and dt_out == dpnp.int8:
2244-
# TODO: get rid of w/a when dpctl#2030 is fixed
2245-
pass
2246-
else:
2247-
assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
2243+
assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
22482244
else:
22492245
assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
22502246
assert_raises(TypeError, getattr(numpy, func), a, out=out)
22512247
else:
2252-
if func != "fix" and dt_in == dpnp.bool:
2253-
# TODO: get rid of w/a when dpctl#2030 is fixed
2254-
out = out.astype(numpy.int8)
2255-
iout = iout.astype(dpnp.int8)
2256-
22572248
expected = getattr(numpy, func)(a, out=out)
22582249
result = getattr(dpnp, func)(ia, out=iout)
22592250
assert result is iout
@@ -2279,11 +2270,6 @@ def test_out_usm_ndarray(self, func, dt):
22792270
out = numpy.empty(a.shape, dtype=dt)
22802271
ia, usm_out = dpnp.array(a), dpt.asarray(out)
22812272

2282-
if func != "fix" and dt == dpnp.bool:
2283-
# TODO: get rid of w/a when dpctl#2030 is fixed
2284-
out = out.astype(numpy.int8)
2285-
usm_out = dpt.asarray(usm_out, dtype=dpnp.int8)
2286-
22872273
expected = getattr(numpy, func)(a, out=out)
22882274
result = getattr(dpnp, func)(ia, out=usm_out)
22892275
assert result.get_array() is usm_out

dpnp/tests/test_umath.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ def test_umaths(test_cases):
108108
and is_gpu_device()
109109
):
110110
pytest.skip("dpctl-1652")
111-
elif umath in ["ceil", "floor", "trunc"] and args[0].dtype == dpnp.bool:
112-
pytest.skip("dpctl-2030")
113111
elif (
114112
umath == "tan"
115113
and dpnp.issubdtype(args[0].dtype, dpnp.complexfloating)

0 commit comments

Comments
 (0)