Merge branch 'master' into update-trigonometric-docstrings

Author: antonwolfy

.github/workflows/build-sphinx.yml

@@ -42,6 +42,7 @@ jobs:
       oneapi-pkgs-env: ''
       # Enable env when it's required to use only conda packages without OneAPI installation
       # oneapi-pkgs-env: '${{ github.workspace }}/environments/oneapi_pkgs.yml'
+      dpctl-pkg-txt: 'environments/dpctl_pkg.txt'
 
     steps:
       - name: Cancel Previous Runs
@@ -149,7 +150,7 @@ jobs:
       - name: Install dpctl
         if: env.oneapi-pkgs-env == ''
         run: |
-          pip install -i https://pypi.anaconda.org/dppy/label/dev/simple dpctl==0.20.0dev0
+          pip install -r ${{ env.dpctl-pkg-txt }}
 
       - name: Conda info
         run: |

.github/workflows/generate_coverage.yaml

@@ -26,6 +26,7 @@ jobs:
       oneapi-pkgs-env: ''
       # Enable env when it's required to use only conda packages without OneAPI installation
       # oneapi-pkgs-env: '${{ github.workspace }}/environments/oneapi_pkgs.yml'
+      dpctl-pkg-txt: 'environments/dpctl_pkg.txt'
 
     steps:
       - name: Cancel Previous Runs
@@ -108,7 +109,7 @@ jobs:
       - name: Install dpctl
         if: env.oneapi-pkgs-env == ''
         run: |
-          pip install -i https://pypi.anaconda.org/dppy/label/dev/simple dpctl==0.20.0dev0
+          pip install -r ${{ env.dpctl-pkg-txt }}
 
       - name: Conda info
         run: |

conda-recipe/meta.yaml

@@ -1,6 +1,6 @@
 {% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2026.0a0") %}
 {% set required_compiler_and_mkl_version = "2025.0" %}
-{% set required_dpctl_version = "0.19.0*" %}
+{% set required_dpctl_version = "0.20.0*" %}
 
 package:
     name: dpnp

dpnp/dpnp_iface_mathematical.py

@@ -802,6 +802,7 @@ def clip(a, /, min=None, max=None, *, out=None, order="K", **kwargs):
 
 conjugate = conj
 
+
 _COPYSIGN_DOCSTRING = """
 Composes a floating-point value with the magnitude of :math:`x1_i` and the sign
 of :math:`x2_i` for each element of the input array `x1`.
@@ -1735,7 +1736,7 @@ def ediff1d(ary, to_end=None, to_begin=None):
 Parameters
 ----------
 x : {dpnp.ndarray, usm_ndarray}
-    Input array, expected to have a real-valued floating-point data type.
+    Input array, expected to have a boolean or real-valued data type.
 out : {None, dpnp.ndarray, usm_ndarray}, optional
     Output array to populate.
     Array must have the correct shape and the expected data type.

dpnp/tests/test_mathematical.py

@@ -32,7 +32,6 @@
     get_integer_float_dtypes,
     has_support_aspect16,
     has_support_aspect64,
-    is_gpu_device,
     numpy_version,
 )
 from .third_party.cupy import testing
@@ -2178,25 +2177,11 @@ def test_out(self, func, dt_in, dt_out):
         if dt_in != dt_out:
             if numpy.can_cast(dt_in, dt_out, casting="same_kind"):
                 # NumPy allows "same_kind" casting, dpnp does not
-                if (
-                    func != "fix"
-                    and dt_in == dpnp.bool
-                    and dt_out == dpnp.int8
-                    and is_gpu_device()
-                ):
-                    # TODO: get rid of w/a when dpctl#2030 is fixed
-                    pass
-                else:
-                    assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
+                assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
             else:
                 assert_raises(ValueError, getattr(dpnp, func), ia, out=iout)
                 assert_raises(TypeError, getattr(numpy, func), a, out=out)
         else:
-            if func != "fix" and dt_in == dpnp.bool and is_gpu_device():
-                # TODO: get rid of w/a when dpctl#2030 is fixed
-                out = out.astype(numpy.int8)
-                iout = iout.astype(dpnp.int8)
-
             expected = getattr(numpy, func)(a, out=out)
             result = getattr(dpnp, func)(ia, out=iout)
             assert result is iout
@@ -2222,11 +2207,6 @@ def test_out_usm_ndarray(self, func, dt):
         out = numpy.empty(a.shape, dtype=dt)
         ia, usm_out = dpnp.array(a), dpt.asarray(out)
 
-        if func != "fix" and dt == dpnp.bool and is_gpu_device():
-            # TODO: get rid of w/a when dpctl#2030 is fixed
-            out = out.astype(numpy.int8)
-            usm_out = dpt.asarray(usm_out, dtype=dpnp.int8)
-
         expected = getattr(numpy, func)(a, out=out)
         result = getattr(dpnp, func)(ia, out=usm_out)
         assert result.get_array() is usm_out

dpnp/tests/test_umath.py

@@ -108,8 +108,6 @@ def test_umaths(test_cases):
         and is_gpu_device()
     ):
         pytest.skip("dpctl-1652")
-    elif umath in ["ceil", "floor", "trunc"] and args[0].dtype == dpnp.bool:
-        pytest.skip("dpctl-2030")
     elif (
         umath == "tan"
         and dpnp.issubdtype(args[0].dtype, dpnp.complexfloating)

environments/dpctl_pkg.txt

@@ -0,0 +1,2 @@
+--index-url https://pypi.anaconda.org/dppy/label/dev/simple
+dpctl>=0.20.0dev0

setup.py

@@ -84,5 +84,5 @@ def _get_cmdclass():
     },
     include_package_data=False,
     python_requires=">=3.9,<3.14",
-    install_requires=["dpctl >= 0.19.0dev0", "numpy"],
+    install_requires=["dpctl >= 0.20.0dev0", "numpy"],
 )