Merge remote-tracking branch 'origin/main' into etiotto.fuser.1

Author: etiotto

.github/WINDOWS.md

@@ -141,7 +141,7 @@ python -c 'import torch;print(torch.__version__)'
 Install build dependencies:
 
 ```
-pip install -U wheel pybind11 cython cmake
+pip install -U wheel pybind11 cmake
 ```
 
 Build and install Triton:

.github/actions/setup-pytorch/action.yml

@@ -22,6 +22,10 @@ inputs:
   cache:
     description: Cache enabled or disabled
     default: enabled
+outputs:
+  pytorch_cache_key:
+    description: "PyTorch cache key"
+    value: ${{ steps.generate-pytorch-cache-key.outputs.pytorch_cache_key }}
 runs:
   using: "composite"
   steps:
@@ -70,22 +74,24 @@ runs:
         sudo ln -sfT ${{ inputs.oneapi }} /opt/intel/oneapi
 
     - name: Generate PyTorch cache key
+      id: generate-pytorch-cache-key
       shell: bash
+      env:
+        # Increase this value to reset cache
+        CACHE_NUMBER: 18
       run: |
         ONEAPI_LINK=$(readlink /opt/intel/oneapi || true)
         ONEAPI_KEY=$(sha256sum /opt/intel/installed.txt 2> /dev/null | cut -d\  -f1 || true)
         PYTORCH_CACHE_KEY=$(echo $PYTHON_VERSION $PYTORCH_COMMIT_ID ${{ hashFiles('scripts/patch-pytorch.sh') }} ${{ inputs.mode }}${ONEAPI_KEY}${ONEAPI_LINK} | sha256sum - | cut -d\  -f1)
         echo "PYTORCH_CACHE_KEY=$PYTORCH_CACHE_KEY" | tee -a "$GITHUB_ENV"
+        echo "pytorch_cache_key=pytorch-$PYTORCH_CACHE_KEY-$CACHE_NUMBER" >> "$GITHUB_OUTPUT"
 
     - name: Load PyTorch from a cache
       id: pytorch-cache
       uses: ./.github/actions/load
-      env:
-        # Increase this value to reset cache
-        CACHE_NUMBER: 18
       with:
         path: pytorch
-        key: pytorch-$PYTORCH_CACHE_KEY-$CACHE_NUMBER
+        key: ${{ steps.generate-pytorch-cache-key.outputs.pytorch_cache_key }}
         enabled: ${{ inputs.cache == 'enabled' }}
 
     - name: Clone PyTorch repository

.github/pins/e2e_reference_torch-xpu-ops.txt

@@ -1 +1 @@
-229e8ba104e3b0a6e88c36effefa3ea914b25673
+f301733b03758ccd67642d2c202f2d589bd231a4

.github/pins/pti.txt

@@ -0,0 +1 @@
+15a201d25e5659692613b98ee33513263b689101

.github/pins/pytorch.txt

@@ -1 +1 @@
-7f4c3e7d2f3989115474d77936915fab6d6e0d93
+37d57ac9cb7f538b812cf1d9851b55b46213fe15

.github/workflows/build-test-reusable.yml

@@ -119,7 +119,7 @@ jobs:
           mode: ${{ inputs.pytorch_mode }}
 
       - name: Build Proton with XPU support
-        if: inputs.driver_version == 'rolling' && inputs.device == 'max1100'
+        if: inputs.device == 'max1100'
         run: |
           echo TRITON_BUILD_PROTON_XPU=1 | tee -a $GITHUB_ENV
 
@@ -285,11 +285,23 @@ jobs:
         run: |
           echo "TRITON_TEST_CMD=${{ needs.build.outputs.test-triton-command }}" | tee -a $GITHUB_ENV
 
-      - name: Run Proton tests
-        if: matrix.suite == 'rest' && inputs.driver_version == 'rolling' && inputs.device == 'max1100'
+      - name: Build PTI && Run Proton tests
+        if: matrix.suite == 'rest' && inputs.device == 'max1100'
         run: |
+          PTI_COMMIT_ID="$(<.github/pins/pti.txt)"
+          git clone https://github.com/intel/pti-gpu.git
+          cd pti-gpu
+          git checkout $PTI_COMMIT_ID
+          cd sdk
+          cmake --preset linux-icpx-release
+          BUILD_TESTING=1 PTI_BUILD_SAMPLES=1 cmake --build --preset linux-icpx-release
+
+          PTI_LIBS_DIR="$(pwd)/build-linux-icpx-release/lib/"
+          cd ../..
+
+          export LD_LIBRARY_PATH=$PTI_LIBS_DIR:$LD_LIBRARY_PATH
+          export TRITON_XPUPTI_LIB_PATH=$PTI_LIBS_DIR
           cd third_party/proton/test
-          # FIXME: enable 'test_record.py' back
           pytest test_api.py test_lib.py test_profile.py test_viewer.py -s -v
           cd ..
 
@@ -384,7 +396,7 @@ jobs:
   reports:
     name: Reports
     runs-on:
-      - linux
+      - runner-0.0.22
     needs: integration-tests
     steps:
       - name: Checkout repository

.github/workflows/build-test-windows.yml

@@ -119,7 +119,7 @@ jobs:
           .venv\Scripts\activate.ps1
           Invoke-BatchFile "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
           cd ${{ env.NEW_WORKSPACE }}
-          pip install -U wheel pybind11 cython cmake
+          pip install -U wheel pybind11 cmake
           pip install -v '.[build,tests,tutorials]'
 
       - name: Triton version

.github/workflows/build-test.yml

@@ -78,8 +78,8 @@ jobs:
           path: $HOME/.cache/pip
           key: pip-3.10-${{ hashFiles('.pre-commit-config.yaml') }}-${{ env.CACHE_NUMBER }}
 
-      - name: Install Python 3.10
-        uses: actions/setup-python@v6
+      - name: Install Python (from pyenv)
+        uses: ./.github/actions/setup-pyenv-python
         with:
           python-version: '3.10'
 

.github/workflows/build-windows.yml

@@ -53,7 +53,7 @@ jobs:
           .venv\Scripts\activate.ps1
           Invoke-BatchFile "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
           cd ${{ env.NEW_WORKSPACE }}
-          pip install -U wheel pybind11 cython cmake
+          pip install -U wheel pybind11 cmake
           pip install -v '.[build]'
 
       - name: Clean

.github/workflows/coverity.yml

@@ -24,8 +24,8 @@ jobs:
         run: |
           sudo apt install -y file
 
-      - name: Install Python 3.10
-        uses: actions/setup-python@v6
+      - name: Install Python (from pyenv)
+        uses: ./.github/actions/setup-pyenv-python
         with:
           python-version: '3.10'