Merge branch 'master' into use-windows-latest

Author: antonwolfy

.github/CODEOWNERS

@@ -1 +1 @@
-* @antonwolfy @AlexanderKalistratov @vlad-perevezentsev @vtavana
+* @antonwolfy @AlexanderKalistratov @vlad-perevezentsev @vtavana @ndgrigorian

.github/pull_request_template.md

@@ -1,6 +1,7 @@
 - [ ] Have you provided a meaningful PR description?
-- [ ] Have you added a test, reproducer or referred to issue with a reproducer?
+- [ ] Have you added a test, reproducer or referred to an issue with a reproducer?
 - [ ] Have you tested your changes locally for CPU and GPU devices?
 - [ ] Have you made sure that new changes do not introduce compiler warnings?
 - [ ] Have you checked performance impact of proposed changes?
-- [ ] If this PR is a work in progress, are you filing the PR as a draft?
+- [ ] Have you added documentation for your changes, if necessary?
+- [ ] Have you added your changes to the changelog?

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

@@ -1,42 +1,5 @@
 # array API tests to be skipped
 
-# no 'uint8' dtype
-array_api_tests/test_array_object.py::test_getitem_masking
-
-# missing unique-like functions
-array_api_tests/test_has_names.py::test_has_names[set-unique_all]
-array_api_tests/test_has_names.py::test_has_names[set-unique_counts]
-array_api_tests/test_has_names.py::test_has_names[set-unique_inverse]
-array_api_tests/test_has_names.py::test_has_names[set-unique_values]
-array_api_tests/test_set_functions.py::test_unique_all
-array_api_tests/test_set_functions.py::test_unique_counts
-array_api_tests/test_set_functions.py::test_unique_inverse
-array_api_tests/test_set_functions.py::test_unique_values
-array_api_tests/test_signatures.py::test_func_signature[unique_all]
-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]
-
-# do not return a namedtuple
-array_api_tests/test_linalg.py::test_eigh
-array_api_tests/test_linalg.py::test_slogdet
-array_api_tests/test_linalg.py::test_svd
-
-# hypothesis found failures
-array_api_tests/test_linalg.py::test_qr
-array_api_tests/test_operators_and_elementwise_functions.py::test_clip
-
-# unexpected result is returned
+# unexpected result is returned - unmute when dpctl-1986 is resolved
 array_api_tests/test_operators_and_elementwise_functions.py::test_asin
 array_api_tests/test_operators_and_elementwise_functions.py::test_asinh
-
-# missing 'correction' keyword argument
-array_api_tests/test_signatures.py::test_func_signature[std]
-array_api_tests/test_signatures.py::test_func_signature[var]
-
-# wrong shape is returned
-array_api_tests/test_linalg.py::test_vecdot
-array_api_tests/test_linalg.py::test_linalg_vecdot
-
-# arrays have different values
-array_api_tests/test_linalg.py::test_linalg_tensordot

.github/workflows/build-sphinx.yml

@@ -36,11 +36,13 @@ jobs:
       pull-requests: write
 
     env:
-      python-ver: '3.12'
-      CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
-      NO_INTEL_CHANNELS: '-c dppy/label/dev -c conda-forge --override-channels'
-      # Install the latest oneAPI compiler to work around an issue
-      INSTALL_ONE_API: 'yes'
+      environment-file: 'environments/environment.yml'
+      build-with-oneapi-env: 'environments/build_with_oneapi.yml'
+      building-docs-env: 'environments/building_docs.yml'
+      oneapi-pkgs-env: ''
+      # Enable env when it's required to use only conda packages without OneAPI installation
+      # oneapi-pkgs-env: '${{ github.workspace }}/environments/oneapi_pkgs.yml'
+      dpctl-pkg-txt: 'environments/dpctl_pkg.txt'
 
     steps:
       - name: Cancel Previous Runs
@@ -60,6 +62,7 @@ jobs:
           docker-images: false
 
       - name: Add Intel repository
+        if: env.oneapi-pkgs-env == ''
         run: |
           wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
@@ -75,6 +78,7 @@ jobs:
           sudo apt install --reinstall -y gcc-9 g++-9 libstdc++-9-dev
 
       - name: Install Intel OneAPI
+        if: env.oneapi-pkgs-env == ''
         run: |
           sudo apt install hwloc                           \
                            intel-oneapi-mkl                \
@@ -101,16 +105,25 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install conda-merge tool
+        uses: BSFishy/pip-action@8f2d471d809dc20b6ada98c91910b6ae6243f318 # v1
+        with:
+          packages: conda-merge
+
+      - name: Merge conda env files
+        run: |
+          conda-merge ${{ env.build-with-oneapi-env }} ${{ env.building-docs-env }} ${{ env.oneapi-pkgs-env }} > ${{ env.environment-file }}
+          cat ${{ env.environment-file }}
+
       - name: Setup miniconda
         id: setup_miniconda
         continue-on-error: true
         uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
         with:
           miniforge-version: latest
           use-mamba: 'true'
-          channels: conda-forge
           conda-remove-defaults: 'true'
-          python-version: ${{ env.python-ver }}
+          environment-file: ${{ env.environment-file }}
           activate-environment: 'docs'
 
       - name: ReSetup miniconda
@@ -119,40 +132,30 @@ jobs:
         with:
           miniforge-version: latest
           use-mamba: 'true'
-          channels: conda-forge
           conda-remove-defaults: 'true'
-          python-version: ${{ env.python-ver }}
+          environment-file: ${{ env.environment-file }}
           activate-environment: 'docs'
 
-      # Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
-      - name: Disable speed limit check in mamba
-        run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV
-
-      - name: Install sphinx dependencies
-        run: |
-          mamba install sphinx sphinx_rtd_theme
-          pip install sphinxcontrib-googleanalytics==0.4 \
-            pyenchant sphinxcontrib-spelling
-
-      - name: Install dpnp dependencies
-        if: env.INSTALL_ONE_API == 'yes'
-        run: |
-          mamba install numpy dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
-
-      - name: Install dpnp dependencies
-        if: env.INSTALL_ONE_API != 'yes'
+      # We can't install dpctl as a conda package when the environment is created through
+      # installing of Intel OneAPI packages because the dpctl conda package has a runtime
+      # dependency on DPC++ RT one. Whereas the DPC++ RT package has been already installed
+      # by the apt command above and its version has been matched with the DPC++ compiler.
+      # In case where we install the DPC++ compiler with the apt (including DPC++ RT) and
+      # install the DPC++ RT conda package while resolving dependencies, this can lead
+      # to a versioning error, i.e. compatibility issue as the DPC++ compiler only guarantees
+      # backwards compatibility, not forward compatibility (DPC++ RT may not run a binary built
+      # 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: |
-          mamba install numpy dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
-              cmake cython pytest ninja scikit-build ${{ env.CHANNELS }}
-
-      - name: Install cuPy dependencies
-        run: mamba install cupy
+          pip install -r ${{ env.dpctl-pkg-txt }}
 
       - name: Conda info
-        run: mamba info
-
-      - name: Conda list
-        run: mamba list
+        run: |
+          mamba info
+          mamba list
 
       - name: Build library
         run: |
@@ -178,7 +181,6 @@ jobs:
           echo PROJECT_NUMBER=${PROJECT_NUMBER}
           echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> $GITHUB_ENV
 
-      # https://github.com/marketplace/actions/doxygen-action
       - name: Build backend docs
         uses: mattnotmitt/doxygen-action@b84fe17600245bb5db3d6c247cc274ea98c15a3b # v1.12
         with:
@@ -187,7 +189,6 @@ jobs:
       - name: Copy backend docs
         run: cp -r dpnp/backend/doc/html ${{ env.PUBLISH_DIR }}/backend_doc
 
-      # https://github.com/marketplace/actions/github-pages-action
       # The step is only used to build docs while pushing a PR to "master"
       - name: Deploy docs
         if: env.GH_EVENT_PUSH_UPSTREAM == 'true'