File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -50,9 +50,6 @@ endif()
50
50
# option list
51
51
#
52
52
53
- # general
54
- option (LLAMA_CCACHE "llama: use ccache if available" ON )
55
-
56
53
# debug
57
54
option (LLAMA_ALL_WARNINGS "llama: enable all compiler warnings" ON )
58
55
option (LLAMA_ALL_WARNINGS_3RD_PARTY "llama: enable all compiler warnings in 3rd party libs" OFF )
@@ -77,7 +74,6 @@ option(LLAMA_CURL "llama: use libcurl to download model from an URL" OFF)
77
74
include (${CMAKE_CURRENT_SOURCE_DIR} /cmake/build-info.cmake )
78
75
79
76
# override ggml options
80
- set (GGML_CCACHE ${LLAMA_CCACHE} )
81
77
set (GGML_SANITIZE_THREAD ${LLAMA_SANITIZE_THREAD} )
82
78
set (GGML_SANITIZE_ADDRESS ${LLAMA_SANITIZE_ADDRESS} )
83
79
set (GGML_SANITIZE_UNDEFINED ${LLAMA_SANITIZE_UNDEFINED} )
Original file line number Diff line number Diff line change @@ -245,17 +245,22 @@ MK_CFLAGS = -std=c11 -fPIC
245
245
MK_CXXFLAGS = -std=c++11 -fPIC
246
246
MK_NVCCFLAGS = -std=c++11
247
247
248
- ifndef LLAMA_NO_CCACHE
248
+ ifdef LLAMA_NO_CCACHE
249
+ GGML_NO_CCACHE := 1
250
+ DEPRECATE_WARNING := 1
251
+ endif
252
+
253
+ ifndef GGML_NO_CCACHE
249
254
CCACHE := $(shell which ccache)
250
255
ifdef CCACHE
251
256
export CCACHE_SLOPPINESS = time_macros
252
- $(info I ccache found, compilation results will be cached. Disable with LLAMA_NO_CCACHE .)
257
+ $(info I ccache found, compilation results will be cached. Disable with GGML_NO_CCACHE .)
253
258
CC := $(CCACHE ) $(CC )
254
259
CXX := $(CCACHE ) $(CXX )
255
260
else
256
261
$(info I ccache not found. Consider installing it for faster compilation.)
257
262
endif # CCACHE
258
- endif # LLAMA_NO_CCACHE
263
+ endif # GGML_NO_CCACHE
259
264
260
265
# clock_gettime came in POSIX.1b (1993)
261
266
# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
@@ -926,6 +931,7 @@ $(info - LLAMA_NO_LLAMAFILE)
926
931
$(info - LLAMA_NO_ACCELERATE)
927
932
$(info - LLAMA_NO_OPENMP)
928
933
$(info - LLAMA_NO_METAL)
934
+ $(info - LLAMA_NO_CCACHE)
929
935
$(info )
930
936
endif
931
937
You can’t perform that action at this time.
0 commit comments