danbev commited on
Commit
c4aa3ee
·
unverified ·
1 Parent(s): df2c5e7

whisper : deprecate WHISPER_CCACHE CMake option (#3131)

Browse files

* 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

Files changed (2) hide show
  1. CMakeLists.txt +1 -4
  2. bindings/ruby/ext/options.rb +1 -1
CMakeLists.txt CHANGED
@@ -59,9 +59,6 @@ option(BUILD_SHARED_LIBS "build shared libraries" ${BUILD_SHARED_LIBS_DEFAULT})
59
  # option list
60
  #
61
 
62
- # general
63
- option(WHISPER_CCACHE "whisper: use ccache if available" ON)
64
-
65
  # debug
66
  option(WHISPER_ALL_WARNINGS "whisper: enable all compiler warnings" ON)
67
  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)
96
  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
97
 
98
  # override ggml options
99
- set(GGML_CCACHE ${WHISPER_CCACHE})
100
  set(GGML_SANITIZE_THREAD ${WHISPER_SANITIZE_THREAD})
101
  set(GGML_SANITIZE_ADDRESS ${WHISPER_SANITIZE_ADDRESS})
102
  set(GGML_SANITIZE_UNDEFINED ${WHISPER_SANITIZE_UNDEFINED})
@@ -121,6 +117,7 @@ whisper_option_depr(WARNING WHISPER_OPENMP GGML_OPENMP)
121
  whisper_option_depr(WARNING WHISPER_RPC GGML_RPC)
122
  whisper_option_depr(WARNING WHISPER_SYCL GGML_SYCL)
123
  whisper_option_depr(WARNING WHISPER_SYCL_F16 GGML_SYCL_F16)
 
124
 
125
  #
126
  # build the library
 
59
  # option list
60
  #
61
 
 
 
 
62
  # debug
63
  option(WHISPER_ALL_WARNINGS "whisper: enable all compiler warnings" ON)
64
  option(WHISPER_ALL_WARNINGS_3RD_PARTY "whisper: enable all compiler warnings in 3rd party libs" OFF)
 
93
  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
94
 
95
  # override ggml options
 
96
  set(GGML_SANITIZE_THREAD ${WHISPER_SANITIZE_THREAD})
97
  set(GGML_SANITIZE_ADDRESS ${WHISPER_SANITIZE_ADDRESS})
98
  set(GGML_SANITIZE_UNDEFINED ${WHISPER_SANITIZE_UNDEFINED})
 
117
  whisper_option_depr(WARNING WHISPER_RPC GGML_RPC)
118
  whisper_option_depr(WARNING WHISPER_SYCL GGML_SYCL)
119
  whisper_option_depr(WARNING WHISPER_SYCL_F16 GGML_SYCL_F16)
120
+ whisper_option_depr(WARNING WHISPER_CCACHE GGML_CCACHE)
121
 
122
  #
123
  # build the library
bindings/ruby/ext/options.rb CHANGED
@@ -88,6 +88,7 @@ class Options
88
  bool "GGML_BMI2"
89
  ignored "GGML_BUILD_EXAMPLES"
90
  ignored "GGML_BUILD_TESTS"
 
91
  filepath "GGML_CCACHE_FOUND"
92
  bool "GGML_CPU"
93
  bool "GGML_CPU_AARCH64"
@@ -168,7 +169,6 @@ class Options
168
  ignored "WHISPER_BUILD_EXAMPLES"
169
  ignored "WHISPER_BUILD_SERVER"
170
  ignored"WHISPER_BUILD_TESTS"
171
- bool "WHISPER_CCACHE"
172
  bool "WHISPER_COREML"
173
  bool "WHISPER_COREML_ALLOW_FALLBACK"
174
  ignored "WHISPER_CURL"
 
88
  bool "GGML_BMI2"
89
  ignored "GGML_BUILD_EXAMPLES"
90
  ignored "GGML_BUILD_TESTS"
91
+ bool "GGML_CCACHE"
92
  filepath "GGML_CCACHE_FOUND"
93
  bool "GGML_CPU"
94
  bool "GGML_CPU_AARCH64"
 
169
  ignored "WHISPER_BUILD_EXAMPLES"
170
  ignored "WHISPER_BUILD_SERVER"
171
  ignored"WHISPER_BUILD_TESTS"
 
172
  bool "WHISPER_COREML"
173
  bool "WHISPER_COREML_ALLOW_FALLBACK"
174
  ignored "WHISPER_CURL"