File tree 2 files changed +14
-2
lines changed
actions/windows-setup-curl
2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 5
5
description : ' CURL version'
6
6
required : false
7
7
default : ' 8.6.0_6'
8
+ architecture :
9
+ description : ' Architecture of the libcurl to download'
10
+ required : false
11
+ default : ' win64'
8
12
outputs :
9
13
curl_path :
10
14
description : " Path to the downloaded libcurl"
18
22
shell : powershell
19
23
env :
20
24
CURL_VERSION : ${{ inputs.curl_version }}
25
+ ARCHITECTURE : ${{ inputs.architecture }}
21
26
run : |
22
- curl.exe -o $env:RUNNER_TEMP/curl.zip -L "https://curl.se/windows/dl-${env:CURL_VERSION}/curl-${env:CURL_VERSION}-win64 -mingw.zip"
27
+ curl.exe -o $env:RUNNER_TEMP/curl.zip -L "https://curl.se/windows/dl-${env:CURL_VERSION}/curl-${env:CURL_VERSION}-${env:ARCHITECTURE} -mingw.zip"
23
28
mkdir $env:RUNNER_TEMP/libcurl
24
29
tar.exe -xvf $env:RUNNER_TEMP/curl.zip --strip-components=1 -C $env:RUNNER_TEMP/libcurl
25
30
echo "curl_path=$env:RUNNER_TEMP/libcurl" >> $env:GITHUB_OUTPUT
Original file line number Diff line number Diff line change @@ -238,14 +238,19 @@ jobs:
238
238
matrix :
239
239
include :
240
240
- build : ' cpu-x64'
241
+ arch : ' x64'
241
242
defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF'
242
243
# - build: 'openblas-x64'
244
+ # arch: 'x64'
243
245
# defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
244
246
- build : ' vulkan-x64'
247
+ arch : ' x64'
245
248
defines : ' -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
246
249
- build : ' cpu-arm64'
250
+ arch : ' arm64'
247
251
defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF'
248
252
- build : ' opencl-adreno-arm64'
253
+ arch : ' arm64'
249
254
defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON'
250
255
251
256
steps :
@@ -312,6 +317,8 @@ jobs:
312
317
- name : libCURL
313
318
id : get_libcurl
314
319
uses : ./.github/actions/windows-setup-curl
320
+ with :
321
+ architecture : ${{ matrix.arch == 'x64' && 'win64' || 'win64a' }}
315
322
316
323
- name : Build
317
324
id : cmake_build
@@ -339,7 +346,7 @@ jobs:
339
346
env :
340
347
CURL_PATH : ${{ steps.get_libcurl.outputs.curl_path }}
341
348
run : |
342
- Copy-Item $env:CURL_PATH\bin\libcurl-x64. dll .\build\bin\Release\libcurl-x64.dll
349
+ Copy-Item $env:CURL_PATH\bin\libcurl-${{ matrix.arch }}. dll .\build\bin\Release\
343
350
7z a llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}.zip .\build\bin\Release\*
344
351
345
352
- name : Upload artifacts
You can’t perform that action at this time.
0 commit comments