@@ -69,20 +69,15 @@ jobs:
6969 key : macOS-latest-cmake-arm64
7070 evict-old-files : 1d
7171
72- - name : Dependencies
73- id : depends
74- continue-on-error : true
75- run : |
76- brew update
77- brew install curl
78-
7972 - name : Build
8073 id : cmake_build
8174 run : |
8275 sysctl -a
8376 cmake -B build \
8477 -DCMAKE_BUILD_RPATH="@loader_path" \
8578 -DLLAMA_FATAL_WARNINGS=ON \
79+ -DLLAMA_CURL=OFF \
80+ -DLLAMA_BUILD_BORINGSSL=ON \
8681 -DGGML_METAL_USE_BF16=ON \
8782 -DGGML_METAL_EMBED_LIBRARY=OFF \
8883 -DGGML_METAL_SHADER_DEBUG=ON \
@@ -110,13 +105,6 @@ jobs:
110105 key : macOS-latest-cmake-x64
111106 evict-old-files : 1d
112107
113- - name : Dependencies
114- id : depends
115- continue-on-error : true
116- run : |
117- brew update
118- brew install curl
119-
120108 - name : Build
121109 id : cmake_build
122110 run : |
@@ -126,6 +114,8 @@ jobs:
126114 cmake -B build \
127115 -DCMAKE_BUILD_RPATH="@loader_path" \
128116 -DLLAMA_FATAL_WARNINGS=ON \
117+ -DLLAMA_CURL=OFF \
118+ -DLLAMA_BUILD_BORINGSSL=ON \
129119 -DGGML_METAL=OFF \
130120 -DGGML_RPC=ON \
131121 -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3
@@ -151,13 +141,6 @@ jobs:
151141 key : macOS-latest-cmake-arm64-webgpu
152142 evict-old-files : 1d
153143
154- - name : Dependencies
155- id : depends
156- continue-on-error : true
157- run : |
158- brew update
159- brew install curl
160-
161144 - name : Dawn Dependency
162145 id : dawn-depends
163146 run : |
@@ -722,12 +705,6 @@ jobs:
722705 key : macOS-latest-cmake-ios
723706 evict-old-files : 1d
724707
725- - name : Dependencies
726- id : depends
727- continue-on-error : true
728- run : |
729- brew update
730-
731708 - name : Build
732709 id : cmake_build
733710 run : |
@@ -759,12 +736,6 @@ jobs:
759736 key : macOS-latest-cmake-tvos
760737 evict-old-files : 1d
761738
762- - name : Dependencies
763- id : depends
764- continue-on-error : true
765- run : |
766- brew update
767-
768739 - name : Build
769740 id : cmake_build
770741 run : |
@@ -790,12 +761,6 @@ jobs:
790761 id : checkout
791762 uses : actions/checkout@v4
792763
793- - name : Dependencies
794- id : depends
795- continue-on-error : true
796- run : |
797- brew update
798-
799764 - name : Build
800765 id : cmake_build
801766 run : |
@@ -838,12 +803,6 @@ jobs:
838803 name : llama-xcframework
839804 path : build-apple/llama.xcframework/
840805
841- - name : Dependencies
842- id : depends
843- continue-on-error : true
844- run : |
845- brew update
846-
847806 - name : Build llama.cpp with CMake
848807 id : cmake_build
849808 run : |
@@ -995,21 +954,12 @@ jobs:
995954 -DCMAKE_INSTALL_PREFIX="$env:RUNNER_TEMP/opencl-arm64-release"
996955 cmake --build build-arm64-release --target install --config release
997956
998- - name : libCURL
999- id : get_libcurl
1000- uses : ./.github/actions/windows-setup-curl
1001- with :
1002- architecture : ${{ matrix.arch == 'x64' && 'win64' || 'win64a' }}
1003-
1004957 - name : Build
1005958 id : cmake_build
1006- env :
1007- CURL_PATH : ${{ steps.get_libcurl.outputs.curl_path }}
1008959 run : |
1009960 cmake -S . -B build ${{ matrix.defines }} `
1010- -DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
961+ -DLLAMA_CURL=OFF -DLLAMA_BUILD_BORINGSSL=ON
1011962 cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
1012- cp $env:CURL_PATH/bin/libcurl-*.dll build/bin/Release
1013963
1014964 - name : Add libopenblas.dll
1015965 id : add_libopenblas_dll
@@ -1101,25 +1051,20 @@ jobs:
11011051 run : |
11021052 choco install ninja
11031053
1104- - name : libCURL
1105- id : get_libcurl
1106- uses : ./.github/actions/windows-setup-curl
1107-
11081054 - name : Build
11091055 id : cmake_build
11101056 shell : cmd
1111- env :
1112- CURL_PATH : ${{ steps.get_libcurl.outputs.curl_path }}
11131057 run : |
11141058 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
11151059 cmake -S . -B build -G "Ninja Multi-Config" ^
11161060 -DLLAMA_BUILD_SERVER=ON ^
1061+ -DLLAMA_CURL=OFF ^
1062+ -DLLAMA_BUILD_BORINGSSL=ON ^
11171063 -DGGML_NATIVE=OFF ^
11181064 -DGGML_BACKEND_DL=ON ^
11191065 -DGGML_CPU_ALL_VARIANTS=ON ^
11201066 -DGGML_CUDA=ON ^
1121- -DGGML_RPC=ON ^
1122- -DCURL_LIBRARY="%CURL_PATH%/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="%CURL_PATH%/include"
1067+ -DGGML_RPC=ON
11231068 set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
11241069 cmake --build build --config Release -j %NINJA_JOBS% -t ggml
11251070 cmake --build build --config Release
@@ -1151,7 +1096,7 @@ jobs:
11511096 run : |
11521097 scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL
11531098
1154- # TODO: add libcurl support ; we will also need to modify win-build-sycl.bat to accept user-specified args
1099+ # TODO: add ssl support ; we will also need to modify win-build-sycl.bat to accept user-specified args
11551100
11561101 - name : Build
11571102 id : cmake_build
@@ -1208,14 +1153,8 @@ jobs:
12081153 key : ${{ github.job }}
12091154 evict-old-files : 1d
12101155
1211- - name : libCURL
1212- id : get_libcurl
1213- uses : ./.github/actions/windows-setup-curl
1214-
12151156 - name : Build
12161157 id : cmake_build
1217- env :
1218- CURL_PATH : ${{ steps.get_libcurl.outputs.curl_path }}
12191158 run : |
12201159 $env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
12211160 $env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
@@ -1224,11 +1163,12 @@ jobs:
12241163 -DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
12251164 -DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-${{ env.ROCM_VERSION }}/include/" `
12261165 -DCMAKE_BUILD_TYPE=Release `
1166+ -DLLAMA_CURL=OFF `
1167+ -DLLAMA_BUILD_BORINGSSL=ON `
12271168 -DROCM_DIR="${env:HIP_PATH}" `
12281169 -DGGML_HIP=ON `
12291170 -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"
1171+ -DGGML_RPC=ON
12321172 cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
12331173
12341174 ios-xcode-build :
0 commit comments