Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
d2c1973
Update build-wheels-cuda.yaml
Smartappli Apr 30, 2024
4f0cd41
Update build-wheels-cuda.yaml
Smartappli Apr 30, 2024
3e012ca
Merge branch 'abetlen:main' into cuda
Smartappli May 1, 2024
04f509d
revert
Smartappli May 1, 2024
34d4475
Bump pyhton from 3.8 to 3.9
Smartappli May 1, 2024
f7b3dd0
Remove python 3.8
Smartappli May 1, 2024
a903572
Remove Python 3.7 and 3.8 deprecated
Smartappli May 1, 2024
e890e2e
Bump python from 3.8 to 3.9
Smartappli May 1, 2024
0ce29fe
Add python 3.9
Smartappli May 1, 2024
63c74d7
Add python 3.9, remove macos-11 deprecated, add macos-14
Smartappli May 1, 2024
864d190
Bump python 3.8 to 3.9
Smartappli May 1, 2024
1934440
Add python 3.13
Smartappli May 1, 2024
525b7af
Add python 3.13
Smartappli May 1, 2024
b94a9e2
python 3.13 remove
Smartappli May 1, 2024
d24c882
remove python 3.13
Smartappli May 1, 2024
a5d4a37
remove python 3.8
Smartappli May 1, 2024
2e412af
Bump macos-13 to macos-14
Smartappli May 1, 2024
b1a7cde
Update build-wheels-metal.yaml
Smartappli May 1, 2024
8517a80
Update build-wheels-metal.yaml
Smartappli May 1, 2024
d24d08a
Update build-and-release.yaml
Smartappli May 1, 2024
9efb21f
Update build-and-release.yaml
Smartappli May 1, 2024
15be4a2
Update build-and-release.yaml
Smartappli May 1, 2024
d67c7a6
Update build-and-release.yaml
Smartappli May 1, 2024
561e1ba
Update build-and-release.yaml
Smartappli May 1, 2024
8486229
Update build-and-release.yaml
Smartappli May 1, 2024
56b5a08
Update build-and-release.yaml
Smartappli May 1, 2024
3a6b448
Update build-and-release.yaml
Smartappli May 1, 2024
7f8954f
Update build-wheels-metal.yaml
Smartappli May 2, 2024
cfead6a
Update generate-index-from-release.yaml
Smartappli May 2, 2024
af5030f
Merge branch 'abetlen:main' into cuda
Smartappli May 2, 2024
976cb03
Update test.yaml
Smartappli May 3, 2024
bc99285
Update test-pypi.yaml
Smartappli May 3, 2024
1b620c4
Update publish.yaml
Smartappli May 3, 2024
e2f0259
Update publish-to-test.yaml
Smartappli May 3, 2024
319ddf1
Update build-wheels-cuda.yaml
Smartappli May 3, 2024
eb3f734
Update build-wheels-cuda.yaml
Smartappli May 3, 2024
3a61206
remove DEPRECATED 32 bits
Smartappli May 3, 2024
2095372
Update build-and-release.yaml
Smartappli May 3, 2024
4ebedc1
Update build-and-release.yaml
Smartappli May 3, 2024
8c2120d
Update build-and-release.yaml
Smartappli May 3, 2024
1b8f088
Update build-and-release.yaml
Smartappli May 3, 2024
bfced4f
Update build-and-release.yaml
Smartappli May 3, 2024
698efb7
Update build-and-release.yaml
Smartappli May 3, 2024
6af3934
Update build-and-release.yaml
Smartappli May 3, 2024
74f6cdf
Update build-and-release.yaml
Smartappli May 3, 2024
0aefa55
Update build-and-release.yaml
Smartappli May 3, 2024
d043348
Merge branch 'main' into cuda
Smartappli May 3, 2024
caceb89
Update build-and-release.yaml
Smartappli May 4, 2024
78b9de3
Update build-and-release.yaml
Smartappli May 4, 2024
1552e8e
Update build-and-release.yaml
Smartappli May 4, 2024
93f143e
Merge branch 'main' into cuda
Smartappli May 4, 2024
f342418
Update build-and-release.yaml
Smartappli May 5, 2024
0ce4fab
Update build-wheels-metal.yaml
Smartappli May 5, 2024
32d77b9
Update build-wheels-cuda.yaml
Smartappli May 5, 2024
d61dbd8
Update test.yaml
Smartappli May 5, 2024
816476f
Update test-pypi.yaml
Smartappli May 5, 2024
d15fec6
Update test.yaml
Smartappli May 5, 2024
3c9ab30
Update publish-to-test.yaml
Smartappli May 5, 2024
0752f74
Update build-wheels-metal.yaml
Smartappli May 5, 2024
8aaba56
Update build-wheels-cuda.yaml
Smartappli May 5, 2024
c6f2df8
Update build-and-release.yaml
Smartappli May 5, 2024
04af8b6
Update build-and-release.yaml
Smartappli May 5, 2024
f0df0df
Merge branch 'main' into cuda
Smartappli May 9, 2024
df61135
Update build-wheels-metal.yaml
Smartappli May 10, 2024
561013f
Update build-wheels-metal.yaml
Smartappli May 10, 2024
6e3a5e6
Merge branch 'main' into cuda
Smartappli May 10, 2024
39e74ca
Update build-and-release.yaml
Smartappli May 11, 2024
e15305f
Update build-wheels-metal.yaml
Smartappli May 11, 2024
ccd8bbb
Update build-wheels-metal.yaml
Smartappli May 11, 2024
bc406ad
Update build-and-release.yaml
Smartappli May 11, 2024
0c0946e
Update build-and-release.yaml
Smartappli May 11, 2024
a4f25b4
Update build-and-release.yaml
Smartappli May 11, 2024
5e1d021
Update build-wheels-metal.yaml
Smartappli May 11, 2024
79619a5
Update build-and-release.yaml
Smartappli May 11, 2024
0e7d135
Update build-and-release.yaml
Smartappli May 11, 2024
2fba497
Update build-and-release.yaml
Smartappli May 11, 2024
10ab995
Merge branch 'main' into cuda
Smartappli May 12, 2024
b80cc88
Merge branch 'main' into cuda
Smartappli May 15, 2024
f385942
Merge branch 'main' into cuda
Smartappli May 17, 2024
6951db8
Merge branch 'main' into cuda
Smartappli May 19, 2024
a6b776b
Merge branch 'abetlen:main' into cuda
Smartappli May 29, 2024
1ed20b8
Update build-and-release.yaml
Smartappli May 29, 2024
bb98fa5
Update build-wheels-metal.yaml
Smartappli May 29, 2024
496a437
revert
Smartappli Jun 6, 2024
fe9a9a1
Merge branch 'main' into cuda
Smartappli Jun 12, 2024
6d065af
Merge branch 'main' into cuda
abetlen Jun 13, 2024
6627890
Remove cpu variants
abetlen Jun 13, 2024
d2f6a2b
Merge branch 'abetlen:main' into cuda
Smartappli Jun 13, 2024
92c85e7
Update build-wheels-metal.yaml
Smartappli Jun 13, 2024
b8c1341
Update build-and-release.yaml
Smartappli Jun 13, 2024
4a1e933
Update publish-to-test.yaml
Smartappli Jun 13, 2024
c806df1
Update build-and-release.yaml
Smartappli Jun 13, 2024
bdb1ca0
Update build-wheels-metal.yaml
Smartappli Jun 13, 2024
e09a298
Update publish.yaml
Smartappli Jun 13, 2024
665d2cc
Update test-pypi.yaml
Smartappli Jun 13, 2024
86f0aa2
Update test.yaml
Smartappli Jun 13, 2024
7e26b74
Update build-and-release.yaml
Smartappli Jun 14, 2024
290dcd5
Update build-wheels-metal.yaml
Smartappli Jun 14, 2024
d3a20be
Update publish.yaml
Smartappli Jun 14, 2024
c1f89c9
Update test-pypi.yaml
Smartappli Jun 14, 2024
460c4a8
Update publish-to-test.yaml
Smartappli Jun 14, 2024
6ea3acb
Update test.yaml
Smartappli Jun 14, 2024
9bc8d21
Update build-and-release.yaml
Smartappli Jun 14, 2024
718ee2f
Update build-wheels-metal.yaml
Smartappli Jun 14, 2024
56c0a72
Update publish-to-test.yaml
Smartappli Jun 14, 2024
fe6cf4f
Update publish.yaml
Smartappli Jun 14, 2024
1057f27
Update test-pypi.yaml
Smartappli Jun 14, 2024
8ccddd5
Update test.yaml
Smartappli Jun 14, 2024
241ff8d
Update test.yaml
Smartappli Jun 14, 2024
b4062d1
Update build-and-release.yaml
Smartappli Jun 14, 2024
f6a5dba
Update publish-to-test.yaml
Smartappli Jun 14, 2024
4f3d9aa
Update build-wheels-metal.yaml
Smartappli Jun 14, 2024
8c14e92
Update test-pypi.yaml
Smartappli Jun 14, 2024
0ac8ec2
Update test.yaml
Smartappli Jun 14, 2024
c848800
Update build-and-release.yaml
Smartappli Jun 14, 2024
a6ccc6a
Update build-wheels-metal.yaml
Smartappli Jun 14, 2024
0fe0495
Update build-wheels-metal.yaml
Smartappli Jun 14, 2024
6c3f443
Update publish.yaml
Smartappli Jun 14, 2024
a96a470
Update publish-to-test.yaml
Smartappli Jun 14, 2024
31b3105
Update test-pypi.yaml
Smartappli Jun 14, 2024
000d862
Update test.yaml
Smartappli Jun 14, 2024
ad1477f
Update build-wheels-cuda.yaml
Smartappli Jun 14, 2024
099811a
Update generate-index-from-release.yaml
Smartappli Jun 14, 2024
f7b3fca
Update README.md
Smartappli Jun 15, 2024
f4dfa61
Update README.md
Smartappli Jun 15, 2024
387b289
Update test.yaml
Smartappli Jun 15, 2024
0441b1d
Merge branch 'main' into cuda
Smartappli Jun 23, 2024
d2612a4
Merge branch 'main' into cuda
Smartappli Jul 27, 2024
f88a30c
Merge branch 'main' into cuda
abetlen Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels-cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
17 changes: 15 additions & 2 deletions .github/workflows/build-wheels-metal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/generate-index-from-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 21 additions & 3 deletions .github/workflows/publish-to-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
23 changes: 20 additions & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
59 changes: 52 additions & 7 deletions .github/workflows/test-pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Loading