feat(ci): Speed up CI workflows using uv, add support for CUDA 12.5…

… wheels * Update build-wheels-cuda.yaml * Update build-wheels-cuda.yaml * revert * Bump pyhton from 3.8 to 3.9 * Remove python 3.8 * Remove Python 3.7 and 3.8 deprecated * Bump python from 3.8 to 3.9 * Add python 3.9 * Add python 3.9, remove macos-11 deprecated, add macos-14 * Bump python 3.8 to 3.9 * Add python 3.13 * Add python 3.13 * python 3.13 remove * remove python 3.13 * remove python 3.8 * Bump macos-13 to macos-14 * Update build-wheels-metal.yaml * Update build-wheels-metal.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update generate-index-from-release.yaml Add avx, avx2 and avx512 * Update test.yaml * Update test-pypi.yaml * Update publish.yaml * Update publish-to-test.yaml * Update build-wheels-cuda.yaml Cuda with AVX2 by default * Update build-wheels-cuda.yaml * remove DEPRECATED 32 bits * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml Upgrade matrix os to latest version * Update build-wheels-metal.yaml * Update build-wheels-cuda.yaml * Update test.yaml * Update test-pypi.yaml * Update test.yaml Add cache: 'pip' * Update publish-to-test.yaml * Update build-wheels-metal.yaml Add cache: 'pip' * Update build-wheels-cuda.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml remove x86_64 * Update build-wheels-metal.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update build-wheels-metal.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * revert * Remove cpu variants * Update build-wheels-metal.yaml * Update build-and-release.yaml * Update publish-to-test.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update publish.yaml * Update test-pypi.yaml * Update test.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update publish.yaml * Update test-pypi.yaml * Update publish-to-test.yaml * Update test.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update publish-to-test.yaml * Update publish.yaml * Update test-pypi.yaml * Update test.yaml * Update test.yaml * Update build-and-release.yaml * Update publish-to-test.yaml * Update build-wheels-metal.yaml * Update test-pypi.yaml * Update test.yaml * Update build-and-release.yaml * Update build-wheels-metal.yaml * Update build-wheels-metal.yaml * Update publish.yaml * Update publish-to-test.yaml * Update test-pypi.yaml * Update test.yaml * Update build-wheels-cuda.yaml * Update generate-index-from-release.yaml * Update README.md * Update README.md * Update test.yaml --------- Co-authored-by: Andrei Betlen <abetlen@gmail.com>
abetlen · Sep 18, 2024 · e529940 · e529940
1 parent c032fc6
commit e529940
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 31 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -21,12 +21,25 @@ jobs:
       # Used to host cibuildwheel
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
-      - name: Install dependencies
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -e .[all]
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+        shell: bash
+
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace        
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          python -m uv pip install -e .[all] --verbose
+        shell: cmd
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.20.0
@@ -79,16 +92,33 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
+
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
-      - name: Install dependencies
+          python-version: "3.9"
+
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
         run: |
-          python -m pip install --upgrade pip build
-          python -m pip install -e .[all]
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+        shell: bash
+
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace        
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          python -m uv pip install -e .[all] --verbose
+        shell: cmd
+
       - name: Build source distribution
         run: |
           python -m build --sdist
+          
       - uses: actions/upload-artifact@v4
         with:
           name: sdist

diff --git a/.github/workflows/build-wheels-cuda.yaml b/.github/workflows/build-wheels-cuda.yaml
@@ -22,7 +22,7 @@ jobs:
           $matrix = @{
               'os' = @('ubuntu-latest', 'windows-2019')
               'pyver' = @("3.9", "3.10", "3.11", "3.12")
-              'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1")
+              'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1", "12.5.0")
               'releasetag' = @("basic")
           }
 

diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml
@@ -23,11 +23,24 @@ jobs:
         with:
           python-version: "3.12"
           cache: 'pip'
+
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+        shell: bash
 
-      - name: Install dependencies
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace        
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -e .[all]
+          python -m pip install uv
+          python -m uv pip install -e .[all] --verbose
+        shell: cmd
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.20.0

diff --git a/.github/workflows/generate-index-from-release.yaml b/.github/workflows/generate-index-from-release.yaml
@@ -44,6 +44,7 @@ jobs:
           ./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$'
           ./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$'
           ./scripts/releases-to-pep-503.sh index/whl/cu124 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu124$'
+          ./scripts/releases-to-pep-503.sh index/whl/cu125 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu125$'
           ./scripts/releases-to-pep-503.sh index/whl/metal '^[v]?[0-9]+\.[0-9]+\.[0-9]+-metal$'
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml
@@ -19,24 +19,42 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: "recursive"
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: "3.11"
         cache: 'pip'
+
     - name: Append Dev Version to __version__
       run: |
         DEV_VERSION=${{ github.event.inputs.dev_version }}
         CURRENT_VERSION=$(awk -F= '/__version__ =/ {print $2}' llama_cpp/__init__.py | tr -d ' "')
         NEW_VERSION="${CURRENT_VERSION}.dev${DEV_VERSION}"
         sed -i 's/__version__ = \".*\"/__version__ = \"'"${NEW_VERSION}"'\"/' llama_cpp/__init__.py
-    - name: Install dependencies
+        
+    - name: Install dependencies (Linux/MacOS)
+      if: runner.os != 'Windows'
       run: |
-        python -m pip install --upgrade pip build
-        python -m pip install -e .[all]
+        python -m pip install --upgrade pip
+        python -m pip install uv
+        RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+      shell: bash
+
+    - name: Install dependencies (Windows)
+      if: runner.os == 'Windows'
+      env:
+        RUST_LOG: trace       
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install uv
+        python -m uv pip install -e .[all] --verbose
+      shell: cmd
+
     - name: Build source distribution
       run: |
         python -m build --sdist
+        
     - name: Publish to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -13,17 +13,34 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: "recursive"
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: "3.9"
-    - name: Install dependencies
+
+    - name: Install dependencies (Linux/MacOS)
+      if: runner.os != 'Windows'
       run: |
-        python -m pip install --upgrade pip build
-        python -m pip install -e .[all]
+        python -m pip install --upgrade pip
+        python -m pip install uv
+        RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+      shell: bash
+
+    - name: Install dependencies (Windows)
+      if: runner.os == 'Windows'
+      env:
+        RUST_LOG: trace        
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install uv
+        python -m uv pip install -e .[all] --verbose
+      shell: cmd
+
     - name: Build source distribution
       run: |
         python -m build --sdist
+        
     - name: Publish distribution to PyPI
       # TODO: move to tag based releases
       # if: startsWith(github.ref, 'refs/tags')

diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml
@@ -16,10 +16,25 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Install dependencies
+
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: bash
+
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace           
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --verbose llama-cpp-python[all]
+          python -m pip install uv
+          python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: cmd
+
       - name: Test with pytest
         run: |
           python -c "import llama_cpp"
@@ -37,10 +52,25 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Install dependencies
+
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: bash
+
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace          
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --verbose llama-cpp-python[all]
+          python -m pip install uv
+          python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: cmd
+
       - name: Test with pytest
         run: |
           python -c "import llama_cpp"
@@ -57,11 +87,26 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-      - name: Install dependencies
+          cache: 'pip'   
+
+      - name: Install dependencies (Linux/MacOS)
+        if: runner.os != 'Windows'
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          RUST_LOG=trace python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: bash
+
+      - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        env:
+          RUST_LOG: trace  
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --verbose llama-cpp-python[all]
+          python -m pip install uv
+          python -m uv pip install llama-cpp-python[all] --verbose 
+        shell: cmd
+
       - name: Test with pytest
         run: |
           python -c "import llama_cpp"