Skip to content

Commit ede2c25

Browse files
committed
- Upgraded actions to latest version
- Added new build define (`-DLLAMA_METAL_EMBED_LIBRARY=ON`) to MacOS build
1 parent be980ed commit ede2c25

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/compile.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
cd build
4949
cmake .. ${{ env.COMMON_DEFINE }} ${{ matrix.defines }}
5050
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
51-
- uses: actions/upload-artifact@v3
51+
- uses: actions/upload-artifact@v4
5252
with:
5353
path: ./build/libllama.so
5454
name: llama-bin-linux-${{ matrix.build }}-x64.so
5555
- name: Upload Llava
56-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5757
with:
5858
path: ./build/examples/llava/libllava_shared.so
5959
name: llava-bin-linux-${{ matrix.build }}-x64.so
@@ -89,13 +89,13 @@ jobs:
8989
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
9090
9191
- name: Upload artifacts
92-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9393
with:
9494
path: .\build\bin\Release\llama.dll
9595
name: llama-bin-win-${{ matrix.build }}-x64.dll
9696

9797
- name: Upload Llava
98-
uses: actions/upload-artifact@v3
98+
uses: actions/upload-artifact@v4
9999
with:
100100
path: .\build\bin\Release\llava_shared.dll
101101
name: llava-bin-win-${{ matrix.build }}-x64.dll
@@ -169,30 +169,30 @@ jobs:
169169
ls -R
170170
- name: Upload artifacts (Windows)
171171
if: ${{ matrix.os == 'windows-latest' }}
172-
uses: actions/upload-artifact@v3
172+
uses: actions/upload-artifact@v4
173173
with:
174174
path: |
175175
.\build\bin\Release\llama.dll
176176
.\build\bin\Release\clblast.dll
177177
name: llama-bin-win-clblast-x64.dll
178178
- name: Upload llava artifacts (Windows)
179179
if: ${{ matrix.os == 'windows-latest' }}
180-
uses: actions/upload-artifact@v3
180+
uses: actions/upload-artifact@v4
181181
with:
182182
path: |
183183
.\build\bin\Release\llava_shared.dll
184184
name: llava-bin-win-clblast-x64.dll
185185
- name: Upload artifacts (linux)
186186
if: ${{ matrix.os == 'ubuntu-22.04' }}
187-
uses: actions/upload-artifact@v3
187+
uses: actions/upload-artifact@v4
188188
with:
189189
path: |
190190
./build/libllama.so
191191
# ./build/libclblast.so
192192
name: llama-bin-linux-clblast-x64.so
193193
- name: Upload llava artifacts (linux)
194194
if: ${{ matrix.os == 'ubuntu-22.04' }}
195-
uses: actions/upload-artifact@v3
195+
uses: actions/upload-artifact@v4
196196
with:
197197
path: |
198198
./build/examples/llava/libllava_shared.so
@@ -243,25 +243,25 @@ jobs:
243243
244244
- name: Upload artifacts (Windows)
245245
if: ${{ matrix.os == 'windows-latest' }}
246-
uses: actions/upload-artifact@v3
246+
uses: actions/upload-artifact@v4
247247
with:
248248
path: .\build\bin\Release\llama.dll
249249
name: llama-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll
250250
- name: Upload llava artifacts (Windows)
251251
if: ${{ matrix.os == 'windows-latest' }}
252-
uses: actions/upload-artifact@v3
252+
uses: actions/upload-artifact@v4
253253
with:
254254
path: .\build\bin\Release\llava_shared.dll
255255
name: llava-bin-win-cublas-cu${{ matrix.cuda }}-x64.dll
256256
- name: Upload artifacts (Linux)
257257
if: ${{ matrix.os == 'ubuntu-20.04' }}
258-
uses: actions/upload-artifact@v3
258+
uses: actions/upload-artifact@v4
259259
with:
260260
path: ./build/libllama.so
261261
name: llama-bin-linux-cublas-cu${{ matrix.cuda }}-x64.so
262262
- name: Upload llava artifacts (Linux)
263263
if: ${{ matrix.os == 'ubuntu-20.04' }}
264-
uses: actions/upload-artifact@v3
264+
uses: actions/upload-artifact@v4
265265
with:
266266
path: ./build/examples/llava/libllava_shared.so
267267
name: llava-bin-linux-cublas-cu${{ matrix.cuda }}-x64.so
@@ -274,7 +274,7 @@ jobs:
274274
matrix:
275275
include:
276276
- build: 'arm64'
277-
defines: '-DCMAKE_OSX_ARCHITECTURES=arm64'
277+
defines: '-DCMAKE_OSX_ARCHITECTURES=arm64 -DLLAMA_METAL_EMBED_LIBRARY=ON'
278278
- build: 'x64'
279279
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DLLAMA_METAL=OFF -DLLAMA_AVX=ON -DLLAMA_AVX2=ON'
280280
runs-on: macos-latest
@@ -296,18 +296,18 @@ jobs:
296296
cmake .. ${{ env.COMMON_DEFINE }} ${{ matrix.defines }}
297297
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
298298
- name: Upload artifacts
299-
uses: actions/upload-artifact@v3
299+
uses: actions/upload-artifact@v4
300300
with:
301301
path: ./build/libllama.dylib
302302
name: llama-bin-osx-${{ matrix.build }}.dylib
303303
- name: Upload Llava
304-
uses: actions/upload-artifact@v3
304+
uses: actions/upload-artifact@v4
305305
with:
306306
path: ./build/examples/llava/libllava_shared.dylib
307307
name: llava-bin-osx-${{ matrix.build }}.dylib
308308
- name: Upload Metal
309309
if: ${{ matrix.build != 'x64' }}
310-
uses: actions/upload-artifact@v3
310+
uses: actions/upload-artifact@v4
311311
with:
312312
path: ./build/bin/ggml-metal.metal
313313
name: ggml-metal.metal
@@ -324,7 +324,7 @@ jobs:
324324
"compile-clblast"
325325
]
326326
steps:
327-
- uses: actions/download-artifact@v3
327+
- uses: actions/download-artifact@v4
328328
with:
329329
path: artifacts
330330
- name: List Files
@@ -385,14 +385,14 @@ jobs:
385385
386386
387387
- name: Upload artifacts
388-
uses: actions/upload-artifact@v3
388+
uses: actions/upload-artifact@v4
389389
with:
390390
path: deps/
391391
name: deps
392392

393393

394394
- name: Remove Artifacts
395-
uses: geekyeggo/delete-artifact@v2
395+
uses: geekyeggo/delete-artifact@v5
396396
with:
397397
name: |
398398
llama-*

0 commit comments

Comments
 (0)