Merge branch 'master' into reduce-bloat-in-tensor-test-suite

ndgrigorian · web-flow · commit 1c13fd8ba6e7 · 2026-05-09T18:51:12.000-07:00
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -91,15 +91,15 @@ jobs:
       - name: Build conda package
         id: build_conda_pkg
         continue-on-error: true
-        run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
+        run: conda-build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
         env:
-          MAX_BUILD_CMPL_MKL_VERSION: '2026.0a0'
+          MAX_BUILD_CMPL_MKL_VERSION: '2027.0a0'
 
       - name: ReBuild conda package
         if: steps.build_conda_pkg.outcome == 'failure'
-        run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
+        run: conda-build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
         env:
-          MAX_BUILD_CMPL_MKL_VERSION: '2026.0a0'
+          MAX_BUILD_CMPL_MKL_VERSION: '2027.0a0'
 
       - name: Upload artifact
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
diff --git a/.github/workflows/cron-run-tests.yaml b/.github/workflows/cron-run-tests.yaml
@@ -81,6 +81,9 @@ jobs:
           python-version: ${{ matrix.python }}
           activate-environment: ${{ env.test-env-name }}
 
+      - name: Install OCL CPU RT from Intel channel
+        run: mamba install intel-opencl-rt=*=intel_* ${{ env.channels-list }}
+
       - name: Install dpnp
         id: install_dpnp
         continue-on-error: true
@@ -92,9 +95,6 @@ jobs:
         run: |
           mamba install ${{ env.package-name }}=${{ steps.find_latest_tag.outputs.tag }} ${{ env.test-packages }} ${{ env.channels-list }}
 
-      - name: Install OCL CPU RT from Intel channel
-        run: mamba install intel-opencl-rt=*=intel_* ${{ env.channels-list }}
-
       - name: List installed packages
         run: mamba list
 
diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml
@@ -46,16 +46,18 @@ jobs:
           echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
           sudo apt update
 
-      - name: Install latest Intel OneAPI
+      # Pinned to OneAPI 2025.3 due to known 2026.0 DPC++ compiler issue with Segfault during the sycl-post-link
+      # TODO: renmove once CMPLRLLVM-75178 is resolved and released
+      - name: Install Intel OneAPI
         if: env.oneapi-pkgs-env == ''
         run: |
-          sudo apt install hwloc                           \
-                           intel-oneapi-mkl                \
-                           intel-oneapi-umf                \
-                           intel-oneapi-mkl-devel          \
-                           intel-oneapi-tbb-devel          \
-                           intel-oneapi-libdpstd-devel     \
-                           intel-oneapi-compiler-dpcpp-cpp
+          sudo apt install hwloc                                   \
+                           intel-oneapi-mkl-2025.3                 \
+                           intel-oneapi-umf-1.0                    \
+                           intel-oneapi-mkl-devel-2025.3           \
+                           intel-oneapi-tbb-devel-2022.3           \
+                           intel-oneapi-libdpstd-devel-2022.10     \
+                           intel-oneapi-compiler-dpcpp-cpp-2025.3
 
       - name: Checkout repo
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -107,10 +109,14 @@ jobs:
       # with a newer version of the DPC++ compiler).
       # Installing dpctl via the pip manager has no such limitation, as the package has no
       # run dependency on the DPC++ RT pip package, so this is why the step is necessary here.
+      # - name: Install dpctl
+      #   if: env.oneapi-pkgs-env == ''
+      #   run: |
+      #     pip install -r ${{ env.dpctl-pkg-txt }}
+      # TODO: renmove pinning once CMPLRLLVM-75178 is resolved and released
       - name: Install dpctl
-        if: env.oneapi-pkgs-env == ''
         run: |
-          pip install -r ${{ env.dpctl-pkg-txt }}
+          pip install dpctl>=0.23.0dev0 --index-url https://pypi.anaconda.org/dppy/label/coverage/simple
 
       - name: Conda info
         run: |
diff --git a/.github/workflows/openssf-scorecard.yml b/.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@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
         with:
           sarif_file: results.sarif
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -69,7 +69,7 @@ repos:
     -   id: black
         exclude: "dpnp/_version.py"
 -   repo: https://github.com/pycqa/isort
-    rev: 8.0.1
+    rev: 9.0.0a3
     hooks:
     -   id: isort
         name: isort (python)
@@ -89,7 +89,7 @@ repos:
             - flake8-docstrings==1.7.0
             - flake8-bugbear==24.12.12
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v22.1.3
+    rev: v22.1.4
     hooks:
     -   id: clang-format
         args: ["-i"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* Fixed incorrect in-place advanced indexing for 4D arrays when using `range` or `list` as index keys [#2872](https://github.com/IntelPython/dpnp/pull/2872)
+* Fixed `conda build` command syntax in GitHub workflows and documentation to use `conda-build` [#2888](https://github.com/IntelPython/dpnp/pull/2888)
+
 ### Security
 
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2027.0a0") %}
-{% set required_compiler_and_mkl_version = "2025.0" %}
-{% set required_dpctl_version = "0.22.0*" %}
+{% set required_compiler_and_mkl_version = "2026.0" %}
+{% set required_dpctl_version = "0.22.0" %}
 
 {% set pyproject = load_file_data('pyproject.toml') %}
 {% set py_build_deps = pyproject.get('build-system', {}).get('requires', []) %}
diff --git a/doc/quick_start_guide.rst b/doc/quick_start_guide.rst
@@ -74,7 +74,7 @@ And to build dpnp package from the sources:
 
 .. code-block:: bash
 
-    conda build conda-recipe -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels
+    conda-build conda-recipe -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels
 
 Finally, to install the result package:
 
diff --git a/dpnp/dpnp_array.py b/dpnp/dpnp_array.py
@@ -38,6 +38,8 @@
 
 import warnings
 
+import numpy
+
 import dpnp
 import dpnp.tensor as dpt
 import dpnp.tensor._type_utils as dtu
@@ -46,24 +48,45 @@
 from .exceptions import AxisError
 
 
+def _unwrap_index_element(x):
+    """
+    Unwrap a single index element for the tensor indexing layer.
+
+    Converts dpnp arrays to usm_ndarray and array-like objects (range, list)
+    to numpy arrays with intp dtype for NumPy-compatible advanced indexing.
+
+    """
+
+    if isinstance(x, dpt.usm_ndarray):
+        return x
+    if isinstance(x, dpnp_array):
+        return x.get_array()
+    if isinstance(x, range):
+        return numpy.asarray(x, dtype=numpy.intp)
+    if isinstance(x, list):
+        # keep boolean lists as boolean
+        arr = numpy.asarray(x)
+        # cast empty lists (float64 in NumPy) to intp
+        # for correct tensor indexing
+        if arr.size == 0:
+            arr = arr.astype(numpy.intp)
+        return arr
+    return x
+
+
 def _get_unwrapped_index_key(key):
     """
     Get an unwrapped index key.
 
     Return a key where each nested instance of DPNP array is unwrapped into
-    USM ndarray for further processing in DPCTL advanced indexing functions.
+    USM ndarray, and array-like objects (range, list) are converted to numpy
+    arrays for further processing in advanced indexing functions.
 
     """
 
     if isinstance(key, tuple):
-        if any(isinstance(x, dpnp_array) for x in key):
-            # create a new tuple from the input key with unwrapped DPNP arrays
-            return tuple(
-                x.get_array() if isinstance(x, dpnp_array) else x for x in key
-            )
-    elif isinstance(key, dpnp_array):
-        return key.get_array()
-    return key
+        return tuple(_unwrap_index_element(x) for x in key)
+    return _unwrap_index_element(key)
 
 
 # pylint: disable=too-many-public-methods
diff --git a/dpnp/tensor/_slicing.pxi b/dpnp/tensor/_slicing.pxi
@@ -104,12 +104,6 @@ cdef bint _is_boolean(object x) except *:
             return f in "?"
         else:
             return False
-    if callable(getattr(x, "__bool__", None)):
-        try:
-            x.__bool__()
-        except (TypeError, ValueError):
-            return False
-        return True
     return False
 
 
diff --git a/dpnp/tests/helper.py b/dpnp/tests/helper.py
@@ -13,7 +13,6 @@
 
 
 class LTS_VERSION(Enum):
-    V1_3 = "1.3"
     V1_6 = "1.6"
 
 
@@ -489,7 +488,7 @@ def is_lnl(device=None):
     return _get_dev_mask(device) == 0x6400
 
 
-def is_lts_driver(version=LTS_VERSION.V1_3, device=None):
+def is_lts_driver(version=LTS_VERSION.V1_6, device=None):
     """
     Return True if a test is running on a GPU device with LTS driver version,
     False otherwise.
diff --git a/dpnp/tests/test_indexing.py b/dpnp/tests/test_indexing.py
@@ -353,6 +353,59 @@ def test_indexing_array_negative_strides(self):
         arr[slices] = 10
         assert_equal(arr, 10.0, strict=False)
 
+    @pytest.mark.parametrize(
+        "idx",
+        [
+            (range(2), range(2)),
+            ([0, 1], [0, 1]),
+        ],
+        ids=["range", "list"],
+    )
+    def test_array_like_index_getitem(self, idx):
+        np_a = numpy.arange(36).reshape(2, 2, 3, 3)
+        dp_a = dpnp.arange(36).reshape(2, 2, 3, 3)
+        assert_array_equal(dp_a[idx], np_a[idx])
+
+    @pytest.mark.parametrize(
+        "idx",
+        [
+            (range(2), range(2)),
+            ([0, 1], [0, 1]),
+        ],
+        ids=["range", "list"],
+    )
+    def test_array_like_index_setitem(self, idx):
+        np_a = numpy.arange(36).reshape(2, 2, 3, 3)
+        dp_a = dpnp.arange(36).reshape(2, 2, 3, 3)
+        np_a[idx] = 0
+        dp_a[idx] = 0
+        assert_array_equal(dp_a, np_a)
+
+    def test_array_like_index_inplace_add(self):
+        np_a = numpy.arange(36).reshape(2, 2, 3, 3)
+        dp_a = dpnp.arange(36).reshape(2, 2, 3, 3)
+        np_tmp = -numpy.ones((2, 3, 3), dtype=numpy.intp)
+        dp_tmp = -dpnp.ones((2, 3, 3), dtype=numpy.intp)
+
+        np_a[range(2), range(2)] += 2 * np_tmp
+        dp_a[range(2), range(2)] += 2 * dp_tmp
+        assert_array_equal(dp_a, np_a)
+
+    @pytest.mark.parametrize(
+        "idx",
+        [
+            range(2),
+            [0, 1],
+            range(0),
+            [],
+        ],
+        ids=["range", "list", "empty_range", "empty_list"],
+    )
+    def test_array_like_single_index(self, idx):
+        np_a = numpy.arange(24).reshape(2, 3, 4)
+        dp_a = dpnp.arange(24).reshape(2, 3, 4)
+        assert_array_equal(dp_a[idx], np_a[idx])
+
 
 class TestIx:
     @pytest.mark.parametrize(
diff --git a/dpnp/tests/third_party/cupy/math_tests/test_misc.py b/dpnp/tests/third_party/cupy/math_tests/test_misc.py
@@ -4,7 +4,12 @@
 import pytest
 
 import dpnp as cupy
-from dpnp.tests.helper import has_support_aspect64, numpy_version
+from dpnp.tests.helper import (
+    has_support_aspect64,
+    is_lts_driver,
+    is_win_platform,
+    numpy_version,
+)
 from dpnp.tests.third_party.cupy import testing
 
 
@@ -113,6 +118,14 @@ def check_unary_inf_nan(self, name, xp, dtype):
     @testing.for_dtypes(["e", "f", "d", "F", "D"])
     @testing.numpy_cupy_array_equal()
     def check_binary_nan(self, name, xp, dtype):
+        if (
+            not is_win_platform()
+            and not is_lts_driver()
+            and name == "minimum"
+            and dtype == numpy.float16
+        ):
+            pytest.skip("GSD-12679")
+
         a = xp.array(
             [-3, numpy.nan, -1, numpy.nan, 0, numpy.nan, 2], dtype=dtype
         )
diff --git a/environments/oneapi_pkgs.yml b/environments/oneapi_pkgs.yml
@@ -2,8 +2,7 @@ name: OneAPI packages to build DPNP without OneAPI env activated
 channels:
   - https://software.repos.intel.com/python/conda/
 dependencies:
-  - dpcpp_linux-64>=2025.3 # force to install the latest release
-  - mkl-devel-dpcpp>=2025.3 # force to install the latest release
-  - mkl-devel>=2025.3 # w/a to intel_repack-feedstock#121
+  - dpcpp_linux-64
+  - mkl-devel-dpcpp
   - onedpl-devel
   - tbb-devel * intel_* # MKL hardly dependces on TBB from Intel channel
