Skip to content

Commit 9f0e4b1

Browse files
authored
ci : fix windows ccaches (ggml-org#23777)
* ci : server windows set build type explicitly * cont : try windows-2025 * ci : use llvm * cont : use ninja * cont : fix shell * ci : set number of jobs correctly * ci : fix windows with vulkan ccache by using llvm * ci : server ccache only on master * ocd : fix job names [no release]
1 parent b3a739c commit 9f0e4b1

2 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,16 @@ jobs:
181181
strategy:
182182
matrix:
183183
include:
184-
- build: 'cpu-x64 (static)'
184+
- build: 'x64-cpu-static'
185185
arch: 'x64'
186186
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DBUILD_SHARED_LIBS=OFF'
187-
- build: 'openblas-x64'
187+
- build: 'x64-openblas'
188188
arch: 'x64'
189189
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -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"'
190-
- build: 'vulkan-x64'
190+
- build: 'x64-vulkan'
191191
arch: 'x64'
192-
defines: '-DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
193-
- build: 'llvm-arm64'
192+
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
193+
- build: 'arm64'
194194
arch: 'arm64'
195195
defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON'
196196

@@ -209,7 +209,7 @@ jobs:
209209

210210
- name: Download OpenBLAS
211211
id: get_openblas
212-
if: ${{ matrix.build == 'openblas-x64' }}
212+
if: ${{ matrix.build == 'x64-openblas' }}
213213
run: |
214214
curl.exe -o $env:RUNNER_TEMP/openblas.zip -L "https://github.com/xianyi/OpenBLAS/releases/download/v${env:OPENBLAS_VERSION}/OpenBLAS-${env:OPENBLAS_VERSION}-x64.zip"
215215
curl.exe -o $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt -L "https://github.com/xianyi/OpenBLAS/raw/v${env:OPENBLAS_VERSION}/LICENSE"
@@ -222,7 +222,7 @@ jobs:
222222
223223
- name: Install Vulkan SDK
224224
id: get_vulkan
225-
if: ${{ matrix.build == 'vulkan-x64' }}
225+
if: ${{ matrix.build == 'x64-vulkan' }}
226226
run: |
227227
curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/vulkansdk-windows-X64-${env:VULKAN_VERSION}.exe"
228228
& "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install
@@ -243,7 +243,7 @@ jobs:
243243
244244
- name: Add libopenblas.dll
245245
id: add_libopenblas_dll
246-
if: ${{ matrix.build == 'openblas-x64' }}
246+
if: ${{ matrix.build == 'x64-openblas' }}
247247
run: |
248248
cp $env:RUNNER_TEMP/openblas/bin/libopenblas.dll ./build/bin/Release/openblas.dll
249249
cp $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt ./build/bin/Release/OpenBLAS-${env:OPENBLAS_VERSION}.txt

‎.github/workflows/server.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ concurrency:
5454
cancel-in-progress: true
5555

5656
jobs:
57-
server:
57+
ubuntu:
5858
runs-on: ubuntu-latest
5959

60-
name: server (${{ matrix.wf_name }})
60+
name: ubuntu (${{ matrix.wf_name }})
6161
strategy:
6262
matrix:
6363
build_type: [Release]
@@ -130,8 +130,8 @@ jobs:
130130
export ${{ matrix.extra_args }}
131131
SLOW_TESTS=1 pytest -v -x
132132
133-
server-windows:
134-
runs-on: windows-2022
133+
windows:
134+
runs-on: windows-2025
135135

136136
steps:
137137
- name: Clone
@@ -150,9 +150,15 @@ jobs:
150150

151151
- name: Build
152152
id: cmake_build
153+
shell: cmd
153154
run: |
154-
cmake -B build -DLLAMA_BUILD_BORINGSSL=ON -DGGML_SCHED_NO_REALLOC=ON
155-
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS} --target llama-server
155+
cmake -B build -G "Ninja Multi-Config" ^
156+
-DCMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake ^
157+
-DCMAKE_BUILD_TYPE=Release ^
158+
-DLLAMA_BUILD_BORINGSSL=ON ^
159+
-DGGML_SCHED_NO_REALLOC=ON
160+
set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
161+
cmake --build build --config Release -j %NINJA_JOBS% --target llama-server
156162
157163
- name: Python setup
158164
id: setup_python

0 commit comments

Comments
 (0)