Merge branch 'main' into amyachev/issue2736

Author: etiotto

.github/actions/setup-pyenv-python/action.yml

@@ -0,0 +1,52 @@
+name: setup-pyenv-python
+description: Setup Python via pyenv
+inputs:
+  python-version:
+    description: Python version to setup
+  pyenv-version:
+    description: Pyenv version to setup
+    default: "v2.4.19"
+runs:
+  using: "composite"
+  steps:
+    - name: Clone pyenv
+      uses: actions/checkout@v4
+      with:
+        repository: "pyenv/pyenv"
+        ref: ${{ inputs.pyenv-version }}
+        path: pyenv
+
+    - name: Setup environment variables
+      shell: bash
+      run: |
+        echo PATH="${PWD}/pyenv/bin:${PATH}" >> "${GITHUB_ENV}"
+        echo PYENV_ROOT="${PWD}/pyenv" >> "${GITHUB_ENV}"
+
+    - name: Setup pyenv into profile
+      shell: bash
+      run: |
+        eval "$(pyenv init -)" >> ~/.profile
+
+    - name: Install required packages
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libncurses5-dev libbz2-dev libreadline-dev libsqlite3-dev libssl-dev zlib1g-dev liblzma-dev
+
+    - name: Setup Python
+      shell: bash
+      run: |
+        set -x
+        pyenv install ${{ inputs.python-version }}
+        pyenv global ${{ inputs.python-version }}
+        echo PATH="$(dirname $(pyenv which python${{ inputs.python-version }})):$PATH" >> ${GITHUB_ENV}
+
+    - name: Use python as python3
+      shell: bash
+      run: |
+        set -x
+        ls -l ~/.local/bin/
+        ln -sf $(which pip${{ inputs.python-version }}) ~/.local/bin/pip
+        ln -sf $(which python${{ inputs.python-version }}) ~/.local/bin/python
+        ln -sf $(which pip${{ inputs.python-version }}) ~/.local/bin/pip3
+        ln -sf $(which python${{ inputs.python-version }}) ~/.local/bin/python3

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

@@ -83,7 +83,7 @@ runs:
       uses: ./.github/actions/load
       env:
         # Increase this value to reset cache
-        CACHE_NUMBER: 12
+        CACHE_NUMBER: 14
       with:
         path: pytorch
         key: pytorch-$PYTORCH_CACHE_KEY-$CACHE_NUMBER
@@ -120,7 +120,7 @@ runs:
         cd pytorch
         pip install wheel
         pip install -r requirements.txt
-        python setup.py bdist_wheel
+        USE_STATIC_MKL=1 CFLAGS="-Wno-error=maybe-uninitialized" python setup.py bdist_wheel
 
     - name: Install PyTorch (built from source)
       if: ${{ inputs.mode == 'source' }}

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

@@ -8,7 +8,7 @@ inputs:
     default: false
   command:
     description: Command to execute
-    default: DEBUG=1 pip install --no-build-isolation '.[build,tests,tutorials]'
+    default: DEBUG=1 pip install -v --no-build-isolation '.[build,tests,tutorials]'
 runs:
   using: "composite"
   steps:

.github/pins/ipex.txt

@@ -1 +1 @@
-cd132db4e11fbf799a2d3ed2afea100a4afd4efd
+15ef7db18b0a50101b41d9c78780d35ea7937ffc

.github/pins/pytorch-upstream.txt

@@ -1 +1 @@
-ae7f809bfcadb426f8024a8abf3f33f0ecfd5308
+d0fd42eb3ac6939e63879bc055b6901103f713d3

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

@@ -39,8 +39,8 @@ on:
         description: Ignore pytest.skip
         type: boolean
         default: false
-      use_system_python:
-        description: Use system Python
+      use_pyenv_python:
+        description: Use Python built with pyenv
         type: boolean
         default: false
 
@@ -64,4 +64,4 @@ jobs:
       skip_list: ${{ inputs.skip_list }}
       run_name: ${{ inputs.run_name || format('Build and test {0}', inputs.runner_label) }}
       enable_unskip: ${{ inputs.enable_unskip }}
-      use_system_python: ${{ inputs.use_system_python || false }}
+      use_pyenv_python: ${{ inputs.use_pyenv_python || false }}

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

@@ -32,6 +32,10 @@ on:
         description: Ignore pytest.skip
         type: boolean
         default: false
+      use_pyenv_python:
+        description: Use Python built with pyenv
+        type: boolean
+        default: false
 
 permissions: read-all
 
@@ -79,3 +83,4 @@ jobs:
       skip_list: ${{ inputs.skip_list }}
       run_name: ${{ inputs.run_name }}
       enable_unskip: ${{ inputs.enable_unskip }}
+      use_pyenv_python: ${{ inputs.use_pyenv_python || false }}

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

@@ -56,8 +56,8 @@ on:
         description: Runner label for version
         type: string
         default: runner-0.0.20
-      use_system_python:
-        description: Use system Python
+      use_pyenv_python:
+        description: Use Python built with pyenv
         type: boolean
         default: false
 
@@ -94,12 +94,18 @@ jobs:
           path: $HOME/.cache/pip
           key: pip-${{ inputs.python_version }}-${{ hashFiles('python/pyproject.toml', 'python/setup.py') }}-${{ env.CACHE_NUMBER }}
 
-      - name: Install Python ${{ inputs.python_version }}
-        if: ${{ !inputs.use_system_python }}
+      - name: Install Python (using actions/setup-python) ${{ inputs.python_version }}
+        if: ${{ !inputs.use_pyenv_python }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python_version }}
 
+      - name: Install Python (from pyenv) ${{ inputs.python_version }}
+        if: ${{ inputs.use_pyenv_python }}
+        uses: ./.github/actions/setup-pyenv-python
+        with:
+          python-version: ${{ inputs.python_version }}
+
       - name: Identify Python version
         run: |
           PYTHON_VERSION="$(python -c 'import sys; print(f"{sys.version_info[0]}.{ sys.version_info[1]}")')"

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

@@ -0,0 +1,56 @@
+name: Build on Windows
+
+on:
+  workflow_dispatch:
+
+  pull_request:
+    branches:
+      - main
+      - release/**
+  push:
+    branches:
+      - main
+      - release/**
+
+permissions: read-all
+
+env:
+  NEW_WORKSPACE: C:\gh${{ github.run_id }}
+
+jobs:
+  build:
+    name: Build
+    runs-on: avc336
+    steps:
+      - name: Enable long paths
+        run: |
+          git config --system core.longPaths true
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+
+      # Copy workspace to a temporary location with a shorter name.
+      - name: Copy workspace
+        run: |
+          Copy-Item -Path ${{ github.workspace }} -Destination ${{ env.NEW_WORKSPACE }} -Recurse
+
+      # We need ninja >= 1.12.0 to support long names on Windows. At the moment there is no required
+      # version in pypi, so instead of installing ninja with pip we use a preinstalled 1.12.1 on the
+      # runner.
+      - name: Build Triton
+        run: |
+          cd ${{ env.NEW_WORKSPACE }}
+          cd python
+          pip install -U wheel pybind11 certifi cython cmake setuptools>=65.6.1
+          python -m certifi
+          pip install -v --no-build-isolation '.[build]'
+
+      - name: Clean
+        if: ${{ always() }}
+        run: |
+          Remove-Item -LiteralPath ${{ env.NEW_WORKSPACE }} -Force -Recurse -ErrorAction Ignore

.github/workflows/build-test.yml

@@ -39,13 +39,19 @@ on:
         description: Ignore pytest.skip
         type: boolean
         default: false
+      use_pyenv_python:
+        description: Use Python built with pyenv
+        type: boolean
+        default: false
 
   pull_request:
     branches:
       - main
+      - release/**
   push:
     branches:
       - main
+      - release/**
 
 permissions: read-all
 
@@ -128,3 +134,4 @@ jobs:
       skip_list: ${{ inputs.skip_list }}
       run_name: ${{ inputs.run_name }}
       enable_unskip: ${{ inputs.enable_unskip || false }}
+      use_pyenv_python: ${{ inputs.use_pyenv_python || false }}