Merge f9b1af5 into be5c3f0

Author: vlad-perevezentsev

dpnp/dpnp_iface_mathematical.py

@@ -627,7 +627,7 @@ def around(x, /, decimals=0, out=None):
 )
 
 
-def clip(a, a_min, a_max, *, out=None, order="K", **kwargs):
+def clip(a, /, a_min=None, a_max=None, *, out=None, order="K", **kwargs):
     """
     Clip (limit) the values in an array.
 
@@ -639,8 +639,10 @@ def clip(a, a_min, a_max, *, out=None, order="K", **kwargs):
         Array containing elements to clip.
     a_min, a_max : {dpnp.ndarray, usm_ndarray, None}
         Minimum and maximum value. If ``None``, clipping is not performed on
-        the corresponding edge. Only one of `a_min` and `a_max` may be
-        ``None``. Both are broadcast against `a`.
+        the corresponding edge. If both ``a_min`` and ``a_max`` are ``None``,
+        the elements of the returned array stay the same.
+        Both are broadcast against `a`.
+        Default : ``None``.
     out : {None, dpnp.ndarray, usm_ndarray}, optional
         The results will be placed in this array. It may be the input array
         for in-place clipping. `out` must be of the right shape to hold the
@@ -687,9 +689,6 @@ def clip(a, a_min, a_max, *, out=None, order="K", **kwargs):
     if kwargs:
         raise NotImplementedError(f"kwargs={kwargs} is currently not supported")
 
-    if a_min is None and a_max is None:
-        raise ValueError("One of max or min must be given")
-
     if order is None:
         order = "K"
 

tests/third_party/cupy/math_tests/test_misc.py

@@ -126,12 +126,13 @@ def test_clip_max_none(self, xp, dtype):
         a = testing.shaped_arange((2, 3, 4), xp, dtype)
         return a.clip(3, None)
 
+    # numpy>=2.0 does not raise ValueError with a_min=None, a_max=None
+    @testing.with_requires("numpy>=2.0")
     @testing.for_all_dtypes(no_bool=True, no_complex=True)
     def test_clip_min_max_none(self, dtype):
         for xp in (numpy, cupy):
             a = testing.shaped_arange((2, 3, 4), xp, dtype)
-            with pytest.raises(ValueError):
-                a.clip(None, None)
+            return a.clip(None, None)
 
     @testing.for_all_dtypes(no_complex=True)
     @testing.numpy_cupy_array_equal()
@@ -155,8 +156,15 @@ def test_external_clip3(self, xp, dtype):
     def test_external_clip4(self, dtype):
         for xp in (numpy, cupy):
             a = testing.shaped_arange((2, 3, 4), xp, dtype)
-            with pytest.raises(TypeError):
-                xp.clip(a, 3)
+            # dpnp.clip() has default a_min, a_max variables as None
+            # while numpy.clip() uses np._NoValue(numpy>=2.0)
+            # or required arguments (numpy<2.0) for a_min, a_max
+            # and raises TypeError if passing a_min only
+            if xp is numpy:
+                with pytest.raises(TypeError):
+                    xp.clip(a, 3)
+            else:
+                return xp.clip(a, 3)
 
     @testing.for_all_dtypes(no_complex=True)
     @testing.numpy_cupy_array_equal()