Merge remote-tracking branch 'origin/master' into edit-to-pyproject

Author: oleksandr-pavlyk

.github/workflows/conda-package.yml

@@ -14,6 +14,7 @@ env:
   TEST_ENV_NAME: test_dpctl
   VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); "
   VER_SCRIPT2: "d = j['dpctl'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
+  INTEL_CHANNEL: "https://software.repos.intel.com/python/conda/"
 
 jobs:
   build_linux:
@@ -23,7 +24,7 @@ jobs:
       matrix:
         python: ['3.9', '3.10', '3.11']
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
 
@@ -52,7 +53,7 @@ jobs:
       - name: Build conda package
         run: |
           # use bootstrap channel to pull NumPy linked with OpenBLAS
-          CHANNELS="-c dppy/label/bootstrap -c intel -c conda-forge --override-channels"
+          CHANNELS="-c dppy/label/bootstrap -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels"
           VERSIONS="--python ${{ matrix.python }} --numpy 1.23"
           TEST="--no-test"
           conda build \
@@ -61,12 +62,12 @@ jobs:
             $CHANNELS \
             conda-recipe
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
       - name: Upload wheels artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
           path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
@@ -80,7 +81,7 @@ jobs:
     env:
       conda-bld: C:\Miniconda\conda-bld\win-64\
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - uses: conda-incubator/setup-miniconda@v3
@@ -108,14 +109,14 @@ jobs:
       - name: Build conda package
         env:
           OVERRIDE_INTEL_IPO: 1   # IPO requires more resources that GH actions VM provides
-        run: conda build --no-test --python ${{ matrix.python }} -c intel  -c conda-forge --override-channels conda-recipe
+        run: conda build --no-test --python ${{ matrix.python }} -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels conda-recipe
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.tar.bz2
       - name: Upload wheels artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
           path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
@@ -130,10 +131,14 @@ jobs:
         experimental: [false]
         runner: [ubuntu-20.04]
     continue-on-error: ${{ matrix.experimental }}
-    env:
-      CHANNELS: -c intel -c conda-forge --override-channels
 
     steps:
+      - name: Construct channels line
+        run: |
+          echo "CHANNELS=-c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels" >> $GITHUB_ENV
+      - name: Display channels line
+        run: |
+          echo ${{ env.CHANNELS }}
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
@@ -221,9 +226,15 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     env:
       workdir: '${{ github.workspace }}'
-      CHANNELS: -c intel -c conda-forge --override-channels
 
     steps:
+      - name: Construct channels line
+        shell: pwsh
+        run: |
+          echo "CHANNELS=-c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels" >> $env:GITHUB_ENV
+      - name: Display channels line
+        run: |
+          echo ${{ env.CHANNELS }}
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
@@ -280,7 +291,7 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
       - name: Install opencl_rt
         shell: cmd /C CALL {0}
-        run: conda install -n ${{ env.TEST_ENV_NAME }} opencl_rt -c intel --override-channels
+        run: conda install -n ${{ env.TEST_ENV_NAME }} opencl_rt -c ${{ env.INTEL_CHANNEL }} --override-channels
       - name: Install dpctl
         shell: cmd /C CALL {0}
         run: |
@@ -420,16 +431,21 @@ jobs:
         runner: [ubuntu-20.04]
     continue-on-error: ${{ matrix.experimental }}
     env:
-      CHANNELS: -c intel -c conda-forge --override-channels
       EXAMPLES_ENV_NAME: examples
       BUILD_ENV_NAME: build_env
 
     steps:
+      - name: Construct channels line
+        run: |
+          echo "CHANNELS=-c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels" >> $GITHUB_ENV
+      - name: Display channels line
+        run: |
+          echo ${{ env.CHANNELS }}
       - name: Install conda-index
         # Needed to be able to run conda index
         run: conda install conda-index -c conda-forge --override-channels
       - name: Checkout dpctl repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - name: Download artifact
@@ -484,7 +500,7 @@ jobs:
         shell: bash -l {0}
         run: |
           source $CONDA/etc/profile.d/conda.sh
-          CHANNELS="-c $GITHUB_WORKSPACE/channel -c dppy/label/dev -c intel -c conda-forge --override-channels"
+          CHANNELS="-c $GITHUB_WORKSPACE/channel -c dppy/label/dev -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels"
           export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
           conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ${CHANNELS} dpctl=${PACKAGE_VERSION} dpnp || exit 1
       - name: Build and run examples of pybind11 extensions
@@ -570,11 +586,15 @@ jobs:
         experimental: [false]
         runner: [ubuntu-20.04]
     continue-on-error: ${{ matrix.experimental }}
-    env:
-      CHANNELS: -c intel -c conda-forge --override-channels
     steps:
+      - name: Construct channels line
+        run: |
+          echo "CHANNELS=-c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels" >> $GITHUB_ENV
+      - name: Display channels line
+        run: |
+          echo ${{ env.CHANNELS }}
       - name: Checkout dpctl repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - name: Cache array API tests
@@ -717,7 +737,7 @@ jobs:
         run: conda install anaconda-client -c conda-forge --override-channels
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           repository: IntelPython/devops-tools
           fetch-depth: 0

.github/workflows/cpp_style_checks.yml

@@ -16,7 +16,7 @@ jobs:
     name: clang-format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.5
+    - uses: actions/checkout@v4.1.7
     - name: Run clang-format style check for C/C++ programs.
       uses: jidicula/clang-format-action@v4.13.0
       with:

.github/workflows/generate-coverage.yaml

@@ -81,7 +81,7 @@ jobs:
           make && make install
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
 

.github/workflows/generate-docs.yml

@@ -59,7 +59,7 @@ jobs:
                       sphinxcontrib-jsmath sphinx-copybutton sphinxcontrib-spelling \
                       versioneer[toml]==0.29
       - name: Checkout repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -104,7 +104,7 @@ jobs:
           git push tokened_docs gh-pages
       - name: Save built docs as an artifact
         if: ${{ github.event.pull_request && github.event.pull_request.head.repo.fork && github.event.action != 'closed'}}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: ${{ env.PACKAGE_NAME }} rendered documentation
           path: ~/docs

.github/workflows/openssf-scorecard.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
@@ -60,14 +60,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 14
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
         with:
           sarif_file: results.sarif

.github/workflows/os-llvm-sycl-build.yml

@@ -113,7 +113,7 @@ jobs:
           pip install numpy"<1.26.0" cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
 

.github/workflows/pre-commit.yml

@@ -11,7 +11,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v4.1.5
+    - uses: actions/checkout@v4.1.7
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'

.github/workflows/python_style_checks.yml

@@ -17,7 +17,7 @@ jobs:
   isort:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.7
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
@@ -32,7 +32,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.7
       # Set up a Python environment for use in actions
       - uses: actions/setup-python@v5
         with:
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4.1.5
+    - uses: actions/checkout@v4.1.7
     - name: Set up Python
       uses: actions/setup-python@v5
       with:

dpctl/tensor/CMakeLists.txt

@@ -231,7 +231,7 @@ foreach(_src_fn ${_no_fast_math_sources})
   )
 endforeach()
 
-set(_compiler_definitions "USE_SYCL_FOR_COMPLEX_TYPES")
+set(_compiler_definitions "")
 
 foreach(_src_fn ${_elementwise_sources})
   get_source_file_property(_cmpl_options_defs ${_src_fn} COMPILE_DEFINITIONS)

dpctl/tensor/_copy_utils.py

@@ -707,6 +707,9 @@ def _extract_impl(ary, ary_mask, axis=0):
         raise TypeError(
             f"Expecting type dpctl.tensor.usm_ndarray, got {type(ary_mask)}"
         )
+    dst_usm_type = dpctl.utils.get_coerced_usm_type(
+        (ary.usm_type, ary_mask.usm_type)
+    )
     exec_q = dpctl.utils.get_execution_queue(
         (ary.sycl_queue, ary_mask.sycl_queue)
     )
@@ -733,7 +736,7 @@ def _extract_impl(ary, ary_mask, axis=0):
     )
     dst_shape = ary.shape[:pp] + (mask_count,) + ary.shape[pp + mask_nd :]
     dst = dpt.empty(
-        dst_shape, dtype=ary.dtype, usm_type=ary.usm_type, device=ary.device
+        dst_shape, dtype=ary.dtype, usm_type=dst_usm_type, device=ary.device
     )
     if dst.size == 0:
         return dst