Fixes & improvements

sasha0552 · Oct 8, 2024 · 17cb29a · 17cb29a
1 parent 09f6065
commit 17cb29a
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 41 deletions.
diff --git a/.github/actions/common/apply-patches/action.yml b/.github/actions/common/apply-patches/action.yml
@@ -14,15 +14,16 @@ runs:
     - name: Apply patches
       shell: bash
       run: |
-        # Exit on error
-        set -e
-
         # Constants
         readonly PATCHES_PATH="$PWD/patches/${{ inputs.repository }}/${{ inputs.ref }}"
 
         # Go to target directory
         cd "${{ inputs.repository }}/${{ inputs.ref }}"
 
+        # Configure git
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config user.name "github-actions[bot]"
+
         # If patches exists
         if [ -d "$PATCHES_PATH" ]; then
           # Apply patches
@@ -33,7 +34,7 @@ runs:
               echo "Applying patch $patch..."
 
               # Apply
-              patch --strip=1 < "$patch"
+              patch --strip=1 < "$patch" || exit 1
             fi
 
             # Apply script
@@ -42,7 +43,20 @@ runs:
               echo "Applying script $patch..."
 
               # Apply
-              bash "$patch"
+              bash "$patch" || exit 1
             fi
           done
+
+          # Capture tag
+          tag=$(git describe --exact-match --tags)
+          tag_code=$?
+
+          # Commit changes
+          git add .
+          git commit --allow-empty --message "(pascal-pkgs-ci) Apply patches"
+
+          # Restore tag
+          if [ "$tag_code" = "0" ]; then
+            git tag --force --message "(pascal-pkgs-ci) Apply patches" "$tag"
+          fi
         fi
diff --git a/.github/workflows/triton-pascal-2.2.0.yml b/.github/workflows/triton-pascal-2.2.0.yml
@@ -40,5 +40,10 @@ jobs:
         with:
           prefix: triton_pascal-2.2.0-
 
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
+
 on:
   workflow_dispatch:
diff --git a/.github/workflows/triton-pascal-2.3.0.yml b/.github/workflows/triton-pascal-2.3.0.yml
@@ -40,5 +40,10 @@ jobs:
         with:
           prefix: triton_pascal-2.3.0-
 
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
+
 on:
   workflow_dispatch:
diff --git a/.github/workflows/triton-pascal-2.3.1.yml b/.github/workflows/triton-pascal-2.3.1.yml
@@ -40,5 +40,10 @@ jobs:
         with:
           prefix: triton_pascal-2.3.1-
 
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
+
 on:
   workflow_dispatch:
diff --git a/.github/workflows/triton-pascal-3.0.0.yml b/.github/workflows/triton-pascal-3.0.0.yml
@@ -39,5 +39,10 @@ jobs:
         with:
           prefix: triton_pascal-3.0.0-
 
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
+
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.5.5.yml b/.github/workflows/vllm-pascal-0.5.5.yml
@@ -28,7 +28,12 @@ jobs:
       - name: Publish wheels
         uses: ./.github/actions/common/publish-wheels
         with:
-          prefix: vllm_pascal-0.6.2-
+          prefix: vllm_pascal-0.5.5-
+
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.6.0.yml b/.github/workflows/vllm-pascal-0.6.0.yml
@@ -28,7 +28,12 @@ jobs:
       - name: Publish wheels
         uses: ./.github/actions/common/publish-wheels
         with:
-          prefix: vllm_pascal-0.6.2-
+          prefix: vllm_pascal-0.6.0-
+
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.6.1.post1.yml b/.github/workflows/vllm-pascal-0.6.1.post1.yml
@@ -28,7 +28,12 @@ jobs:
       - name: Publish wheels
         uses: ./.github/actions/common/publish-wheels
         with:
-          prefix: vllm_pascal-0.6.2-
+          prefix: vllm_pascal-0.6.1.post1-
+
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.6.1.post2.yml b/.github/workflows/vllm-pascal-0.6.1.post2.yml
@@ -28,7 +28,12 @@ jobs:
       - name: Publish wheels
         uses: ./.github/actions/common/publish-wheels
         with:
-          prefix: vllm_pascal-0.6.2-
+          prefix: vllm_pascal-0.6.1.post2-
+
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.6.1.yml b/.github/workflows/vllm-pascal-0.6.1.yml
@@ -28,7 +28,12 @@ jobs:
       - name: Publish wheels
         uses: ./.github/actions/common/publish-wheels
         with:
-          prefix: vllm_pascal-0.6.2-
+          prefix: vllm_pascal-0.6.1-
+
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-0.6.2.yml b/.github/workflows/vllm-pascal-0.6.2.yml
@@ -31,5 +31,10 @@ jobs:
         with:
           prefix: vllm_pascal-0.6.2-
 
+  update-index:
+    needs: publish
+    runs-on: ubuntu-latest
+    uses: ${{ github.repository }}/.github/workflows/zz-update-index.yml@${{ github.ref }}
+
 on:
   workflow_dispatch:
diff --git a/.github/workflows/vllm-pascal-main.yml b/.github/workflows/vllm-pascal-main.yml
@@ -0,0 +1,20 @@
+name: "[R] Build vLLM (main)"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build vLLM wheels
+        uses: ./.github/actions/build-vllm
+        with:
+          ref: main
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+  workflow_dispatch:
diff --git a/.github/workflows/zz-update-index.yml b/.github/workflows/zz-update-index.yml
@@ -104,7 +104,5 @@ jobs:
         uses: actions/deploy-pages@v4
 
 on:
-  schedule:
-    - cron: "30 7 * * *"
-
+  workflow_call:
   workflow_dispatch:
diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@
 
 The main repository for building Pascal-compatible versions of ML applications and libraries.
 
-1. vLLM is rebuilt automatically every day at `01:30` UTC.
-2. Triton `2.2.0`, `2.3.0`, `2.3.1` and `3.0.0` are available in this repository.
+1. vLLM `0.5.5`, `0.6.0`, `0.6.1`, `0.6.1.post1`, `0.6.1.post`, `0.6.2` are available in this repository.
+2. Triton `2.2.0`, `2.3.0`, `2.3.1`, `3.0.0` are available in this repository.
 
 > [!IMPORTANT]
 > **NEW:** vLLM docker image  
 > You can now try out the vLLM docker image for Pascal GPUs.
 
 ## Installation (docker)
 
-### vLLM
+### [vllm](https://github.com/vllm-project/vllm)
 
 ```sh
 # Pull the vLLM image
@@ -60,9 +60,6 @@ pipx install transient-package
 
 ### [vllm](https://github.com/vllm-project/vllm)
 
-*Note: this repository holds both "release" and "nightly" builds of vLLM.*
-
-#### To install the patched vLLM:
 ```sh
 # Use this repository
 export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
@@ -74,9 +71,7 @@ python -m venv venv
 source venv/bin/activate
 
 # Install vLLM
-pip3 install vllm-pascal  # nightly build is installed by default
-                          # you can specify, e.g., ==0.6.2 to install
-                          # a specific release
+pip3 install vllm-pascal
 
 # Install patched triton
 transient-package install       \
@@ -88,25 +83,8 @@ transient-package install       \
 vllm serve --help
 ```
 
-#### To update a patched vLLM between same vLLM release versions (e.g. `0.5.0` (commit `000000`) -> `0.5.0` (commit `ffffff`)):
-
-```sh
-# Use this repository
-export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
-
-# Activate virtual environment
-source venv/bin/activate
-
-# Update vLLM
-pip3 install --force-reinstall --no-cache-dir --no-deps --upgrade vllm-pascal
-```
-
-> [!WARNING]
-> In rare cases, this may cause dependency errors; in that case, just reinstall vLLM.
-
 ### [aphrodite-engine](https://github.com/PygmalionAI/aphrodite-engine)
 
-To install aphrodite-engine with the patched Triton:
 ```sh
 # Use this repository
 export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"
@@ -132,8 +110,6 @@ aphrodite --help
 
 ### [triton](https://github.com/triton-lang/triton) (for other applications)
 
-#### To install patched Triton:
-
 ```sh
 # Use this repository
 export PIP_EXTRA_INDEX_URL="https://sasha0552.github.io/pascal-pkgs-ci/"