Skip to content

Commit 1700714

Browse files
SmartappliSmartappli
authored
Merge branch 'abetlen:main' into dependabot
2 parents e2460ac + 2138561 commit 1700714

25 files changed

+1149
-399
lines changed

‎.github/workflows/build-and-release.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
os: [ubuntu-20.04, windows-2019, macos-11]
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
submodules: "recursive"
2020

2121
# Used to host cibuildwheel
22-
- uses: actions/setup-python@v3
22+
- uses: actions/setup-python@v5
2323
with:
2424
python-version: "3.8"
2525

@@ -29,19 +29,20 @@ jobs:
2929
python -m pip install -e .[all]
3030
3131
- name: Build wheels
32-
uses: pypa/cibuildwheel@v2.16.5
32+
uses: pypa/cibuildwheel@v2.17.0
3333
env:
3434
# disable repair
3535
CIBW_REPAIR_WHEEL_COMMAND: ""
3636
with:
3737
package-dir: .
3838
output-dir: wheelhouse
3939

40-
- uses: actions/upload-artifact@v3
40+
- uses: actions/upload-artifact@v4
4141
with:
42+
name: wheels-${{ matrix.os }}
4243
path: ./wheelhouse/*.whl
4344

44-
build_arm64_wheels:
45+
build_wheels_arm64:
4546
name: Build arm64 wheels
4647
runs-on: ubuntu-latest
4748
steps:
@@ -55,30 +56,30 @@ jobs:
5556
platforms: linux/arm64
5657

5758
- name: Build wheels
58-
uses: pypa/cibuildwheel@v2.16.5
59+
uses: pypa/cibuildwheel@v2.17.0
5960
env:
6061
CIBW_SKIP: "*musllinux* pp*"
6162
CIBW_REPAIR_WHEEL_COMMAND: ""
6263
CIBW_ARCHS: "aarch64"
6364
CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
6465
with:
65-
output-dir: wheelhouse/
66+
output-dir: wheelhouse
6667

6768
- name: Upload wheels as artifacts
6869
uses: actions/upload-artifact@v4
6970
with:
70-
name: wheels-${{ matrix.version }}
71-
path: wheelhouse/*.whl
71+
name: wheels_arm64
72+
path: ./wheelhouse/*.whl
7273

7374
build_sdist:
7475
name: Build source distribution
7576
runs-on: ubuntu-latest
7677

7778
steps:
78-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
7980
with:
8081
submodules: "recursive"
81-
- uses: actions/setup-python@v3
82+
- uses: actions/setup-python@v5
8283
with:
8384
python-version: "3.8"
8485
- name: Install dependencies
@@ -88,22 +89,24 @@ jobs:
8889
- name: Build source distribution
8990
run: |
9091
python -m build --sdist
91-
- uses: actions/upload-artifact@v3
92+
- uses: actions/upload-artifact@v4
9293
with:
94+
name: sdist
9395
path: ./dist/*.tar.gz
9496

9597
release:
9698
name: Release
97-
needs: [build_wheels, build_arm64_wheels, build_sdist]
99+
needs: [build_wheels, build_wheels_arm64, build_sdist]
98100
runs-on: ubuntu-latest
99101

100102
steps:
101-
- uses: actions/download-artifact@v3
103+
- uses: actions/download-artifact@v4
102104
with:
103-
name: artifact
105+
merge-multiple: true
104106
path: dist
105-
- uses: softprops/action-gh-release@v1
107+
108+
- uses: softprops/action-gh-release@v2
106109
with:
107110
files: dist/*
108111
env:
109-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-docker.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
submodules: "recursive"
1818

1919
- name: Set up QEMU
20-
uses: docker/setup-qemu-action@v2
20+
uses: docker/setup-qemu-action@v3
2121

2222
- name: Set up Docker Buildx
23-
uses: docker/setup-buildx-action@v2
23+
uses: docker/setup-buildx-action@v3
2424

2525
- name: Login to GitHub Container Registry
26-
uses: docker/login-action@v2
26+
uses: docker/login-action@v3
2727
with:
2828
registry: ghcr.io
2929
username: ${{ github.repository_owner }}
3030
password: ${{ secrets.GITHUB_TOKEN }}
3131

3232
- name: Build and push
3333
id: docker_build
34-
uses: docker/build-push-action@v4
34+
uses: docker/build-push-action@v5
3535
with:
3636
context: .
3737
file: "docker/simple/Dockerfile"

‎.github/workflows/build-wheels-cuda.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
$matrix = @{
2323
'os' = @('ubuntu-20.04', 'windows-latest')
2424
'pyver' = @("3.10", "3.11", "3.12")
25-
'cuda' = @("12.1.1", "12.2.2", "12.3.2")
25+
'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1")
2626
'releasetag' = @("basic")
2727
}
2828
@@ -47,12 +47,12 @@ jobs:
4747
with:
4848
submodules: "recursive"
4949

50-
- uses: actions/setup-python@v4
50+
- uses: actions/setup-python@v5
5151
with:
5252
python-version: ${{ matrix.pyver }}
5353

5454
- name: Setup Mamba
55-
uses: conda-incubator/setup-miniconda@v2.2.0
55+
uses: conda-incubator/setup-miniconda@v3.0.4
5656
with:
5757
activate-environment: "build"
5858
python-version: ${{ matrix.pyver }}
@@ -65,7 +65,7 @@ jobs:
6565
- name: VS Integration Cache
6666
id: vs-integration-cache
6767
if: runner.os == 'Windows'
68-
uses: actions/cache@v3.3.2
68+
uses: actions/cache@v4.0.2
6969
with:
7070
path: ./MSBuildExtensions
7171
key: cuda-${{ matrix.cuda }}-vs-integration
@@ -74,7 +74,7 @@ jobs:
7474
if: runner.os == 'Windows' && steps.vs-integration-cache.outputs.cache-hit != 'true'
7575
run: |
7676
if ($env:CUDAVER -eq '12.1.1') {$x = '12.1.0'} else {$x = $env:CUDAVER}
77-
$links = (Invoke-RestMethod 'https://github.com/Jimver/cuda-toolkit/raw/dc0ca7bb29c5a92f7a963d3d5c93f8d59765136a/src/links/windows-links.ts').Trim().split().where({$_ -ne ''})
77+
$links = (Invoke-RestMethod 'https://raw.githubusercontent.com/Jimver/cuda-toolkit/master/src/links/windows-links.ts').Trim().split().where({$_ -ne ''})
7878
for ($i=$q=0;$i -lt $links.count -and $q -lt 2;$i++) {if ($links[$i] -eq "'$x',") {$q++}}
7979
Invoke-RestMethod $links[$i].Trim("'") -OutFile 'cudainstaller.zip'
8080
& 'C:\Program Files\7-Zip\7z.exe' e cudainstaller.zip -oMSBuildExtensions -r *\MSBuildExtensions\* > $null
@@ -122,7 +122,7 @@ jobs:
122122
# write the build tag to the output
123123
Write-Output "CUDA_VERSION=$cudaVersion" >> $env:GITHUB_ENV
124124
125-
- uses: softprops/action-gh-release@v1
125+
- uses: softprops/action-gh-release@v2
126126
with:
127127
files: dist/*
128128
# Set tag_name to <tag>-cu<cuda_version>

‎.github/workflows/build-wheels-metal.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
submodules: "recursive"
4343

44-
- uses: actions/setup-python@v4
44+
- uses: actions/setup-python@v5
4545
with:
4646
python-version: ${{ matrix.pyver }}
4747

@@ -78,7 +78,7 @@ jobs:
7878
VERBOSE=1 python -m build --wheel
7979
fi
8080
81-
- uses: softprops/action-gh-release@v1
81+
- uses: softprops/action-gh-release@v2
8282
with:
8383
files: dist/*
8484
# set release name to <tag>-metal

‎.github/workflows/generate-index-from-release.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ jobs:
3131
- name: Checkout
3232
uses: actions/checkout@v4
3333
- name: Setup Pages
34-
uses: actions/configure-pages@v4
34+
uses: actions/configure-pages@v5
3535
- name: Build
3636
run: |
3737
./scripts/releases-to-pep-503.sh index/whl/cpu '^[v]?[0-9]+\.[0-9]+\.[0-9]+$'
3838
./scripts/releases-to-pep-503.sh index/whl/cu121 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu121$'
3939
./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$'
40+
./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$'
41+
./scripts/releases-to-pep-503.sh index/whl/cu124 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu124$'
4042
./scripts/releases-to-pep-503.sh index/whl/metal '^[v]?[0-9]+\.[0-9]+\.[0-9]+-metal$'
4143
- name: Upload artifact
4244
uses: actions/upload-pages-artifact@v3

‎.github/workflows/publish-to-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
submodules: "recursive"
2222
- name: Set up Python
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: "3.8"
2626
- name: Append Dev Version to __version__
@@ -40,4 +40,4 @@ jobs:
4040
uses: pypa/gh-action-pypi-publish@release/v1
4141
with:
4242
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
43-
repository-url: https://test.pypi.org/legacy/
43+
repository-url: https://test.pypi.org/legacy/

‎.github/workflows/publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
submodules: "recursive"
1616
- name: Set up Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.8"
2020
- name: Install dependencies

‎.github/workflows/test-pypi.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
11+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
1212

1313
steps:
1414
- name: Set up Python ${{ matrix.python-version }}
15-
uses: actions/setup-python@v4
15+
uses: actions/setup-python@v5
1616
with:
1717
python-version: ${{ matrix.python-version }}
1818
- name: Install dependencies
@@ -28,11 +28,11 @@ jobs:
2828
runs-on: windows-latest
2929
strategy:
3030
matrix:
31-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
31+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
3232

3333
steps:
3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v4
35+
uses: actions/setup-python@v5
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
- name: Install dependencies
@@ -48,11 +48,11 @@ jobs:
4848
runs-on: macos-latest
4949
strategy:
5050
matrix:
51-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
51+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
5252

5353
steps:
5454
- name: Set up Python ${{ matrix.python-version }}
55-
uses: actions/setup-python@v4
55+
uses: actions/setup-python@v5
5656
with:
5757
python-version: ${{ matrix.python-version }}
5858
- name: Install dependencies
@@ -61,4 +61,4 @@ jobs:
6161
python3 -m pip install --verbose llama-cpp-python[all]
6262
- name: Test with pytest
6363
run: |
64-
python3 -c "import llama_cpp"
64+
python3 -c "import llama_cpp"

‎.github/workflows/test.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
submodules: "recursive"
2323
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v5
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
- name: Install dependencies
@@ -40,11 +40,11 @@ jobs:
4040
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
4141

4242
steps:
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444
with:
4545
submodules: "recursive"
4646
- name: Set up Python ${{ matrix.python-version }}
47-
uses: actions/setup-python@v4
47+
uses: actions/setup-python@v5
4848
with:
4949
python-version: ${{ matrix.python-version }}
5050
- name: Install dependencies
@@ -63,11 +63,11 @@ jobs:
6363
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
6464

6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6767
with:
6868
submodules: "recursive"
6969
- name: Set up Python ${{ matrix.python-version }}
70-
uses: actions/setup-python@v4
70+
uses: actions/setup-python@v5
7171
with:
7272
python-version: ${{ matrix.python-version }}
7373
- name: Install dependencies
@@ -83,11 +83,11 @@ jobs:
8383
# runs-on: ubuntu-latest
8484

8585
# steps:
86-
# - uses: actions/checkout@v3
86+
# - uses: actions/checkout@v4
8787
# with:
8888
# submodules: "recursive"
8989
# - name: Set up Python 3.8
90-
# uses: actions/setup-python@v4
90+
# uses: actions/setup-python@v5
9191
# with:
9292
# python-version: "3.8"
9393
# - name: Set up OpenCL & CLBlast
@@ -110,11 +110,11 @@ jobs:
110110
runs-on: macos-13
111111

112112
steps:
113-
- uses: actions/checkout@v3
113+
- uses: actions/checkout@v4
114114
with:
115115
submodules: "recursive"
116116
- name: Set up Python 3.8
117-
uses: actions/setup-python@v4
117+
uses: actions/setup-python@v5
118118
with:
119119
python-version: "3.8"
120120
- name: Install dependencies

0 commit comments

Comments
 (0)