Reapply "Fix building source distributions (#6381)" (#4040)

Author: whitneywhtsang

.github/README.md

@@ -135,10 +135,10 @@ which must be in the same directory as `intel-xpu-backend-for-triton`:
   (probably because, in our build, users don't invoke cmake directly, but
   instead use setup.py).  Teach vscode how to compile Triton as follows.
 
-    - Do a local build. Run command `pip install -e python`
+    - Do a local build. Run command `pip install -e .`
     - Get the full path to the `compile_commands.json` file produced by the build:
-      `find python/build -name 'compile_commands.json' | xargs readlink -f`.
-      You might get a full path similar to `/Users/{username}/triton/python/build/cmake.macosx-11.1-arm64-cpython-3.12/compile_commands.json`
+      `find build -name 'compile_commands.json' | xargs readlink -f`.
+      You might get a full path similar to `/Users/{username}/triton/build/cmake.macosx-11.1-arm64-cpython-3.12/compile_commands.json`
     - In vscode, install the
       [C/C++
       extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools),

.github/WINDOWS.md

@@ -163,7 +163,6 @@ pip install -U wheel pybind11 cython cmake
 Build and install Triton:
 
 ```
-cd python
 pip install -v '.[build,tests,tutorials]'
 cd ..
 ```

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

@@ -81,7 +81,7 @@ runs:
       shell: bash
       run: |
         mkdir -p ~/.triton
-        TRITON_CACHE_KEY="$(sha256sum python/setup.py | cut -d\  -f1)"
+        TRITON_CACHE_KEY="$(sha256sum setup.py | cut -d\  -f1)"
         echo "TRITON_CACHE_KEY=$TRITON_CACHE_KEY" | tee -a $GITHUB_ENV
 
     - name: Load Triton cache
@@ -97,8 +97,7 @@ runs:
     - name: Build Triton
       shell: bash
       run: |
-        cd python
-        pip install -r requirements.txt
+        pip install -r python/requirements.txt
         ${{ inputs.command }}
 
     - name: Save Triton cache

.github/workflows/auto-update-translator-cid.yml

@@ -44,7 +44,7 @@ jobs:
           CACHE_NUMBER: 1
         with:
           path: $HOME/.cache/pip
-          key: pip-3.9-${{ hashFiles('python/pyproject.toml', 'python/setup.py') }}-${{ env.CACHE_NUMBER }}
+          key: pip-3.9-${{ hashFiles('pyproject.toml', 'setup.py') }}-${{ env.CACHE_NUMBER }}
 
       - name: Install Python 3.9
         if: ${{ env.TARGET_PRID == null }}

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

@@ -103,7 +103,7 @@ jobs:
           CACHE_NUMBER: 1
         with:
           path: $HOME/.cache/pip
-          key: pip-${{ inputs.python_version }}-${{ hashFiles('python/pyproject.toml', 'python/setup.py') }}-${{ env.CACHE_NUMBER }}
+          key: pip-${{ inputs.python_version }}-${{ hashFiles('pyproject.toml', 'setup.py') }}-${{ env.CACHE_NUMBER }}
 
       - name: Install Python (using actions/setup-python) ${{ inputs.python_version }}
         if: ${{ !inputs.use_pyenv_python }}
@@ -260,7 +260,7 @@ jobs:
           CACHE_NUMBER: 1
         with:
           path: $HOME/.cache/pip
-          key: pip-${{ inputs.python_version }}-${{ hashFiles('python/pyproject.toml', 'python/setup.py') }}-${{ env.CACHE_NUMBER }}
+          key: pip-${{ inputs.python_version }}-${{ hashFiles('pyproject.toml', 'setup.py') }}-${{ env.CACHE_NUMBER }}
 
       - name: Download test reports
         uses: actions/download-artifact@v4

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

@@ -90,7 +90,6 @@ 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 }}
-          cd python
           pip install -U wheel pybind11 cython cmake
           pip install -v '.[build,tests,tutorials]'
 

.github/workflows/build-windows.yml

@@ -57,7 +57,6 @@ 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 }}
-          cd python
           pip install -U wheel pybind11 cython cmake
           pip install -v '.[build]'
 

.github/workflows/create_release.yml

@@ -43,30 +43,31 @@ jobs:
           tag_or_branch="${tag_or_branch#refs/heads/}"
           # replace directory separators with _ in branch name
           tag_or_branch="${tag_or_branch//\//_}"
+          if [[ ${tag_or_branch} == v* ]]; then
+            # strip trailing v from tag name
+            tag_or_branch="${tag_or_branch#v}"
+            # important: version must be fixed in setup.py
+            sed -i -e "s:^TRITON_VERSION = .*:TRITON_VERSION = '${tag_or_branch}':" setup.py || exit 1
+          fi
           echo "RELEASE_NAME=triton-$tag_or_branch" >> "$GITHUB_ENV"
-          echo "RELEASE_FILE=triton-$tag_or_branch.tar.gz" >> "$GITHUB_ENV"
       - name: Create source distribution
         run: |
-            # Create new folder with specified name so extracting the archive yields that
-            rm -rf "/tmp/$RELEASE_NAME"
-            cp -r "$PWD" "/tmp/$RELEASE_NAME"
-            mv "/tmp/$RELEASE_NAME" .
-            # Cleanup
-            find "$RELEASE_NAME" -name '.git*' -exec rm -rv {} \; || true
-            # Create archive
-            tar -czf "$RELEASE_FILE" "$RELEASE_NAME"
-            echo "Created source archive $RELEASE_FILE with content: $(ls -a "$RELEASE_NAME")"
+          pip install build || exit 1
+          python -m build -s || exit 1
+          cd dist || exit 1
+          release_file=( *.tar.gz )
+          echo "RELEASE_FILE=${release_file}" >> "$GITHUB_ENV"
       - name: Upload source distribution for release
         if: ${{ github.event_name == 'release' }}
         uses: softprops/action-gh-release@v2
         with:
-          files: ${{env.RELEASE_FILE}}
+          files: dist/${{env.RELEASE_FILE}}
       - name: Upload source distribution to GHA artifacts for release tags
         if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, 'rc') }}
         uses: actions/[email protected]
         with:
           name: ${{ env.RELEASE_FILE }}
-          path: ${{ env.RELEASE_FILE }}
+          path: dist/${{ env.RELEASE_FILE }}
       - name: Set output
         id: release_name
         run: echo "name=release_name::${{ env.RELEASE_NAME }}.tar.gz" >> "${GITHUB_OUTPUT}"

.github/workflows/e2e-reusable.yml

@@ -127,7 +127,7 @@ jobs:
         id: triton-cache
         uses: ./.github/actions/load
         with:
-          path: python/dist
+          path: dist
           key: ${{ steps.triton-key.outputs.key }}
 
       - name: Build Triton wheels
@@ -138,7 +138,7 @@ jobs:
 
       - name: Install Triton
         run: |
-          pip install python/dist/*.whl
+          pip install dist/*.whl
 
       - name: Save Triton wheels to a cache
         if: ${{ steps.triton-cache.outputs.status == 'miss' }}

.github/workflows/inductor-tests-windows.yml

@@ -122,7 +122,6 @@ 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 }}
-          cd python
           pip install -U wheel pybind11 cython cmake
           pip install -v '.[build,tests,tutorials]'