Skip to content

Commit 25008fd

Browse files
committed
ci : use boringssl for windows
Signed-off-by: Adrien Gallouët <[email protected]>
1 parent 16b21fc commit 25008fd

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -995,21 +995,12 @@ jobs:
995995
-DCMAKE_INSTALL_PREFIX="$env:RUNNER_TEMP/opencl-arm64-release"
996996
cmake --build build-arm64-release --target install --config release
997997
998-
- name: libCURL
999-
id: get_libcurl
1000-
uses: ./.github/actions/windows-setup-curl
1001-
with:
1002-
architecture: ${{ matrix.arch == 'x64' && 'win64' || 'win64a' }}
1003-
1004998
- name: Build
1005999
id: cmake_build
1006-
env:
1007-
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
10081000
run: |
10091001
cmake -S . -B build ${{ matrix.defines }} `
1010-
-DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
1002+
-DLLAMA_CURL=OFF -DLLAMA_BUILD_BORINGSSL=ON -DOPENSSL_NO_ASM=ON
10111003
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
1012-
cp $env:CURL_PATH/bin/libcurl-*.dll build/bin/Release
10131004
10141005
- name: Add libopenblas.dll
10151006
id: add_libopenblas_dll
@@ -1101,25 +1092,21 @@ jobs:
11011092
run: |
11021093
choco install ninja
11031094
1104-
- name: libCURL
1105-
id: get_libcurl
1106-
uses: ./.github/actions/windows-setup-curl
1107-
11081095
- name: Build
11091096
id: cmake_build
11101097
shell: cmd
1111-
env:
1112-
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
11131098
run: |
11141099
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
11151100
cmake -S . -B build -G "Ninja Multi-Config" ^
11161101
-DLLAMA_BUILD_SERVER=ON ^
1102+
-DLLAMA_CURL=OFF ^
1103+
-DLLAMA_BUILD_BORINGSSL=ON ^
1104+
-DOPENSSL_NO_ASM=ON ^
11171105
-DGGML_NATIVE=OFF ^
11181106
-DGGML_BACKEND_DL=ON ^
11191107
-DGGML_CPU_ALL_VARIANTS=ON ^
11201108
-DGGML_CUDA=ON ^
1121-
-DGGML_RPC=ON ^
1122-
-DCURL_LIBRARY="%CURL_PATH%/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="%CURL_PATH%/include"
1109+
-DGGML_RPC=ON
11231110
set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
11241111
cmake --build build --config Release -j %NINJA_JOBS% -t ggml
11251112
cmake --build build --config Release
@@ -1151,7 +1138,7 @@ jobs:
11511138
run: |
11521139
scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
11531140
1154-
# TODO: add libcurl support ; we will also need to modify win-build-sycl.bat to accept user-specified args
1141+
# TODO: add ssl support ; we will also need to modify win-build-sycl.bat to accept user-specified args
11551142

11561143
- name: Build
11571144
id: cmake_build
@@ -1208,10 +1195,6 @@ jobs:
12081195
key: ${{ github.job }}
12091196
evict-old-files: 1d
12101197

1211-
- name: libCURL
1212-
id: get_libcurl
1213-
uses: ./.github/actions/windows-setup-curl
1214-
12151198
- name: Build
12161199
id: cmake_build
12171200
env:
@@ -1224,11 +1207,13 @@ jobs:
12241207
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
12251208
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-${{ env.ROCM_VERSION }}/include/" `
12261209
-DCMAKE_BUILD_TYPE=Release `
1210+
-DLLAMA_CURL=OFF `
1211+
-DLLAMA_BUILD_BORINGSSL=ON `
1212+
-DOPENSSL_NO_ASM=ON `
12271213
-DROCM_DIR="${env:HIP_PATH}" `
12281214
-DGGML_HIP=ON `
12291215
-DGGML_HIP_ROCWMMA_FATTN=ON `
1230-
-DGGML_RPC=ON `
1231-
-DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
1216+
-DGGML_RPC=ON
12321217
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
12331218
12341219
ios-xcode-build:

0 commit comments

Comments
 (0)