diff --git a/ci/run.sh b/ci/run.sh index 2a98b941b6..a17d01e0c0 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -58,10 +58,10 @@ CMAKE_EXTRA="-DLLAMA_FATAL_WARNINGS=${LLAMA_FATAL_WARNINGS:-ON} -DLLAMA_OPENSSL= CTEST_EXTRA="" # Default to use make unless specified for compatibility -CMAKE_GENERATOR=(-G "Unix Makefiles") +CMAKE_GENERATOR="Unix Makefiles" if [ -n "${GG_BUILD_NINJA}" ]; then - CMAKE_GENERATOR=(-G Ninja) + CMAKE_GENERATOR="Ninja" fi if [ ! -z ${GG_BUILD_METAL} ]; then @@ -252,7 +252,7 @@ function gg_run_ctest_debug { # Check cmake and ctest are installed gg_check_build_requirements - (time cmake "${CMAKE_GENERATOR[@]}" -DCMAKE_BUILD_TYPE=Debug ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log + (time cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log (time cmake --build . --config Debug -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log (time ctest -C Debug --output-on-failure -L main -E "test-opt|test-backend-ops" ${CTEST_EXTRA}) 2>&1 | tee -a $OUT/${ci}-ctest.log @@ -283,7 +283,7 @@ function gg_run_ctest_release { # Check cmake and ctest are installed gg_check_build_requirements - (time cmake "${CMAKE_GENERATOR[@]}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log + (time cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log if [ -z ${GG_BUILD_LOW_PERF} ]; then @@ -414,7 +414,7 @@ function gg_run_qwen3_0_6b { set -e - (time cmake "${CMAKE_GENERATOR[@]}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log + (time cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf --outtype f16 @@ -563,7 +563,7 @@ function gg_run_embd_bge_small { set -e - (time cmake "${CMAKE_GENERATOR[@]}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log + (time cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf @@ -608,7 +608,7 @@ function gg_run_rerank_tiny { set -e - (time cmake "${CMAKE_GENERATOR[@]}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log + (time cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf