Skip to content

Commit b05b1a1

Browse files
antonwolfyantonwolfy
committed
Add a strict keyword to testing f/w
1 parent 5468479 commit b05b1a1

File tree

2 files changed

+120
-55
lines changed

2 files changed

+120
-55
lines changed

‎dpnp/tests/third_party/cupy/testing/_array.py‎

Lines changed: 101 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import warnings
2+
3+
import numpy
14
import numpy.testing
25

36
import dpnp as cupy
@@ -6,7 +9,15 @@
69

710

811
def assert_allclose(
9-
actual, desired, rtol=1e-7, atol=0, err_msg="", verbose=True
12+
actual,
13+
desired,
14+
rtol=1e-7,
15+
atol=0,
16+
equal_nan=True,
17+
err_msg="",
18+
verbose=True,
19+
*,
20+
strict=False,
1021
):
1122
"""Raises an AssertionError if objects are not equal up to desired tolerance.
1223
@@ -22,17 +33,42 @@ def assert_allclose(
2233
.. seealso:: :func:`numpy.testing.assert_allclose`
2334
2435
"""
25-
numpy.testing.assert_allclose(
26-
cupy.asnumpy(actual),
27-
cupy.asnumpy(desired),
28-
rtol=rtol,
29-
atol=atol,
30-
err_msg=err_msg,
31-
verbose=verbose,
32-
)
36+
if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0":
37+
numpy.testing.assert_allclose(
38+
cupy.asnumpy(actual),
39+
cupy.asnumpy(desired),
40+
rtol=rtol,
41+
atol=atol,
42+
equal_nan=equal_nan,
43+
err_msg=err_msg,
44+
verbose=verbose,
45+
strict=strict,
46+
)
47+
else:
48+
if strict:
49+
warnings.warn(
50+
"`dpnp.tests.third_party.cupy.testing.assert_allclose` does not support `strict` "
51+
"option with NumPy v1.",
52+
RuntimeWarning,
53+
)
54+
numpy.testing.assert_allclose(
55+
cupy.asnumpy(actual),
56+
cupy.asnumpy(desired),
57+
rtol=rtol,
58+
atol=atol,
59+
equal_nan=equal_nan,
60+
err_msg=err_msg,
61+
verbose=verbose,
62+
)
3363

3464

35-
def assert_array_almost_equal(x, y, decimal=6, err_msg="", verbose=True):
65+
def assert_array_almost_equal(
66+
actual,
67+
desired,
68+
decimal=6,
69+
err_msg="",
70+
verbose=True,
71+
):
3672
"""Raises an AssertionError if objects are not equal up to desired precision.
3773
3874
Args:
@@ -46,8 +82,8 @@ def assert_array_almost_equal(x, y, decimal=6, err_msg="", verbose=True):
4682
.. seealso:: :func:`numpy.testing.assert_array_almost_equal`
4783
"""
4884
numpy.testing.assert_array_almost_equal(
49-
cupy.asnumpy(x),
50-
cupy.asnumpy(y),
85+
cupy.asnumpy(actual),
86+
cupy.asnumpy(desired),
5187
decimal=decimal,
5288
err_msg=err_msg,
5389
verbose=verbose,
@@ -87,7 +123,13 @@ def assert_array_max_ulp(a, b, maxulp=1, dtype=None):
87123

88124

89125
def assert_array_equal(
90-
x, y, err_msg="", verbose=True, strides_check=False, **kwargs
126+
actual,
127+
desired,
128+
err_msg="",
129+
verbose=True,
130+
*,
131+
strict=False,
132+
strides_check=False,
91133
):
92134
"""Raises an AssertionError if two array_like objects are not equal.
93135
@@ -105,22 +147,36 @@ def assert_array_equal(
105147
106148
.. seealso:: :func:`numpy.testing.assert_array_equal`
107149
"""
108-
numpy.testing.assert_array_equal(
109-
cupy.asnumpy(x),
110-
cupy.asnumpy(y),
111-
err_msg=err_msg,
112-
verbose=verbose,
113-
**kwargs,
114-
)
150+
if numpy.lib.NumpyVersion(numpy.__version__) >= "1.24.0":
151+
numpy.testing.assert_array_equal(
152+
cupy.asnumpy(actual),
153+
cupy.asnumpy(desired),
154+
err_msg=err_msg,
155+
verbose=verbose,
156+
strict=strict,
157+
)
158+
else:
159+
if strict:
160+
warnings.warn(
161+
"`dpnp.tests.third_party.cupy.testing.assert_allclose` does not support `strict` "
162+
"option with NumPy v1.",
163+
RuntimeWarning,
164+
)
165+
numpy.testing.assert_array_equal(
166+
cupy.asnumpy(actual),
167+
cupy.asnumpy(desired),
168+
err_msg=err_msg,
169+
verbose=verbose,
170+
)
115171

116172
if strides_check:
117-
if x.strides != y.strides:
173+
if actual.strides != desired.strides:
118174
msg = ["Strides are not equal:"]
119175
if err_msg:
120176
msg = [msg[0] + " " + err_msg]
121177
if verbose:
122-
msg.append(" x: {}".format(x.strides))
123-
msg.append(" y: {}".format(y.strides))
178+
msg.append(" x: {}".format(actual.strides))
179+
msg.append(" y: {}".format(desired.strides))
124180
raise AssertionError("\n".join(msg))
125181

126182

@@ -163,7 +219,7 @@ def assert_array_list_equal(xlist, ylist, err_msg="", verbose=True):
163219
)
164220

165221

166-
def assert_array_less(x, y, err_msg="", verbose=True):
222+
def assert_array_less(x, y, err_msg="", verbose=True, *, strict=False):
167223
"""Raises an AssertionError if array_like objects are not ordered by less than.
168224
169225
Args:
@@ -175,6 +231,24 @@ def assert_array_less(x, y, err_msg="", verbose=True):
175231
176232
.. seealso:: :func:`numpy.testing.assert_array_less`
177233
"""
178-
numpy.testing.assert_array_less(
179-
cupy.asnumpy(x), cupy.asnumpy(y), err_msg=err_msg, verbose=verbose
180-
)
234+
if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0":
235+
numpy.testing.assert_array_less(
236+
cupy.asnumpy(x),
237+
cupy.asnumpy(y),
238+
err_msg=err_msg,
239+
verbose=verbose,
240+
strict=strict,
241+
)
242+
else:
243+
if strict:
244+
warnings.warn(
245+
"`dpnp.tests.third_party.cupy.testing.assert_allclose` does not support `strict` "
246+
"option with NumPy v1.",
247+
RuntimeWarning,
248+
)
249+
numpy.testing.assert_array_less(
250+
cupy.asnumpy(x),
251+
cupy.asnumpy(y),
252+
err_msg=err_msg,
253+
verbose=verbose,
254+
)

‎dpnp/tests/third_party/cupy/testing/_loops.py‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def _make_positive_masks(impl, args, kw, name, sp_name, scipy_name):
251251
assert error is None
252252
if not isinstance(result, (tuple, list)):
253253
result = (result,)
254-
return [r >= 0 for r in result]
254+
return [cupy.asnumpy(r) >= 0 for r in result]
255255

256256

257257
def _contains_signed_and_unsigned(kw):
@@ -307,12 +307,9 @@ def decorator(impl):
307307
@_wraps_partial_xp(impl, name, sp_name, scipy_name)
308308
def test_func(*args, **kw):
309309
# Run cupy and numpy
310-
(
311-
cupy_result,
312-
cupy_error,
313-
numpy_result,
314-
numpy_error,
315-
) = _call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
310+
(cupy_result, cupy_error, numpy_result, numpy_error) = (
311+
_call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
312+
)
316313
assert cupy_result is not None or cupy_error is not None
317314
assert numpy_result is not None or numpy_error is not None
318315

@@ -411,8 +408,8 @@ def test_func(*args, **kw):
411408
if cupy_r.shape == ():
412409
skip = (mask == 0).all()
413410
else:
414-
cupy_r = cupy_r[mask]
415-
numpy_r = numpy_r[mask.asnumpy()]
411+
cupy_r = cupy_r[mask].asnumpy()
412+
numpy_r = numpy_r[mask]
416413

417414
if not skip:
418415
check_func(cupy_r, numpy_r)
@@ -446,7 +443,7 @@ def _convert_output_to_ndarray(c_out, n_out, sp_name, check_sparse_format):
446443
assert scipy.sparse.issparse(n_out)
447444
if check_sparse_format:
448445
assert c_out.format == n_out.format
449-
return c_out.A, n_out.A
446+
return c_out.toarray(), n_out.toarray()
450447
if isinstance(c_out, cupy.ndarray) and isinstance(
451448
n_out, (numpy.ndarray, numpy.generic)
452449
):
@@ -455,7 +452,6 @@ def _convert_output_to_ndarray(c_out, n_out, sp_name, check_sparse_format):
455452
if (
456453
hasattr(cupy, "poly1d")
457454
and isinstance(c_out, cupy.poly1d)
458-
and hasattr(numpy, "poly1d")
459455
and isinstance(n_out, numpy.poly1d)
460456
):
461457
# poly1d output case.
@@ -464,9 +460,6 @@ def _convert_output_to_ndarray(c_out, n_out, sp_name, check_sparse_format):
464460
if isinstance(c_out, numpy.generic) and isinstance(n_out, numpy.generic):
465461
# numpy scalar output case.
466462
return c_out, n_out
467-
if isinstance(c_out, numpy.ndarray) and isinstance(n_out, numpy.ndarray):
468-
# fallback on numpy output case.
469-
return c_out, n_out
470463
if numpy.isscalar(c_out) and numpy.isscalar(n_out):
471464
# python scalar output case.
472465
return cupy.array(c_out), numpy.array(n_out)
@@ -594,7 +587,9 @@ def numpy_cupy_allclose(
594587

595588
def check_func(c, n):
596589
rtol1, atol1 = _resolve_tolerance(type_check, c, rtol, atol)
597-
_array.assert_allclose(c, n, rtol1, atol1, err_msg, verbose)
590+
_array.assert_allclose(
591+
c, n, rtol1, atol1, err_msg=err_msg, verbose=verbose
592+
)
598593

599594
return _make_decorator(
600595
check_func,
@@ -795,7 +790,9 @@ def numpy_cupy_array_equal(
795790
"""
796791

797792
def check_func(x, y):
798-
_array.assert_array_equal(x, y, err_msg, verbose, strides_check)
793+
_array.assert_array_equal(
794+
x, y, err_msg, verbose, strides_check=strides_check
795+
)
799796

800797
return _make_decorator(
801798
check_func, name, type_check, False, accept_error, sp_name, scipy_name
@@ -905,12 +902,9 @@ def decorator(impl):
905902
@_wraps_partial_xp(impl, name, sp_name, scipy_name)
906903
def test_func(*args, **kw):
907904
# Run cupy and numpy
908-
(
909-
cupy_result,
910-
cupy_error,
911-
numpy_result,
912-
numpy_error,
913-
) = _call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
905+
(cupy_result, cupy_error, numpy_result, numpy_error) = (
906+
_call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
907+
)
914908

915909
if cupy_error or numpy_error:
916910
_check_cupy_numpy_error(
@@ -964,12 +958,9 @@ def decorator(impl):
964958
@_wraps_partial_xp(impl, name, sp_name, scipy_name)
965959
def test_func(*args, **kw):
966960
# Run cupy and numpy
967-
(
968-
cupy_result,
969-
cupy_error,
970-
numpy_result,
971-
numpy_error,
972-
) = _call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
961+
(cupy_result, cupy_error, numpy_result, numpy_error) = (
962+
_call_func_numpy_cupy(impl, args, kw, name, sp_name, scipy_name)
963+
)
973964

974965
_check_cupy_numpy_error(
975966
cupy_error, numpy_error, accept_error=accept_error

0 commit comments

Comments
 (0)