Skip to content

Commit 059031b

Browse files
authored
ci : re-enable sanitizer runs (#7358)
* Revert "ci : temporary disable sanitizer builds (#6128)" This reverts commit 4f6d133. * ci : trigger
1 parent 511182e commit 059031b

File tree

3 files changed

+39
-38
lines changed

3 files changed

+39
-38
lines changed

.github/workflows/build.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -271,40 +271,40 @@ jobs:
271271
path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.zip
272272
name: llama-bin-ubuntu-x64.zip
273273

274-
# ubuntu-latest-cmake-sanitizer:
275-
# runs-on: ubuntu-latest
276-
#
277-
# continue-on-error: true
278-
#
279-
# strategy:
280-
# matrix:
281-
# sanitizer: [ADDRESS, THREAD, UNDEFINED]
282-
# build_type: [Debug, Release]
283-
#
284-
# steps:
285-
# - name: Clone
286-
# id: checkout
287-
# uses: actions/checkout@v4
288-
#
289-
# - name: Dependencies
290-
# id: depends
291-
# run: |
292-
# sudo apt-get update
293-
# sudo apt-get install build-essential
294-
#
295-
# - name: Build
296-
# id: cmake_build
297-
# run: |
298-
# mkdir build
299-
# cd build
300-
# cmake .. -DLLAMA_FATAL_WARNINGS=ON -DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
301-
# cmake --build . --config ${{ matrix.build_type }} -j $(nproc)
302-
#
303-
# - name: Test
304-
# id: cmake_test
305-
# run: |
306-
# cd build
307-
# ctest -L main --verbose --timeout 900
274+
ubuntu-latest-cmake-sanitizer:
275+
runs-on: ubuntu-latest
276+
277+
continue-on-error: true
278+
279+
strategy:
280+
matrix:
281+
sanitizer: [ADDRESS, THREAD, UNDEFINED]
282+
build_type: [Debug, Release]
283+
284+
steps:
285+
- name: Clone
286+
id: checkout
287+
uses: actions/checkout@v4
288+
289+
- name: Dependencies
290+
id: depends
291+
run: |
292+
sudo apt-get update
293+
sudo apt-get install build-essential
294+
295+
- name: Build
296+
id: cmake_build
297+
run: |
298+
mkdir build
299+
cd build
300+
cmake .. -DLLAMA_FATAL_WARNINGS=ON -DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
301+
cmake --build . --config ${{ matrix.build_type }} -j $(nproc)
302+
303+
- name: Test
304+
id: cmake_test
305+
run: |
306+
cd build
307+
ctest -L main --verbose --timeout 900
308308
309309
ubuntu-latest-cmake-mpi:
310310
runs-on: ubuntu-latest

.github/workflows/server.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ jobs:
3232

3333
strategy:
3434
matrix:
35-
# TODO: temporary disabled due to linux kernel issues
36-
#sanitizer: [ADDRESS, THREAD, UNDEFINED]
37-
sanitizer: [UNDEFINED]
35+
sanitizer: [ADDRESS, THREAD, UNDEFINED]
3836
build_type: [Debug]
3937
include:
4038
- build_type: Release
4139
sanitizer: ""
40+
- build_type: Debug
41+
sanitizer: THREAD
42+
disabled_on_pr: true
4243
fail-fast: false # While -DLLAMA_SANITIZE_THREAD=ON is broken
4344

4445
steps:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.14) # for add_link_options and implicit target directories.
1+
cmake_minimum_required(VERSION 3.14) # for add_link_options and implicit target directories.
22
project("llama.cpp" C CXX)
33
include(CheckIncludeFileCXX)
44

0 commit comments

Comments
 (0)