Merge branch 'master' into extended_types_support

vtavana · web-flow · commit 7c592955163a · 2025-02-03T12:34:02.000-06:00
diff --git a/.github/workflows/array-api-skips.txt b/.github/workflows/array-api-skips.txt
@@ -38,8 +38,5 @@ array_api_tests/test_signatures.py::test_func_signature[var]
 array_api_tests/test_linalg.py::test_vecdot
 array_api_tests/test_linalg.py::test_linalg_vecdot
 
-# tuple index out of range
-array_api_tests/test_linalg.py::test_linalg_matmul
-
 # arrays have different values
 array_api_tests/test_linalg.py::test_linalg_tensordot
diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml
@@ -180,7 +180,7 @@ jobs:
 
       # https://github.com/marketplace/actions/doxygen-action
       - name: Build backend docs
-        uses: mattnotmitt/doxygen-action@cbe72c8e402e8a3faa1f0b247ef90aa6c8e4ce74 # v1.9.8
+        uses: mattnotmitt/doxygen-action@b84fe17600245bb5db3d6c247cc274ea98c15a3b # v1.12
         with:
             working-directory: 'dpnp/backend/doc'
 
@@ -266,6 +266,7 @@ jobs:
       - name: Modify the comment with URL to official documentation
         uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
         with:
+          message-id: url_to_docs
           find: |
             View rendered docs @.+
           replace: |
diff --git a/.github/workflows/openssf-scorecard.yml b/.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@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/pre-commit.yml b/.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@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
           python-version: '3.13'
 
diff --git a/dpnp/backend/cmake/Modules/IntelSYCLConfig.cmake b/dpnp/backend/cmake/Modules/IntelSYCLConfig.cmake
@@ -1,5 +1,5 @@
 #
-# Modifications, Copyright (C) 2023-2025 Intel Corporation
+# Modifications, Copyright (c) 2023-2025 Intel Corporation
 #
 # This software and the related documents are Intel copyrighted materials, and
 # your use of them is governed by the express license under which they were
diff --git a/dpnp/backend/cmake/Modules/oneDPLConfig.cmake b/dpnp/backend/cmake/Modules/oneDPLConfig.cmake
@@ -1,6 +1,6 @@
 ##===----------------------------------------------------------------------===##
 #
-# Copyright (C) Intel Corporation
+# Copyright (c) Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
diff --git a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py
@@ -835,7 +835,14 @@ def dpnp_matmul(
     elif x1_base_is_1D and x2_base_is_1D:
         # TODO: implement a batch version of dot to use it here
         call_flag = "gemm_batch"
-        res_shape = result_shape
+        if x1_ndim == 1:
+            x1 = dpnp.reshape(x1, (1, 1, x1.size))
+            res_shape = result_shape[:-1] + (1, result_shape[-1])
+        elif x2_ndim == 1:
+            x2 = dpnp.reshape(x2, (1, x2.size, 1))
+            res_shape = result_shape + (1,)
+        else:
+            res_shape = result_shape
     elif x1_is_1D and x2_is_2D:
         transpose = True
         call_flag = "gemv"
diff --git a/dpnp/tests/test_mathematical.py b/dpnp/tests/test_mathematical.py
@@ -2758,6 +2758,9 @@ def setup_method(self):
             ((3, 3, 1), (3, 1, 2)),
             ((3, 3, 1), (1, 1, 2)),
             ((1, 3, 1), (3, 1, 2)),
+            ((4,), (3, 4, 1)),
+            ((3, 1, 4), (4,)),
+            ((3, 1, 4), (3, 4, 1)),
             ((4, 1, 3, 1), (1, 3, 1, 2)),
             ((1, 3, 3, 1), (4, 1, 1, 2)),
         ],
diff --git a/dpnp/tests/third_party/cupy/core_tests/test_nep50_examples.py b/dpnp/tests/third_party/cupy/core_tests/test_nep50_examples.py
@@ -2,6 +2,7 @@
 import pytest
 
 import dpnp as cp
+from dpnp.tests.helper import has_support_aspect64
 from dpnp.tests.third_party.cupy import testing
 
 # TODO: remove once all dtype aliases added
@@ -15,8 +16,6 @@
     "uint8(1) + 2",
     "array([1], uint8) + int64(1)",
     "array([1], uint8) + array(1, int64)",
-    "array([1.], float32) + float64(1.)",
-    "array([1.], float32) + array(1., float64)",
     "array([1], uint8) + 1",
     "array([1], uint8) + 200",
     "array([100], uint8) + 200",
@@ -25,7 +24,6 @@
     "uint8(100) + 200",
     "float32(1) + 3e100",
     "array([1.0], float32) + 1e-14 == 1.0",
-    "array([0.1], float32) == float64(0.1)",
     "array(1.0, float32) + 1e-14 == 1.0",
     "array([1.], float32) + 3",
     "array([1.], float32) + int64(3)",
@@ -42,25 +40,34 @@
     "1.0 + array([1, 2, 3], int8)",
     "array([1], float32) + 1j",
 ]
+if has_support_aspect64():
+    examples += [
+        "array([1.], float32) + float64(1.)",
+        "array([1.], float32) + array(1., float64)",
+        "array([0.1], float32) == float64(0.1)",
+    ]
 
 
 @pytest.mark.filterwarnings("ignore::RuntimeWarning")
 @testing.with_requires("numpy>=2.0")
 @pytest.mark.parametrize("example", examples)
-@testing.numpy_cupy_allclose(atol=1e-15, accept_error=OverflowError)
+@testing.numpy_cupy_allclose(
+    atol=1e-15, accept_error=OverflowError, type_check=has_support_aspect64()
+)
 def test_nep50_examples(xp, example):
     dct = {
         "array": xp.array,
         "uint8": xp.uint8,
         "int64": xp.int64,
         "float32": xp.float32,
-        "float64": xp.float64,
         "int16": xp.int16,
         "bool_": xp.bool_,
         "int32": xp.int32,
         "complex64": xp.complex64,
         "int8": xp.int8,
     }
+    if has_support_aspect64():
+        dct["float64"] = xp.float64
 
     if isinstance(example, tuple):
         example, mesg = example
diff --git a/dpnp/tests/third_party/cupy/linalg_tests/test_product.py b/dpnp/tests/third_party/cupy/linalg_tests/test_product.py
@@ -173,7 +173,7 @@ class TestLinalgCrossProduct(unittest.TestCase):
 
     @testing.with_requires("numpy>=2.0")
     @testing.for_all_dtypes_combination(["dtype_a", "dtype_b"])
-    @testing.numpy_cupy_allclose()
+    @testing.numpy_cupy_allclose(type_check=has_support_aspect64())
     def test_cross(self, xp, dtype_a, dtype_b):
         if dtype_a == dtype_b == numpy.bool_:
             # cross does not support bool-bool inputs.
diff --git a/dpnp/tests/third_party/cupy/math_tests/test_misc.py b/dpnp/tests/third_party/cupy/math_tests/test_misc.py
@@ -199,7 +199,7 @@ def test_fabs(self, xp, dtype):
 
     @testing.with_requires("numpy>=2.0")
     @testing.for_all_dtypes(no_complex=True)
-    @testing.numpy_cupy_allclose(atol=1e-5)
+    @testing.numpy_cupy_allclose(atol=1e-5, type_check=has_support_aspect64())
     def test_fabs_negative(self, xp, dtype):
         if numpy.issubdtype(dtype, numpy.unsignedinteger):
             pytest.skip("trying to set negative value to unsigned integer")
diff --git a/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py b/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py
@@ -1162,51 +1162,75 @@ def test_ediff1d_ed2(self, xp, dtype):
 class TestTrapezoid:
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_1dim(self, xp, dtype):
         a = testing.shaped_arange((5,), xp, dtype)
         return xp.trapezoid(a)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_1dim_with_x(self, xp, dtype):
         a = testing.shaped_arange((5,), xp, dtype)
         x = testing.shaped_arange((5,), xp, dtype)
         return xp.trapezoid(a, x=x)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_1dim_with_dx(self, xp, dtype):
         a = testing.shaped_arange((5,), xp, dtype)
         return xp.trapezoid(a, dx=0.1)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_2dim_without_axis(self, xp, dtype):
         a = testing.shaped_arange((4, 5), xp, dtype)
         return xp.trapezoid(a)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_2dim_with_axis(self, xp, dtype):
         a = testing.shaped_arange((4, 5), xp, dtype)
         return xp.trapezoid(a, axis=-2)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_2dim_with_x_and_axis(self, xp, dtype):
         a = testing.shaped_arange((4, 5), xp, dtype)
         x = testing.shaped_arange((5,), xp, dtype)
         return xp.trapezoid(a, x=x, axis=1)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_2dim_with_dx_and_axis(self, xp, dtype):
         a = testing.shaped_arange((4, 5), xp, dtype)
         return xp.trapezoid(a, dx=0.1, axis=1)
 
     @testing.for_all_dtypes()
-    @testing.numpy_cupy_allclose(rtol={numpy.float16: 1e-1, "default": 1e-7})
+    @testing.numpy_cupy_allclose(
+        rtol={numpy.float16: 1e-1, "default": 1e-7},
+        type_check=has_support_aspect64(),
+    )
     def test_trapz_1dim_with_x_and_dx(self, xp, dtype):
         a = testing.shaped_arange((5,), xp, dtype)
         x = testing.shaped_arange((5,), xp, dtype)
diff --git a/dpnp/tests/third_party/cupy/testing/_loops.py b/dpnp/tests/third_party/cupy/testing/_loops.py
@@ -585,12 +585,12 @@ def numpy_cupy_allclose(
     # When `type_check` is `False`, cupy result and numpy result may have
     # different dtypes so we can not determine the dtype to use from the
     # tolerance associations.
-    if not type_check:
-        if isinstance(rtol, dict) or isinstance(atol, dict):
-            raise TypeError(
-                "When `type_check` is `False`, `rtol` and `atol` "
-                "must be supplied as float."
-            )
+    # if not type_check:
+    #     if isinstance(rtol, dict) or isinstance(atol, dict):
+    #         raise TypeError(
+    #             "When `type_check` is `False`, `rtol` and `atol` "
+    #             "must be supplied as float."
+    #         )
 
     def check_func(c, n):
         rtol1, atol1 = _resolve_tolerance(type_check, c, rtol, atol)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Modifications, Copyright (C) 2023-2025 Intel Corporation`
	`2`	`+# Modifications, Copyright (c) 2023-2025 Intel Corporation`
`3`	`3`	`#`
`4`	`4`	`# This software and the related documents are Intel copyrighted materials, and`
`5`	`5`	`# your use of them is governed by the express license under which they were`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`##===----------------------------------------------------------------------===##`
`2`	`2`	`#`
`3`		`-# Copyright (C) Intel Corporation`
	`3`	`+# Copyright (c) Intel Corporation`
`4`	`4`	`#`
`5`	`5`	`# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception`
`6`	`6`	`#`