tc-wolf · tc-wolf · Mar 31, 2025 · Aug 21, 2024 · Aug 22, 2024 · Aug 28, 2024
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, windows-2019, macos-13]

    steps:
      - uses: actions/checkout@v4
@@ -21,15 +21,28 @@ 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
+        uses: pypa/cibuildwheel@v2.22.0
        env:
          # disable repair
          CIBW_REPAIR_WHEEL_COMMAND: ""
@@ -56,7 +69,7 @@ jobs:
          platforms: linux/arm64

      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
+        uses: pypa/cibuildwheel@v2.22.0
        env:
          CIBW_SKIP: "*musllinux* pp*"
          CIBW_REPAIR_WHEEL_COMMAND: ""
@@ -79,16 +92,35 @@ 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
+          python -m uv pip install build
+        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
+          python -m uv pip install build
+        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.1", "12.6.1")
              'releasetag' = @("basic")
          }

@@ -59,20 +59,18 @@ jobs:
          cache: 'pip'

      - name: Setup Mamba
-        uses: conda-incubator/setup-miniconda@v3.0.4
+        uses: conda-incubator/setup-miniconda@v3.1.0
        with:
-          activate-environment: "build"
+          activate-environment: "llamacpp"
          python-version: ${{ matrix.pyver }}
-          miniforge-variant: Mambaforge
          miniforge-version: latest
-          use-mamba: true
          add-pip-as-python-dependency: true
          auto-activate-base: false

      - name: VS Integration Cache
        id: vs-integration-cache
        if: runner.os == 'Windows'
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
        with:
          path: ./MSBuildExtensions
          key: cuda-${{ matrix.cuda }}-vs-integration

diff --git a/.github/workflows/build-wheels-metal.yaml b/.github/workflows/build-wheels-metal.yaml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14, macos-15]

    steps:
      - uses: actions/checkout@v4
@@ -23,14 +23,27 @@ 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
+        uses: pypa/cibuildwheel@v2.22.0
        env:
          # disable repair
          CIBW_REPAIR_WHEEL_COMMAND: ""

diff --git a/.github/workflows/generate-index-from-release.yaml b/.github/workflows/generate-index-from-release.yaml
@@ -35,12 +35,17 @@ jobs:
      - name: Setup Pages
        uses: actions/configure-pages@v5
      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
+          ./scripts/get-releases.sh
          ./scripts/releases-to-pep-503.sh index/whl/cpu '^[v]?[0-9]+\.[0-9]+\.[0-9]+$'
          ./scripts/releases-to-pep-503.sh index/whl/cu121 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu121$'
          ./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]+-cu124$'
+          # ./scripts/releases-to-pep-503.sh index/whl/cu126 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu124$'
          ./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,36 @@ 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
+        python -m pip install uv
+        RUST_LOG=trace python -m uv pip install -e .[all] --verbose
+        python -m uv pip install build
+      shell: bash
+
+    - name: Install dependencies (Windows)
+      if: runner.os == 'Windows'
+      env:
+        RUST_LOG: trace
      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
+        python -m uv pip install -e .[all] --verbose
+        python -m uv pip install build
+      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"