Skip to content

Commit 537d424

Browse files
authored
ci : remove libcurl in releases (ggml-org#18775)
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
1 parent bcf7546 commit 537d424

2 files changed

Lines changed: 15 additions & 59 deletions

File tree

.github/actions/windows-setup-curl/action.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ jobs:
3737
key: macOS-latest-cmake-arm64
3838
evict-old-files: 1d
3939

40-
- name: Dependencies
41-
id: depends
42-
continue-on-error: true
43-
run: |
44-
brew update
45-
brew install curl
46-
4740
- name: Build
4841
id: cmake_build
4942
run: |
@@ -52,6 +45,8 @@ jobs:
5245
-DCMAKE_INSTALL_RPATH='@loader_path' \
5346
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
5447
-DLLAMA_FATAL_WARNINGS=ON \
48+
-DLLAMA_CURL=OFF \
49+
-DLLAMA_BUILD_BORINGSSL=ON \
5550
-DGGML_METAL_USE_BF16=ON \
5651
-DGGML_METAL_EMBED_LIBRARY=ON \
5752
-DGGML_RPC=ON \
@@ -90,13 +85,6 @@ jobs:
9085
key: macOS-latest-cmake-x64
9186
evict-old-files: 1d
9287

93-
- name: Dependencies
94-
id: depends
95-
continue-on-error: true
96-
run: |
97-
brew update
98-
brew install curl
99-
10088
- name: Build
10189
id: cmake_build
10290
run: |
@@ -107,6 +95,8 @@ jobs:
10795
-DCMAKE_INSTALL_RPATH='@loader_path' \
10896
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
10997
-DLLAMA_FATAL_WARNINGS=ON \
98+
-DLLAMA_CURL=OFF \
99+
-DLLAMA_BUILD_BORINGSSL=ON \
110100
-DGGML_METAL=OFF \
111101
-DGGML_RPC=ON \
112102
-DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
@@ -159,7 +149,7 @@ jobs:
159149
id: depends
160150
run: |
161151
sudo apt-get update
162-
sudo apt-get install build-essential libcurl4-openssl-dev
152+
sudo apt-get install build-essential libssl-dev
163153
164154
- name: Build
165155
id: cmake_build
@@ -171,6 +161,8 @@ jobs:
171161
-DGGML_NATIVE=OFF \
172162
-DGGML_CPU_ALL_VARIANTS=ON \
173163
-DLLAMA_FATAL_WARNINGS=ON \
164+
-DLLAMA_CURL=OFF \
165+
-DLLAMA_OPENSSL=ON \
174166
${{ env.CMAKE_ARGS }}
175167
cmake --build build --config Release -j $(nproc)
176168
@@ -212,14 +204,16 @@ jobs:
212204
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
213205
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
214206
sudo apt-get update -y
215-
sudo apt-get install -y build-essential mesa-vulkan-drivers vulkan-sdk libcurl4-openssl-dev
207+
sudo apt-get install -y build-essential mesa-vulkan-drivers vulkan-sdk libssl-dev
216208
217209
- name: Build
218210
id: cmake_build
219211
run: |
220212
cmake -B build \
221213
-DCMAKE_INSTALL_RPATH='$ORIGIN' \
222214
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
215+
-DLLAMA_CURL=OFF \
216+
-DLLAMA_OPENSSL=ON \
223217
-DGGML_BACKEND_DL=ON \
224218
-DGGML_NATIVE=OFF \
225219
-DGGML_CPU_ALL_VARIANTS=ON \
@@ -269,34 +263,24 @@ jobs:
269263
run: |
270264
choco install ninja
271265
272-
- name: libCURL
273-
id: get_libcurl
274-
uses: ./.github/actions/windows-setup-curl
275-
with:
276-
architecture: ${{ matrix.arch == 'x64' && 'win64' || 'win64a' }}
277-
278266
- name: Build
279267
shell: cmd
280-
env:
281-
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
282268
run: |
283269
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch == 'x64' && 'x64' || 'amd64_arm64' }}
284270
cmake -S . -B build -G "Ninja Multi-Config" ^
285271
-D CMAKE_TOOLCHAIN_FILE=cmake/${{ matrix.arch }}-windows-llvm.cmake ^
272+
-DLLAMA_CURL=OFF ^
273+
-DLLAMA_BUILD_BORINGSSL=ON ^
286274
-DGGML_NATIVE=OFF ^
287275
-DGGML_BACKEND_DL=ON ^
288276
-DGGML_CPU_ALL_VARIANTS=${{ matrix.arch == 'x64' && 'ON' || 'OFF' }} ^
289277
-DGGML_OPENMP=ON ^
290-
-DCURL_LIBRARY="%CURL_PATH%/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="%CURL_PATH%/include" ^
291278
${{ env.CMAKE_ARGS }}
292279
cmake --build build --config Release
293280
294281
- name: Pack artifacts
295282
id: pack_artifacts
296-
env:
297-
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
298283
run: |
299-
Copy-Item $env:CURL_PATH\bin\libcurl-${{ matrix.arch }}.dll .\build\bin\Release\
300284
Copy-Item "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.44.35112\debug_nonredist\${{ matrix.arch }}\Microsoft.VC143.OpenMP.LLVM\libomp140.${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}.dll" .\build\bin\Release\
301285
7z a -snl llama-bin-win-cpu-${{ matrix.arch }}.zip .\build\bin\Release\*
302286
@@ -744,12 +728,14 @@ jobs:
744728
"${{ steps.cann-image.outputs.image }}" \
745729
bash -lc '
746730
set -e
747-
yum install -y --setopt=install_weak_deps=False --setopt=tsflags=nodocs git gcc gcc-c++ make cmake libcurl-devel
731+
yum install -y --setopt=install_weak_deps=False --setopt=tsflags=nodocs git gcc gcc-c++ make cmake openssl-devel
748732
yum clean all && rm -rf /var/cache/yum
749733
git config --global --add safe.directory "/workspace"
750734
export LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/lib64:${ASCEND_TOOLKIT_HOME}/$(uname -m)-linux/devlib/:${LD_LIBRARY_PATH}
751735
cmake -S . -B build \
752736
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
737+
-DLLAMA_CURL=OFF \
738+
-DLLAMA_OPENSSL=ON \
753739
-DGGML_CANN=on \
754740
-DSOC_TYPE=${SOC_TYPE}
755741
cmake --build build -j $(nproc)

0 commit comments

Comments
 (0)