Merge branch 'master' into fix-vecmat-win-failure

Author: antonwolfy

.github/workflows/openssf-scorecard.yml

@@ -72,6 +72,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
         with:
           sarif_file: results.sarif

.pre-commit-config.yaml

@@ -64,7 +64,7 @@ repos:
         additional_dependencies:
             - tomli
 -   repo: https://github.com/psf/black
-    rev: 25.9.0
+    rev: 25.11.0
     hooks:
     -   id: black
         exclude: "dpnp/_version.py"

CHANGELOG.md

@@ -24,6 +24,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
 * Extended `pre-commit` configuration with `pyupgrade`, `actionlint`, and `gersemi` hooks [#2658](https://github.com/IntelPython/dpnp/pull/2658)
 * Added implementation of `dpnp.ndarray.tobytes` method [#2656](https://github.com/IntelPython/dpnp/pull/2656)
 * Added implementation of `dpnp.ndarray.__format__` method [#2662](https://github.com/IntelPython/dpnp/pull/2662)
+* Added implementation of `dpnp.ndarray.__bytes__` method [#2671](https://github.com/IntelPython/dpnp/pull/2671)
 
 ### Changed
 
@@ -46,6 +47,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
 
 * Dropped support for Python 3.9 [#2626](https://github.com/IntelPython/dpnp/pull/2626)
 * Removed the obsolete interface from DPNP to Numba JIT [#2647](https://github.com/IntelPython/dpnp/pull/2647)
+* Removed the `newshape` parameter from `dpnp.reshape`, which has been deprecated since dpnp 0.17.0. Pass it positionally or use `shape=` on newer versions [#2670](https://github.com/IntelPython/dpnp/pull/2670)
 
 ### Fixed
 

doc/reference/ndarray.rst

@@ -436,6 +436,7 @@ and return the appropriate scalar.
    :toctree: generated/
    :nosignatures:
 
+   ndarray.__bytes__
    ndarray.__index__
    ndarray.__int__
    ndarray.__float__

dpnp/dpnp_array.py

@@ -185,6 +185,10 @@ def __bool__(self, /):
         """``True`` if `self` else ``False``."""
         return self._array_obj.__bool__()
 
+    def __bytes__(self):
+        r"""Return :math:`\text{bytes(self)}`."""
+        return bytes(self.asnumpy())
+
     # '__class__',
     # `__class_getitem__`,
 

dpnp/dpnp_iface_manipulation.py

@@ -3013,7 +3013,7 @@ def require(a, dtype=None, requirements=None, *, like=None):
     return arr
 
 
-def reshape(a, /, shape=None, order="C", *, newshape=None, copy=None):
+def reshape(a, /, shape=None, order="C", *, copy=None):
     """
     Gives a new shape to an array without changing its data.
 
@@ -3045,10 +3045,6 @@ def reshape(a, /, shape=None, order="C", *, newshape=None, copy=None):
         Fortran *contiguous* in memory, C-like order otherwise.
 
         Default: ``"C"``.
-    newshape : int or tuple of ints
-        Replaced by `shape` argument. Retained for backward compatibility.
-
-        Default: ``None``.
     copy : {None, bool}, optional
         If ``True``, then the array data is copied. If ``None``, a copy will
         only be made if it's required by ``order``. For ``False`` it raises
@@ -3117,27 +3113,11 @@ def reshape(a, /, shape=None, order="C", *, newshape=None, copy=None):
 
     """
 
-    if newshape is None and shape is None:
+    if shape is None:
         raise TypeError(
             "reshape() missing 1 required positional argument: 'shape'"
         )
 
-    if newshape is not None:
-        if shape is not None:
-            raise TypeError(
-                "You cannot specify 'newshape' and 'shape' arguments "
-                "at the same time."
-            )
-        # Deprecated in dpnp 0.17.0
-        warnings.warn(
-            "`newshape` keyword argument is deprecated, "
-            "use `shape=...` or pass shape positionally instead. "
-            "(deprecated in dpnp 0.17.0)",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        shape = newshape
-
     if order is None:
         order = "C"
     elif order in "aA":

dpnp/tests/test_manipulation.py

@@ -1124,21 +1124,6 @@ def test_copy(self):
 
 
 class TestReshape:
-    def test_error(self):
-        ia = dpnp.arange(10)
-        assert_raises(TypeError, dpnp.reshape, ia)
-        assert_raises(
-            TypeError, dpnp.reshape, ia, shape=(2, 5), newshape=(2, 5)
-        )
-
-    @pytest.mark.filterwarnings("ignore::DeprecationWarning")
-    def test_newshape(self):
-        a = numpy.arange(10)
-        ia = dpnp.array(a)
-        expected = numpy.reshape(a, (2, 5))
-        result = dpnp.reshape(ia, newshape=(2, 5))
-        assert_array_equal(result, expected)
-
     @pytest.mark.parametrize("order", [None, "C", "F", "A"])
     def test_order(self, order):
         a = numpy.arange(10)

dpnp/tests/test_product.py

@@ -12,7 +12,6 @@
     assert_dtype_allclose,
     generate_random_numpy_array,
     get_all_dtypes,
-    is_ptl,
     numpy_version,
 )
 from .third_party.cupy import testing
@@ -1152,7 +1151,6 @@ def test_large_values(self, dtype):
         expected = numpy.matmul(a, b)
         assert_dtype_allclose(result, expected)
 
-    @pytest.mark.skipif(is_ptl(), reason="MKLD-18712")
     @pytest.mark.parametrize("dt_out", [numpy.int32, numpy.float32])
     @pytest.mark.parametrize(
         "shape1, shape2",

dpnp/tests/third_party/cupy/core_tests/test_ndarray.py

@@ -653,32 +653,28 @@ def test_size_zero_dim_array_with_axis(self):
 
 class TestPythonInterface(unittest.TestCase):
 
-    @pytest.mark.skip("__bytes__ is not supported")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_equal()
     def test_bytes_tobytes(self, xp, dtype):
         x = testing.shaped_arange((3, 4, 5), xp, dtype)
         return bytes(x)
 
-    @pytest.mark.skip("__bytes__ is not supported")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_equal()
     def test_bytes_tobytes_empty(self, xp, dtype):
-        x = xp.empty((0,), dtype)
+        x = xp.empty((0,), dtype=dtype)
         return bytes(x)
 
-    @pytest.mark.skip("__bytes__ is not supported")
     @testing.for_all_dtypes()
     @testing.numpy_cupy_equal()
     def test_bytes_tobytes_empty2(self, xp, dtype):
-        x = xp.empty((3, 0, 4), dtype)
+        x = xp.empty((3, 0, 4), dtype=dtype)
         return bytes(x)
 
     # The result of bytes(numpy.array(scalar)) is the same as bytes(scalar)
     # if scalar is of an integer dtype including bool_. It's spec is
     # bytes(int): bytes object of size given by the parameter initialized with
     # null bytes.
-    @pytest.mark.skip("__bytes__ is not supported")
     @testing.for_float_dtypes()
     @testing.numpy_cupy_equal()
     def test_bytes_tobytes_scalar_array(self, xp, dtype):