From 288304ee64ac1029a284477e0299902fc9c594cd Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 9 May 2025 14:13:41 +0200 Subject: [PATCH] whisper : deprecate WHISPER_CCACHE CMake option (#3131) * whisper : deprecate WHISPER_CCACHE CMake option This commit deprecates the WHISPER_CCACHE CMake option in favor of the GGML_CCACHE option. The motivation for this change is that currently when setting, or not setting WHISPER_CCACHE, the outut message from ggml will be that to enable ccache you need to set GGML_CCACHE which can be confusing. This also seems to be inline with what llama.cpp does which does not have a LLAMA_CCACHE option as far as I know. Resolves: https://github.com/ggml-org/whisper.cpp/issues/3063 * ruby : change "WHISPER_CCACHE" to "GGML_CCACHE" * ruby : move GGML_CCACHE to sorted position --- CMakeLists.txt | 5 +---- bindings/ruby/ext/options.rb | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8ab1cce..b4fab8c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,9 +59,6 @@ option(BUILD_SHARED_LIBS "build shared libraries" ${BUILD_SHARED_LIBS_DEFAULT}) # option list # -# general -option(WHISPER_CCACHE "whisper: use ccache if available" ON) - # debug option(WHISPER_ALL_WARNINGS "whisper: enable all compiler warnings" ON) option(WHISPER_ALL_WARNINGS_3RD_PARTY "whisper: enable all compiler warnings in 3rd party libs" OFF) @@ -96,7 +93,6 @@ option(WHISPER_OPENVINO "whisper: support for OpenVINO" OFF) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake) # override ggml options -set(GGML_CCACHE ${WHISPER_CCACHE}) set(GGML_SANITIZE_THREAD ${WHISPER_SANITIZE_THREAD}) set(GGML_SANITIZE_ADDRESS ${WHISPER_SANITIZE_ADDRESS}) set(GGML_SANITIZE_UNDEFINED ${WHISPER_SANITIZE_UNDEFINED}) @@ -121,6 +117,7 @@ whisper_option_depr(WARNING WHISPER_OPENMP GGML_OPENMP) whisper_option_depr(WARNING WHISPER_RPC GGML_RPC) whisper_option_depr(WARNING WHISPER_SYCL GGML_SYCL) whisper_option_depr(WARNING WHISPER_SYCL_F16 GGML_SYCL_F16) +whisper_option_depr(WARNING WHISPER_CCACHE GGML_CCACHE) # # build the library diff --git a/bindings/ruby/ext/options.rb b/bindings/ruby/ext/options.rb index 6fed3184..29ff7909 100644 --- a/bindings/ruby/ext/options.rb +++ b/bindings/ruby/ext/options.rb @@ -88,6 +88,7 @@ class Options bool "GGML_BMI2" ignored "GGML_BUILD_EXAMPLES" ignored "GGML_BUILD_TESTS" + bool "GGML_CCACHE" filepath "GGML_CCACHE_FOUND" bool "GGML_CPU" bool "GGML_CPU_AARCH64" @@ -168,7 +169,6 @@ class Options ignored "WHISPER_BUILD_EXAMPLES" ignored "WHISPER_BUILD_SERVER" ignored"WHISPER_BUILD_TESTS" - bool "WHISPER_CCACHE" bool "WHISPER_COREML" bool "WHISPER_COREML_ALLOW_FALLBACK" ignored "WHISPER_CURL"