Merge branch 'master' into compare-shape

Author: vtavana

.github/workflows/check-mkl-interfaces.yaml

@@ -83,7 +83,7 @@ jobs:
           fetch-depth: 0
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.environment-file-name }}
           path: ${{ env.environment-file-loc }}
@@ -176,7 +176,7 @@ jobs:
           fetch-depth: 0
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.environment-file-name }}
           path: ${{ env.environment-file-loc }}

.github/workflows/conda-package.yml

@@ -149,7 +149,7 @@ jobs:
           path: ${{ env.dpnp-repo-path }}
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.pkg-path-in-channel }}
@@ -281,7 +281,7 @@ jobs:
           path: ${{ env.dpnp-repo-path }}
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.pkg-path-in-channel }}
@@ -376,7 +376,7 @@ jobs:
             Write-Warning "File $script_path was NOT found!"
           }
           # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
-          $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
+          $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"
           Get-Content -Tail 5 -Path $cl_cfg
 
       - name: Smoke test
@@ -445,12 +445,12 @@ jobs:
           fetch-depth: ${{ env.fetch-depth }}
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
 
       - name: Download wheels artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
 
@@ -533,7 +533,7 @@ jobs:
           path: ${{ env.dpnp-repo-path }}
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: ${{ env.package-name }} ${{ runner.os }} Python ${{ env.python-ver }}
           path: ${{ env.pkg-path-in-channel }}

.github/workflows/cron-run-tests.yaml

@@ -108,7 +108,7 @@ jobs:
             Write-Warning "File $script_path was NOT found!"
           }
           # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
-          $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
+          $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"
           Get-Content -Tail 5 -Path $cl_cfg
 
       - name: Smoke test

.github/workflows/openssf-scorecard.yml

@@ -68,6 +68,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
         with:
           sarif_file: results.sarif

.github/workflows/pre-commit.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up python
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: '3.13'
 

dpnp/tests/test_linalg.py

@@ -311,7 +311,7 @@ def test_basic(self, dtype, shape, p):
 
         result = dpnp.linalg.cond(ia, p=p)
         expected = numpy.linalg.cond(a, p=p)
-        assert_dtype_allclose(result, expected)
+        assert_dtype_allclose(result, expected, factor=16)
 
     @pytest.mark.parametrize(
         "p", [None, -dpnp.inf, -2, -1, 1, 2, dpnp.inf, "fro"]
@@ -2839,10 +2839,8 @@ def get_tol(self, dtype):
         tol = 1e-06
         if dtype in (dpnp.float32, dpnp.complex64):
             tol = 1e-03
-        elif not has_support_aspect64() and dtype in (
-            dpnp.int32,
-            dpnp.int64,
-            None,
+        elif not has_support_aspect64() and (
+            dtype is None or dpnp.issubdtype(dtype, dpnp.integer)
         ):
             tol = 1e-03
         self._tol = tol
@@ -2993,10 +2991,8 @@ def get_tol(self, dtype):
         tol = 1e-06
         if dtype in (dpnp.float32, dpnp.complex64):
             tol = 1e-03
-        elif not has_support_aspect64() and dtype in (
-            dpnp.int32,
-            dpnp.int64,
-            None,
+        elif not has_support_aspect64() and (
+            dtype is None or dpnp.issubdtype(dtype, dpnp.integer)
         ):
             tol = 1e-03
         self._tol = tol

dpnp/tests/test_product.py

@@ -199,7 +199,7 @@ def test_ones(self, dtype):
     @pytest.mark.parametrize("dtype", get_all_dtypes(no_bool=True))
     def test_arange(self, dtype):
         n = 10**2
-        m = 10**3 if dtype is not dpnp.float32 else 10**2
+        m = 10**3 if dtype not in [dpnp.float32, dpnp.complex64] else 10**2
         a = numpy.hstack((numpy.arange(n, dtype=dtype),) * m)
         b = numpy.flipud(a)
         ia = dpnp.array(a)

dpnp/tests/third_party/cupy/creation_tests/test_ranges.py

@@ -229,7 +229,7 @@ def test_linspace_mixed_start_stop2(self, xp, dtype_range, dtype_out):
         if xp.dtype(dtype_range).kind in "u":
             # to avoid overflow, limit `val` to be smaller
             # than xp.iinfo(dtype).max
-            if dtype_range == xp.uint8 or dtype_out == xp.uint8:
+            if dtype_range in [xp.uint8, xp.uint16] or dtype_out == xp.uint8:
                 val = 125
             else:
                 val = 160

dpnp/tests/third_party/cupy/linalg_tests/test_einsum.py

@@ -373,8 +373,6 @@ def test_einsum_unary_views(self, xp, dtype):
     def test_einsum_unary_dtype(self, xp, dtype_a, dtype_out):
         if not numpy.can_cast(dtype_a, dtype_out):
             pytest.skip()
-        if cupy.issubdtype(dtype_a, cupy.unsignedinteger):
-            pytest.skip("dpctl-2055")
         a = testing.shaped_arange(self.shape_a, xp, dtype_a)
         return xp.einsum(self.subscripts, a, dtype=dtype_out)
 

dpnp/tests/third_party/cupy/math_tests/test_explog.py

@@ -16,8 +16,12 @@ def check_unary(self, name, xp, dtype, no_complex=False):
         a = testing.shaped_arange((2, 3), xp, dtype)
         return getattr(xp, name)(a)
 
+    # rtol=1e-3 is added for dpnp to pass the test when dtype is int8/unint8
+    # for such a case, output dtype is float16
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(atol=1e-5, type_check=has_support_aspect64())
+    @testing.numpy_cupy_allclose(
+        rtol=1e-3, atol=1e-5, type_check=has_support_aspect64()
+    )
     def check_binary(self, name, xp, dtype, no_complex=False):
         if no_complex:
             if numpy.dtype(dtype).kind == "c":

dpnp/tests/third_party/cupy/math_tests/test_trigonometric.py

@@ -1,5 +1,7 @@
 import unittest
 
+import pytest
+
 from dpnp.tests.helper import has_support_aspect64
 from dpnp.tests.third_party.cupy import testing
 
@@ -76,12 +78,26 @@ def test_unwrap_1dim_with_discont(self, xp, dtype):
     @testing.for_all_dtypes(no_complex=True)
     @testing.numpy_cupy_allclose(type_check=has_support_aspect64())
     def test_unwrap_1dim_with_period(self, xp, dtype):
+        if not has_support_aspect64() and dtype in [xp.uint8, xp.uint16]:
+            # The unwrap function relies on the remainder function, and the
+            # result of remainder can vary significantly between float32 and
+            # float64. This discrepancy causes test failures when numpy uses
+            # float64 and dpnp uses float32, especially with uint8/uint16
+            # dtypes where overflow occurs
+            pytest.skip("skipping due to large difference of result")
         a = testing.shaped_random((5,), xp, dtype)
         return xp.unwrap(a, period=1.2)
 
     @testing.for_all_dtypes(no_complex=True)
     @testing.numpy_cupy_allclose(type_check=has_support_aspect64())
     def test_unwrap_1dim_with_discont_and_period(self, xp, dtype):
+        if not has_support_aspect64() and dtype in [xp.uint8, xp.uint16]:
+            # The unwrap function relies on the remainder function, and the
+            # result of remainder can vary significantly between float32 and
+            # float64. This discrepancy causes test failures when numpy uses
+            # float64 and dpnp uses float32, especially with uint8/uint16
+            # dtypes where overflow occurs
+            pytest.skip("skipping due to large difference of result")
         a = testing.shaped_random((5,), xp, dtype)
         return xp.unwrap(a, discont=1.0, period=1.2)
 

environments/build_conda_pkg.yml

@@ -3,4 +3,4 @@ channels:
   - conda-forge
 dependencies:
   - python=3.12 # conda-build does not support python 3.13
-  - conda-build=25.3.2
+  - conda-build=25.4.2