Merge pull request #2245 from IntelPython/feature/uncouple-tensor-from-dpctl

Remove deprecated `dpctl.tensor` submodule

Author: ndgrigorian

.flake8

@@ -23,14 +23,7 @@ per-file-ignores =
     dpctl/_sycl_queue_manager.pyx: E999, E225
     dpctl/memory/_memory.pyx: E999, E225, E226, E227
     dpctl/program/_program.pyx: E999, E225, E226, E227
-    dpctl/tensor/_usmarray.pyx: E999, E225, E226, E227
-    dpctl/tensor/_dlpack.pyx: E999, E225, E226, E227
-    dpctl/tensor/_flags.pyx: E999, E225, E226, E227
-    dpctl/tensor/numpy_usm_shared.py: F821
     dpctl/tests/_cython_api.pyx: E999, E225, E227, E402
-    dpctl/utils/_compute_follows_data.pyx: E999, E225, E227
     dpctl/utils/_onetrace_context.py: E501, W505
-    dpctl/tensor/_array_api.py: E501, W505
     examples/cython/sycl_buffer/syclbuffer/_syclbuffer.pyx: E999, E225, E402
-    examples/cython/usm_memory/blackscholes/_blackscholes_usm.pyx: E999, E225, E226, E402
     examples/cython/use_dpctl_sycl/use_dpctl_sycl/_cython_api.pyx: E999, E225, E226, E402

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

@@ -665,154 +665,6 @@ jobs:
             python ${script} || exit 1
           done
 
-  array-api-conformity:
-    needs: build_linux
-    runs-on:  ${{ matrix.runner }}
-    timeout-minutes: 90
-    permissions:
-      pull-requests: write
-
-    strategy:
-      matrix:
-        python: ['3.10']
-        experimental: [false]
-        runner: [ubuntu-22.04]
-    continue-on-error: ${{ matrix.experimental }}
-    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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-      - name: Cache array API tests
-        id: cache-array-api-tests
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
-        env:
-          ARRAY_CACHE: 3
-        with:
-          path: |
-            /home/runner/work/array-api-tests/
-          key: ${{ runner.os }}-array-api-${{ env.cache-name }}-{{ env.ARRAY_CACHE }}-${{ hashFiles('/home/runner/work/array-api-tests/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: Clone array API tests repo
-        if: steps.cache-array-api-tests.outputs.cache-hit != 'true'
-        shell: bash -l {0}
-        run: |
-          cd /home/runner/work
-          git clone --recurse-submodules https://github.com/data-apis/array-api-tests array-api-tests
-          cd array-api-tests
-      - name: Download artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-      - name: Add conda to system path
-        run: echo $CONDA/bin >> $GITHUB_PATH
-      - name: Install conda-index
-        # Needed to be able to run conda index
-        run: |
-          conda update -n base --all
-          conda install conda-index -c conda-forge --override-channels
-      - name: Create conda channel
-        run: |
-          mkdir -p $GITHUB_WORKSPACE/channel/linux-64
-          conda index $GITHUB_WORKSPACE/channel || exit 1
-          mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64 || exit 1
-          conda index $GITHUB_WORKSPACE/channel || exit 1
-          # Test channel
-          conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json
-          cat ver.json
-      - name: Collect dependencies
-        run: |
-          CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
-          conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
-          cat lockfile
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-      - name: Cache conda packages
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
-        env:
-          CACHE_NUMBER: 3  # Increase to reset cache
-        with:
-          path: ~/.conda/pkgs
-          key:
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }}
-          restore-keys: |
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
-      - name: Install dpctl
-        run: |
-          CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
-          conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} pytest python=${{ matrix.python }} $CHANNELS
-          # Test installed packages
-          conda list
-      - name: Install array API test dependencies
-        shell: bash -l {0}
-        run: |
-          . $CONDA/etc/profile.d/conda.sh
-          conda activate ${{ env.TEST_ENV_NAME }}
-          cd /home/runner/work/array-api-tests
-          pip install -r requirements.txt
-      - name: Install jq
-        shell: bash -l {0}
-        run: |
-          sudo apt-get install jq
-      - name: Run array API conformance tests
-        id: run-array-api-tests
-        shell: bash -l {0}
-        env:
-          ARRAY_API_TESTS_MODULE: 'dpctl.tensor'
-          ARRAY_API_TESTS_VERSION: '2024.12'
-          SYCL_CACHE_PERSISTENT: 1
-        run: |
-          FILE=/home/runner/work/.report.json
-          . $CONDA/etc/profile.d/conda.sh
-          conda activate ${{ env.TEST_ENV_NAME }}
-          cd /home/runner/work/array-api-tests
-          ${CONDA_PREFIX}/bin/python -c "import dpctl; dpctl.lsplatform()"
-          ${CONDA_PREFIX}/bin/python -m pytest --json-report --json-report-file=$FILE --disable-deadline --skips-file ${GITHUB_WORKSPACE}/.github/workflows/array-api-skips.txt array_api_tests/ || true
-      - name: Set Github environment variables
-        shell: bash -l {0}
-        run: |
-          export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
-          FILE=/home/runner/work/.report.json
-          if test -f "$FILE"; then
-            PASSED_TESTS=$(jq '.summary | .passed // 0' $FILE)
-            FAILED_TESTS=$(jq '.summary | .failed // 0' $FILE)
-            SKIPPED_TESTS=$(jq '.summary | .skipped // 0' $FILE)
-            MESSAGE="Array API standard conformance tests for dpctl=$PACKAGE_VERSION ran successfully.
-            Passed: $PASSED_TESTS
-            Failed: $FAILED_TESTS
-            Skipped: $SKIPPED_TESTS"
-            echo "MESSAGE<<EOF" >> $GITHUB_ENV
-            echo "$MESSAGE" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
-          else
-            echo "Array API standard conformance tests failed to run for dpctl=$PACKAGE_VERSION."
-            exit 1
-          fi
-      - name: Output API summary
-        shell: bash -l {0}
-        run: echo "::notice ${{ env.MESSAGE }}"
-      - name: Post result to PR
-        if: ${{ github.event.pull_request && !github.event.pull_request.head.repo.fork }}
-        uses: mshick/add-pr-comment@64b8e914979889d746c99dea15a76e77ef64580a # v3.10.0.8.3.10.0
-        with:
-          message: |
-            ${{ env.MESSAGE }}
-          allow-repeats: true
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
   cleanup_packages:
     name: Clean up anaconda packages
     needs: [upload_linux, upload_windows]

.github/workflows/conda-package.yml

@@ -98,7 +98,6 @@ dpctl/_sycl_event.h
 dpctl/_sycl_queue.h
 dpctl/_sycl_queue_manager.h
 dpctl/memory/_memory.h
-dpctl/tensor/_usmarray.h
 
 # moved cmake scripts
 dpctl/resources/cmake

.gitignore

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [dev] - XXX. XX, XXXX
 
+### Removed
+
+* Removed previously deprecated `dpctl.tensor` submodule, with all tensor functionality migrated to [`dpnp`](https://github.com/IntelPython/dpnp) [gh-2245](https://github.com/IntelPython/dpctl/pull/2245)
+* Removed `cython/usm_memory` example which couldn't be reasonably rewritten without `dpctl.tensor` [gh-2245](https://github.com/IntelPython/dpctl/pull/2245)
+
 ### Added
 
 ### Changed
@@ -18,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Enabled multiversion documentation for `dpctl` using a custom drop-down for version selection and a `--multiversion` option for documentation build helper script [gh-2276](https://github.com/IntelPython/dpctl/pull/2276)
 
+* Updated examples to remove use of `dpctl.tensor`, opting to simplify the examples and rely on `dpctl.memory` objects which wrap USM allocations [gh-2245](https://github.com/IntelPython/dpctl/pull/2245)
+
 ## [0.21.1] - Nov. 29, 2025
 
 This release is made to distribute `dpctl` for Python 3.14. Only the non-free-threaded version of Python is supported as of this release.

CHANGELOG.md

@@ -29,12 +29,11 @@ classes](https://www.khronos.org/registry/SYCL/specs/sycl-2020/html/sycl-2020.ht
 
 `dpctl` features classes for [SYCL Unified Shared Memory
 (USM)](https://link.springer.com/chapter/10.1007/978-1-4842-5574-2_6)
-management and implements a tensor library conforming to [Python Array
-API](https://data-apis.org/array-api/latest/) standard.
+management.
 
 The library helps authors of Python native extensions written
 in C, Cython, or pybind11 to access `dpctl` objects representing SYCL
-devices, queues, memory, and tensors.
+devices, queues, and memory.
 
 `Dpctl` is the core part of a larger family of [data-parallel Python
 libraries and tools](https://www.intel.com/content/www/us/en/developer/tools/oneapi/distribution-for-python.html)