Merge branch 'master' into fix_gh-2264

Author: vtavana

.github/workflows/array-api-skips.txt

@@ -17,18 +17,6 @@ array_api_tests/test_signatures.py::test_func_signature[unique_counts]
 array_api_tests/test_signatures.py::test_func_signature[unique_inverse]
 array_api_tests/test_signatures.py::test_func_signature[unique_values]
 
-# no '__array_namespace_info__' function
-array_api_tests/test_has_names.py::test_has_names[info-__array_namespace_info__]
-array_api_tests/test_inspection_functions.py::test_array_namespace_info
-array_api_tests/test_inspection_functions.py::test_array_namespace_info_dtypes
-array_api_tests/test_searching_functions.py::test_searchsorted
-array_api_tests/test_signatures.py::test_func_signature[__array_namespace_info__]
-array_api_tests/test_signatures.py::test_info_func_signature[capabilities]
-array_api_tests/test_signatures.py::test_info_func_signature[default_device]
-array_api_tests/test_signatures.py::test_info_func_signature[default_dtypes]
-array_api_tests/test_signatures.py::test_info_func_signature[devices]
-array_api_tests/test_signatures.py::test_info_func_signature[dtypes]
-
 # do not return a namedtuple
 array_api_tests/test_linalg.py::test_eigh
 array_api_tests/test_linalg.py::test_slogdet

.github/workflows/build-sphinx.yml

@@ -223,6 +223,7 @@ jobs:
           PR_NUM: ${{ github.event.number }}
         uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
         with:
+          message-id: url_to_docs
           message: |
             View rendered docs @ https://intelpython.github.io/dpnp/pull/${{ env.PR_NUM }}/index.html
           allow-repeats: false

.github/workflows/conda-package.yml

@@ -14,7 +14,7 @@ env:
   # CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
   CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
   CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13
-  CONDA_BUILD_VERSION: '24.11.2'
+  CONDA_BUILD_VERSION: '25.1.1'
   CONDA_INDEX_VERSION: '0.5.0'
   RERUN_TESTS_ON_FAILURE: 'true'
   RUN_TESTS_MAX_ATTEMPTS: 2
@@ -101,7 +101,7 @@ jobs:
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-          path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
+          path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
 
       - name: Upload wheels artifact
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
@@ -129,7 +129,6 @@ jobs:
     env:
       channel-path: '${{ github.workspace }}/channel/'
       pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
-      extracted-pkg-path: '${{ github.workspace }}/pkg/'
       ver-json-path: '${{ github.workspace }}/version.json'
 
     steps:
@@ -139,11 +138,6 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.pkg-path-in-channel }}
 
-      - name: Extract package archive
-        run: |
-          mkdir -p ${{ env.extracted-pkg-path }}
-          tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
-
       - name: Setup miniconda
         id: setup_miniconda
         continue-on-error: true
@@ -168,7 +162,8 @@ jobs:
           activate-environment: ${{ env.TEST_ENV_NAME }}
 
       - name: Install conda-index
-        run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
+        run: |
+          mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
 
       - name: Create conda channel
         run: |
@@ -253,7 +248,6 @@ jobs:
     env:
       channel-path: '${{ github.workspace }}\channel\'
       pkg-path-in-channel: '${{ github.workspace }}\channel\win-64\'
-      extracted-pkg-path: '${{ github.workspace }}\pkg'
       ver-json-path: '${{ github.workspace }}\version.json'
       workdir: '${{ github.workspace }}'
 
@@ -264,19 +258,16 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.pkg-path-in-channel }}
 
-      - name: Extract package archive
+      - name: Store a path to package archive
         run: |
           @echo on
-          mkdir -p ${{ env.extracted-pkg-path }}
 
-          set SEARCH_SCRIPT="DIR ${{ env.pkg-path-in-channel }} /s/b | FINDSTR /r "dpnp-.*\.tar\.bz2""
+          set SEARCH_SCRIPT="DIR ${{ env.pkg-path-in-channel }} /s/b | FINDSTR /r "dpnp-.*\.conda""
           FOR /F "tokens=* USEBACKQ" %%F IN (`%SEARCH_SCRIPT%`) DO (
             SET FULL_PACKAGE_PATH=%%F
           )
           echo FULL_PACKAGE_PATH: %FULL_PACKAGE_PATH%
-
-          python -c "import shutil; shutil.unpack_archive(r\"%FULL_PACKAGE_PATH%\", extract_dir=r\"${{ env.extracted-pkg-path }}\")"
-          dir ${{ env.extracted-pkg-path }}
+          (echo FULL_PACKAGE_PATH=%FULL_PACKAGE_PATH%) >> %GITHUB_ENV%
 
       - name: Setup miniconda
         uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
@@ -295,7 +286,8 @@ jobs:
           (echo CONDA_LIB_BIN_PATH=%CONDA_PREFIX%\Library\bin\) >> %GITHUB_ENV%
 
       - name: Install conda-index
-        run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
+        run: |
+          mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
 
       - name: Create conda channel
         run: |
@@ -418,11 +410,11 @@ jobs:
       - name: Package version
         shell: bash -el {0}
         run: |
-          echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.conda | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
 
       - name: Upload
         run: |
-          anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
+          anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.conda
         env:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
 
@@ -461,7 +453,6 @@ jobs:
       array-api-skips-file: '${{ github.workspace }}/dpnp/.github/workflows/array-api-skips.txt'
       channel-path: '${{ github.workspace }}/channel/'
       pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
-      extracted-pkg-path: '${{ github.workspace }}/pkg/'
       ver-json-path: '${{ github.workspace }}/version.json'
 
     steps:
@@ -471,11 +462,6 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.pkg-path-in-channel }}
 
-      - name: Extract package archive
-        run: |
-          mkdir -p ${{ env.extracted-pkg-path }}
-          tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
-
       - name: Setup miniconda
         id: setup_miniconda
         continue-on-error: true
@@ -502,11 +488,13 @@ jobs:
       - name: Install conda-index
         id: install_conda_index
         continue-on-error: true
-        run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
+        run: |
+          mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
 
       - name: ReInstall conda-index
         if: steps.install_conda_index.outcome == 'failure'
-        run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
+        run: |
+          mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
 
       - name: Create conda channel
         run: |
@@ -612,9 +600,9 @@ jobs:
         if: ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork }}
         uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
         with:
+          message-id: array_api_results
           message: |
             ${{ env.MESSAGE }}
-          refresh-message-position: true
 
   cleanup_packages:
     name: Clean up anaconda packages

conda-recipe/run_test.bat

@@ -32,10 +32,10 @@ if not defined PYTHON (
 
 
 "%PYTHON%" -c "import dpnp; print(dpnp.__version__)"
-if errorlevel 1 exit 1
+if %errorlevel% neq 0 exit 1
 
 "%PYTHON%" -m dpctl -f
-if errorlevel 1 exit 1
+if %errorlevel% neq 0 exit 1
 
 "%PYTHON%" -m pytest -ra --pyargs dpnp
-if errorlevel 1 exit 1
+if %errorlevel% neq 0 exit 1

doc/reference/array_api.rst

@@ -0,0 +1,26 @@
+.. _array-api-standard-compatibility:
+
+.. https://numpy.org/doc/stable/reference/array_api.html
+
+********************************
+Array API standard compatibility
+********************************
+
+DPNP's main namespace as well as the :mod:`dpnp.fft` and :mod:`dpnp.linalg`
+namespaces are compatible with the
+`2023.12 version <https://data-apis.org/array-api/2023.12/index.html>`__
+of the Python array API standard.
+
+Inspection
+==========
+
+DPNP implements the `array API inspection utilities
+<https://data-apis.org/array-api/latest/API_specification/inspection.html>`__.
+These functions can be accessed via the ``__array_namespace_info__()``
+function, which returns a namespace containing the inspection utilities.
+
+.. autosummary::
+   :toctree: generated/
+   :nosignatures:
+
+   dpnp.__array_namespace_info__

doc/reference/fft.rst

@@ -1,3 +1,7 @@
+.. _routines.fft:
+
+.. py:module:: dpnp.fft
+
 Discrete Fourier Transform
 ==========================
 

doc/reference/index.rst

@@ -33,3 +33,4 @@ API reference of the Data Parallel Extension for NumPy*
    dtypes_table
    comparison
    misc
+   array_api

doc/reference/linalg.rst

@@ -1,3 +1,7 @@
+.. _routines.linalg:
+
+.. py:module:: dpnp.linalg
+
 Linear algebra
 ==============
 

dpnp/__init__.py

@@ -63,16 +63,17 @@
             )
 
 # Borrowed from DPCTL
-from dpctl.tensor import DLDeviceType
+from dpctl.tensor import __array_api_version__, DLDeviceType
 
-from dpnp.dpnp_array import dpnp_array as ndarray
-from dpnp.dpnp_flatiter import flatiter as flatiter
-from dpnp.dpnp_iface_types import *
-from dpnp.dpnp_iface import *
-from dpnp.dpnp_iface import __all__ as _iface__all__
-from dpnp.dpnp_iface_utils import *
-from dpnp.dpnp_iface_utils import __all__ as _ifaceutils__all__
-from dpnp._version import get_versions
+from .dpnp_array import dpnp_array as ndarray
+from .dpnp_array_api_info import __array_namespace_info__
+from .dpnp_flatiter import flatiter as flatiter
+from .dpnp_iface_types import *
+from .dpnp_iface import *
+from .dpnp_iface import __all__ as _iface__all__
+from .dpnp_iface_utils import *
+from .dpnp_iface_utils import __all__ as _ifaceutils__all__
+from ._version import get_versions
 
 __all__ = _iface__all__
 __all__ += _ifaceutils__all__

dpnp/dpnp_array.py

@@ -1731,6 +1731,7 @@ def std(
         keepdims=False,
         *,
         where=True,
+        mean=None,
     ):
         """
         Returns the standard deviation of the array elements, along given axis.
@@ -1739,7 +1740,9 @@ def std(
 
         """
 
-        return dpnp.std(self, axis, dtype, out, ddof, keepdims, where=where)
+        return dpnp.std(
+            self, axis, dtype, out, ddof, keepdims, where=where, mean=mean
+        )
 
     @property
     def strides(self):
@@ -1938,6 +1941,7 @@ def var(
         keepdims=False,
         *,
         where=True,
+        mean=None,
     ):
         """
         Returns the variance of the array elements, along given axis.
@@ -1946,7 +1950,9 @@ def var(
 
         """
 
-        return dpnp.var(self, axis, dtype, out, ddof, keepdims, where=where)
+        return dpnp.var(
+            self, axis, dtype, out, ddof, keepdims, where=where, mean=mean
+        )
 
 
 # 'view'

dpnp/dpnp_array_api_info.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# *****************************************************************************
+# Copyright (c) 2025, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+# *****************************************************************************
+
+"""
+Array API Inspection namespace
+
+This is the namespace for inspection functions as defined by the array API
+standard. See
+https://data-apis.org/array-api/latest/API_specification/inspection.html for
+more details.
+
+"""
+
+import dpctl.tensor as dpt
+
+__all__ = ["__array_namespace_info__"]
+
+
+def __array_namespace_info__():
+    """
+    Returns a namespace with Array API namespace inspection utilities.
+
+    The array API inspection namespace defines the following functions:
+
+    - capabilities()
+    - default_device()
+    - default_dtypes()
+    - dtypes()
+    - devices()
+
+    Returns
+    -------
+    info : ModuleType
+        The array API inspection namespace for DPNP.
+
+    Examples
+    --------
+    >>> import dpnp as np
+    >>> info = np.__array_namespace_info__()
+    >>> info.default_dtypes()  # may vary and depends on default device
+    {'real floating': dtype('float64'),
+     'complex floating': dtype('complex128'),
+     'integral': dtype('int64'),
+     'indexing': dtype('int64')}
+
+    """
+
+    return dpt.__array_namespace_info__()