Merge master into impl-piecewise

Author: vlad-perevezentsev

.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@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+        uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
         with:
           sarif_file: results.sarif

.github/workflows/pre-commit-autoupdate.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: '3.13'
 

.github/workflows/pre-commit.yml

@@ -36,7 +36,7 @@ jobs:
           ref: ${{ github.sha }}
 
       - name: Set up python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: '3.13'
 

CHANGELOG.md

@@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed `dpnp.unique` with 1d input array and `axis=0`, `equal_nan=True` keywords passed where the produced result doesn't collapse the NaNs [#2530](https://github.com/IntelPython/dpnp/pull/2530)
 * Resolved issue when `dpnp.ndarray` constructor is called with `dpnp.ndarray.data` as `buffer` keyword [#2533](https://github.com/IntelPython/dpnp/pull/2533)
 * Fixed `dpnp.linalg.cond` to always return a real dtype [#2547](https://github.com/IntelPython/dpnp/pull/2547)
+* Resolved the issue in `dpnp.random` functions to allow any value of `size` where each element is castable to `Py_ssize_t` type [#2578](https://github.com/IntelPython/dpnp/pull/2578)
 
 ### Security
 

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -390,10 +390,26 @@ cpdef inline tuple _object_to_tuple(object obj):
     if obj is None:
         return ()
 
-    if cpython.PySequence_Check(obj):
-        return tuple(obj)
+    # dpnp.ndarray unconditionally succeeds in PySequence_Check as it implements __getitem__
+    if cpython.PySequence_Check(obj) and not dpnp.is_supported_array_type(obj):
+        if isinstance(obj, numpy.ndarray):
+            obj = numpy.atleast_1d(obj)
+
+        nd = len(obj)
+        shape = []
+
+        for i in range(0, nd):
+            if cpython.PyBool_Check(obj[i]):
+                raise TypeError("DPNP object_to_tuple(): no item in size can be bool")
+
+            # Assumes each item is castable to Py_ssize_t,
+            # otherwise TypeError will be raised
+            shape.append(<Py_ssize_t> obj[i])
+        return tuple(shape)
 
     if dpnp.isscalar(obj):
+        if cpython.PyBool_Check(obj):
+            raise TypeError("DPNP object_to_tuple(): 'obj' can't be bool")
         return (obj, )
 
     raise ValueError("DPNP object_to_tuple(): 'obj' should be 'None', collections.abc.Sequence, or 'int'")

dpnp/tests/helper.py

@@ -404,6 +404,14 @@ def has_support_aspect64(device=None):
     return dev.has_aspect_fp64
 
 
+def is_arl_or_mtl(device=None):
+    """
+    Return True if a test is running on Arrow Lake or Meteor Lake GPU device,
+    False otherwise.
+    """
+    return _get_dev_mask(device) == 0x7D00
+
+
 def is_cpu_device(device=None):
     """
     Return True if a test is running on CPU device, False otherwise.

dpnp/tests/test_linalg.py

@@ -23,7 +23,8 @@
     get_float_complex_dtypes,
     get_integer_float_dtypes,
     has_support_aspect64,
-    is_cpu_device,
+    is_arl_or_mtl,
+    is_win_platform,
     numpy_version,
 )
 from .third_party.cupy import testing
@@ -109,6 +110,8 @@ def test_usm_ndarray_linalg_batch(func, gen_kwargs, func_kwargs):
             )
             for _ in range(2)
         ]
+    elif func == "cholesky" and is_win_platform() and is_arl_or_mtl():
+        pytest.skip("SAT-8206")
     else:
         dpt_args = [
             dpt.asarray(generate_random_numpy_array(shape, **gen_kwargs))
@@ -158,6 +161,8 @@ class TestCholesky:
     def test_cholesky(self, array, dtype):
         a = numpy.array(array, dtype=dtype)
         ia = dpnp.array(a)
+        if ia.ndim > 2 and is_win_platform() and is_arl_or_mtl():
+            pytest.skip("SAT-8206")
         result = dpnp.linalg.cholesky(ia)
         expected = numpy.linalg.cholesky(a)
         assert_dtype_allclose(result, expected)
@@ -177,6 +182,8 @@ def test_cholesky(self, array, dtype):
     @pytest.mark.parametrize("dtype", get_all_dtypes(no_bool=True))
     def test_cholesky_upper(self, array, dtype):
         ia = dpnp.array(array, dtype=dtype)
+        if ia.ndim > 2 and is_win_platform() and is_arl_or_mtl():
+            pytest.skip("SAT-8206")
         result = dpnp.linalg.cholesky(ia, upper=True)
 
         if ia.ndim > 2:
@@ -219,6 +226,8 @@ def test_cholesky_upper(self, array, dtype):
     def test_cholesky_upper_numpy(self, array, dtype):
         a = numpy.array(array, dtype=dtype)
         ia = dpnp.array(a)
+        if ia.ndim > 2 and is_win_platform() and is_arl_or_mtl():
+            pytest.skip("SAT-8206")
         result = dpnp.linalg.cholesky(ia, upper=True)
         expected = numpy.linalg.cholesky(a, upper=True)
         assert_dtype_allclose(result, expected)

dpnp/tests/test_random_state.py

@@ -21,6 +21,7 @@
     is_cpu_device,
     is_gpu_device,
 )
+from .third_party.cupy import testing
 
 # aspects of default device:
 _def_device = dpctl.SyclQueue().sycl_device
@@ -1115,3 +1116,31 @@ def test_invalid_dtype(self, dtype):
     def test_invalid_usm_type(self, usm_type):
         # dtype must be float32 or float64
         assert_raises(ValueError, RandomState().uniform, usm_type=usm_type)
+
+    def test_size_castable_to_integer(self):
+        M = numpy.int64(31)
+        N = numpy.int64(31)
+        K = 63  # plain Python int
+
+        sizes = [(M, K), (M, N), (K, N)]
+        for size in sizes:
+            result = RandomState().uniform(size=size)
+            assert result.shape == size
+
+    @testing.with_requires("numpy>=2.3.2")
+    @pytest.mark.parametrize("xp", [numpy, dpnp])
+    @pytest.mark.parametrize(
+        "size",
+        [True, [True], dpnp.bool(True), numpy.array(True), numpy.array([True])],
+    )
+    def test_bool_size(self, xp, size):
+        rs = xp.random.RandomState()
+        assert_raises(TypeError, rs.uniform, size=size)
+
+    @pytest.mark.parametrize("size", [numpy.array(1), numpy.array([2])])
+    def test_numpy_ndarray_size(self, size):
+        result = RandomState().uniform(size=size)
+        assert result.shape == size
+
+    def test_dpnp_ndarray_size(self):
+        assert_raises(ValueError, RandomState().uniform, size=dpnp.array(1))

dpnp/tests/test_strides.py

@@ -182,6 +182,7 @@ def test_erf(dtype):
     assert_dtype_allclose(result, expected)
 
 
+@pytest.mark.filterwarnings("ignore::RuntimeWarning")
 @pytest.mark.parametrize("dtype", get_float_complex_dtypes())
 @pytest.mark.parametrize("stride", [2, -1, -3])
 def test_reciprocal(dtype, stride):

dpnp/tests/test_sycl_queue.py

@@ -12,7 +12,12 @@
 from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import get_usm_allocations
 
-from .helper import generate_random_numpy_array, get_all_dtypes, is_win_platform
+from .helper import (
+    generate_random_numpy_array,
+    get_all_dtypes,
+    is_arl_or_mtl,
+    is_win_platform,
+)
 
 list_of_backend_str = ["cuda", "host", "level_zero", "opencl"]
 
@@ -1501,6 +1506,8 @@ def test_cholesky(self, data, is_empty, device):
         else:
             dtype = dpnp.default_float_type(device)
             x = dpnp.array(data, dtype=dtype, device=device)
+            if x.ndim > 2 and is_win_platform() and is_arl_or_mtl():
+                pytest.skip("SAT-8206")
 
         result = dpnp.linalg.cholesky(x)
         assert_sycl_queue_equal(result.sycl_queue, x.sycl_queue)