Skip to content

Commit 84e908c

Browse files
netrunnereveCISC
netrunnereve
and
CISC
authored
ci: fix thread sanitizer + remove ccache (ggml-org#26927)
* test address on Intel-LNL-U7-258V * retry * run address on github * use native build for cpu * this should be runnable everywhere multicore * disable ccache --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@huggingface.co>
1 parent 9558fa4 commit 84e908c

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎.github/workflows/build-cmake-pkg.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
linux:
8-
runs-on: [self-hosted, Linux, CPU]
8+
runs-on: [self-hosted, Linux]
99
steps:
1010
- uses: actions/checkout@v6
1111
with:
@@ -23,7 +23,7 @@ jobs:
2323
-DLLAMA_BUILD_APP=OFF \
2424
-DLLAMA_BUILD_IS_DEV=OFF \
2525
-DCMAKE_BUILD_TYPE=Release
26-
cmake --build build --config Release
26+
cmake --build build --config Release -j $(nproc)
2727
cmake --install build --prefix "$PREFIX" --config Release
2828
2929
export LLAMA_CONFIG="$PREFIX"/lib/cmake/llama/llama-config.cmake
@@ -54,4 +54,4 @@ jobs:
5454
5555
cd examples/simple-cmake-pkg
5656
cmake -S . -B build -DCMAKE_PREFIX_PATH="$PREFIX"/lib/cmake
57-
cmake --build build
57+
cmake --build build -j $(nproc)

‎.github/workflows/build-cpu.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
id: cmake_build
9595
run: |
9696
cmake -B build \
97+
-DGGML_NATIVE=OFF \
9798
-DLLAMA_FATAL_WARNINGS=ON \
9899
-DGGML_RPC=ON \
99100
-DGGML_NATIVE=OFF

‎.github/workflows/build-sanitize.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
strategy:
4040
matrix:
4141
include:
42+
# thread and address doesn't run properly on some self hosted machines, so run it on Github instead
4243
- sanitizer: ADDRESS
43-
machine: [self-hosted, X64, Linux]
44-
# thread doesn't run properly on some self hosted machines, so run it on Github instead
44+
machine: ubuntu-24.04
4545
- sanitizer: THREAD
4646
machine: ubuntu-24.04
4747
- sanitizer: UNDEFINED
@@ -54,14 +54,14 @@ jobs:
5454
id: checkout
5555
uses: actions/checkout@v6
5656

57-
- name: ccache
58-
uses: ggml-org/ccache-action@v1.2.21
59-
if: ${{ matrix.sanitizer == 'THREAD' }}
60-
with:
61-
key: ctest-thread-ubuntu-24.04
62-
variant: ccache
63-
evict-old-files: 1d
64-
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
57+
# - name: ccache
58+
# uses: ggml-org/ccache-action@v1.2.21
59+
# if: ${{ matrix.sanitizer != 'UNDEFINED' }}
60+
# with:
61+
# key: ctest-${{ matrix.sanitizer }}-ubuntu-24.04
62+
# variant: ccache
63+
# evict-old-files: 1d
64+
# save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
6565

6666
# with UNDEFINED sanitizer, we have to build in Debug to avoid GCC 13 false-positive warnings
6767
- name: Build (undefined)

0 commit comments

Comments
 (0)