File tree Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Original file line number Diff line number Diff line change @@ -132,9 +132,9 @@ jobs:
132
132
-DGGML_OPENMP=OFF ;
133
133
cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server
134
134
135
- - name : Build
136
- id : cmake_build
137
- if : ${{ matrix.sanitizer != 'THREAD' }}
135
+ - name : Build (sanitizers)
136
+ id : cmake_build_sanitizers
137
+ if : ${{ matrix.sanitizer != '' && matrix.sanitizer != ' THREAD' }}
138
138
run : |
139
139
cmake -B build \
140
140
-DGGML_NATIVE=OFF \
@@ -144,12 +144,31 @@ jobs:
144
144
-DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON ;
145
145
cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server
146
146
147
+ - name : Build (sanitizers)
148
+ id : cmake_build
149
+ if : ${{ matrix.sanitizer == '' }}
150
+ run : |
151
+ cmake -B build \
152
+ -DGGML_NATIVE=OFF \
153
+ -DLLAMA_BUILD_SERVER=ON \
154
+ -DLLAMA_CURL=ON \
155
+ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ;
156
+ cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server
157
+
147
158
- name : Tests
148
159
id : server_integration_tests
160
+ if : ${{ matrix.sanitizer == '' }}
149
161
run : |
150
162
cd examples/server/tests
151
163
./tests.sh
152
164
165
+ - name : Tests (sanitizers)
166
+ id : server_integration_tests_sanitizers
167
+ if : ${{ matrix.sanitizer != '' }}
168
+ run : |
169
+ cd examples/server/tests
170
+ LLAMA_SANITIZE=1 ./tests.sh
171
+
153
172
- name : Slow tests
154
173
id : server_integration_tests_slow
155
174
if : ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }}
Original file line number Diff line number Diff line change 26
26
import wget
27
27
28
28
29
+ DEFAULT_HTTP_TIMEOUT = 10 if "LLAMA_SANITIZE" not in os .environ else 30
30
+
31
+
29
32
class ServerResponse :
30
33
headers : dict
31
34
status_code : int
@@ -88,7 +91,7 @@ def __init__(self):
88
91
if "PORT" in os .environ :
89
92
self .server_port = int (os .environ ["PORT" ])
90
93
91
- def start (self , timeout_seconds : int = 10 ) -> None :
94
+ def start (self , timeout_seconds : int | None = DEFAULT_HTTP_TIMEOUT ) -> None :
92
95
if "LLAMA_SERVER_BIN_PATH" in os .environ :
93
96
server_path = os .environ ["LLAMA_SERVER_BIN_PATH" ]
94
97
elif os .name == "nt" :
You can’t perform that action at this time.
0 commit comments