Skip to content

Commit 288304e

Browse files
authored
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: #3063 * ruby : change "WHISPER_CCACHE" to "GGML_CCACHE" * ruby : move GGML_CCACHE to sorted position
1 parent b6f3fa4 commit 288304e

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ option(BUILD_SHARED_LIBS "build shared libraries" ${BUILD_SHARED_LIBS_DEFAULT})
5959
# option list
6060
#
6161

62-
# general
63-
option(WHISPER_CCACHE "whisper: use ccache if available" ON)
64-
6562
# debug
6663
option(WHISPER_ALL_WARNINGS "whisper: enable all compiler warnings" ON)
6764
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)
9693
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
9794

9895
# override ggml options
99-
set(GGML_CCACHE ${WHISPER_CCACHE})
10096
set(GGML_SANITIZE_THREAD ${WHISPER_SANITIZE_THREAD})
10197
set(GGML_SANITIZE_ADDRESS ${WHISPER_SANITIZE_ADDRESS})
10298
set(GGML_SANITIZE_UNDEFINED ${WHISPER_SANITIZE_UNDEFINED})
@@ -121,6 +117,7 @@ whisper_option_depr(WARNING WHISPER_OPENMP GGML_OPENMP)
121117
whisper_option_depr(WARNING WHISPER_RPC GGML_RPC)
122118
whisper_option_depr(WARNING WHISPER_SYCL GGML_SYCL)
123119
whisper_option_depr(WARNING WHISPER_SYCL_F16 GGML_SYCL_F16)
120+
whisper_option_depr(WARNING WHISPER_CCACHE GGML_CCACHE)
124121

125122
#
126123
# build the library

bindings/ruby/ext/options.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def configure
8888
bool "GGML_BMI2"
8989
ignored "GGML_BUILD_EXAMPLES"
9090
ignored "GGML_BUILD_TESTS"
91+
bool "GGML_CCACHE"
9192
filepath "GGML_CCACHE_FOUND"
9293
bool "GGML_CPU"
9394
bool "GGML_CPU_AARCH64"
@@ -168,7 +169,6 @@ def configure
168169
ignored "WHISPER_BUILD_EXAMPLES"
169170
ignored "WHISPER_BUILD_SERVER"
170171
ignored"WHISPER_BUILD_TESTS"
171-
bool "WHISPER_CCACHE"
172172
bool "WHISPER_COREML"
173173
bool "WHISPER_COREML_ALLOW_FALLBACK"
174174
ignored "WHISPER_CURL"

0 commit comments

Comments
 (0)