From 1f4886b40decc78fdd10d30f841f6e2f0a3985de Mon Sep 17 00:00:00 2001 From: Benjamin Ryan Date: Fri, 14 Mar 2025 03:53:29 -0500 Subject: [PATCH] ggml-ci: update input env variables to GG_BUILD_ (#2879) --- ci/README.md | 18 +++++++++--------- ci/run.sh | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/README.md b/ci/README.md index e091b6be..63df4aa1 100644 --- a/ci/README.md +++ b/ci/README.md @@ -21,7 +21,7 @@ mkdir tmp bash ./ci/run.sh ./tmp/results ./tmp/mnt # with CUDA support -GGML_CUDA=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt +GG_BUILD_CUDA=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt ``` ## Environment Variables @@ -30,12 +30,12 @@ The CI script supports several environment variables to control the build: | Variable | Description | |----------|-------------| -| `GGML_CUDA` | Enable NVIDIA CUDA GPU acceleration | -| `GGML_SYCL` | Enable Intel SYCL acceleration | -| `GGML_VULKAN` | Enable Vulkan GPU acceleration | -| `GGML_METAL` | Enable Metal acceleration on Apple Silicon | -| `GGML_BLAS` | Enable BLAS CPU acceleration | -| `WHISPER_OPENVINO` | Enable OpenVINO support | -| `WHISPER_COREML` | Enable Core ML support for Apple Neural Engine | +| `GG_BUILD_CUDA` | Enable NVIDIA CUDA GPU acceleration | +| `GG_BUILD_SYCL` | Enable Intel SYCL acceleration | +| `GG_BUILD_VULKAN` | Enable Vulkan GPU acceleration | +| `GG_BUILD_METAL` | Enable Metal acceleration on Apple Silicon | +| `GG_BUILD_BLAS` | Enable BLAS CPU acceleration | +| `GG_BUILD_OPENVINO` | Enable OpenVINO support | +| `GG_BUILD_COREML` | Enable Core ML support for Apple Neural Engine | | `GG_BUILD_LOW_PERF` | Limit tests for low-performance hardware | -| `GGML_TEST_MODELS` | Comma-separated list of models to test (e.g. "tiny.en,tiny,base,medium", defaults to all models unless `GG_BUILD_LOW_PERF` is set) | +| `GG_BUILD_TEST_MODELS` | Comma-separated list of models to test (e.g. "tiny.en,tiny,base,medium", defaults to all models unless `GG_BUILD_LOW_PERF` is set) | diff --git a/ci/run.sh b/ci/run.sh index 69721f07..f91078f0 100644 --- a/ci/run.sh +++ b/ci/run.sh @@ -8,7 +8,7 @@ # bash ./ci/run.sh ./tmp/results ./tmp/mnt # # # with CUDA support -# GGML_CUDA=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt +# GG_BUILD_CUDA=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt # if [ -z "$2" ]; then @@ -36,8 +36,8 @@ BENCH_ENCODER_ONLY=0 BENCH_FLASH_ATTN=0 # check for user-specified models first. if not specified, use fast models -if [ ! -z ${GGML_TEST_MODELS} ]; then - IFS=',' read -r -a MODELS <<< "${GGML_TEST_MODELS}" +if [ ! -z ${GG_BUILD_TEST_MODELS} ]; then + IFS=',' read -r -a MODELS <<< "${GG_BUILD_TEST_MODELS}" else if [ ! -z ${GG_BUILD_LOW_PERF} ]; then MODELS=( "tiny" "base" "small" ) @@ -48,11 +48,11 @@ fi CMAKE_EXTRA="-DWHISPER_FATAL_WARNINGS=ON" -if [ ! -z ${GGML_CUDA} ]; then +if [ ! -z ${GG_BUILD_CUDA} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_CUDA=ON -DCMAKE_CUDA_ARCHITECTURES=native" fi -if [ ! -z ${GGML_SYCL} ]; then +if [ ! -z ${GG_BUILD_SYCL} ]; then if [ -z ${ONEAPI_ROOT} ]; then echo "Not detected ONEAPI_ROOT, please install oneAPI base toolkit and enable it by:" echo "source /opt/intel/oneapi/setvars.sh" @@ -62,23 +62,23 @@ if [ ! -z ${GGML_SYCL} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DGGML_SYCL_F16=ON" fi -if [ ! -z ${WHISPER_OPENVINO} ]; then +if [ ! -z ${GG_BUILD_OPENVINO} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DWHISPER_OPENVINO=ON" fi -if [ ! -z ${GGML_METAL} ]; then +if [ ! -z ${GG_BUILD_METAL} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_METAL=ON" fi -if [ ! -z ${GGML_VULKAN} ]; then +if [ ! -z ${GG_BUILD_VULKAN} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_VULKAN=ON" fi -if [ ! -z ${GGML_BLAS} ]; then +if [ ! -z ${GG_BUILD_BLAS} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_BLAS=ON" fi -if [ ! -z ${WHISPER_COREML} ]; then +if [ ! -z ${GG_BUILD_COREML} ]; then CMAKE_EXTRA="${CMAKE_EXTRA} -DWHISPER_COREML=ON" fi