Skip to content

Commit 274b3fc

Browse files
make/cmake: LLAMA_NO_CCACHE -> GGML_NO_CCACHE
1 parent 9925ca4 commit 274b3fc

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ endif()
5050
# option list
5151
#
5252

53-
# general
54-
option(LLAMA_CCACHE "llama: use ccache if available" ON)
55-
5653
# debug
5754
option(LLAMA_ALL_WARNINGS "llama: enable all compiler warnings" ON)
5855
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)
7774
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
7875

7976
# override ggml options
80-
set(GGML_CCACHE ${LLAMA_CCACHE})
8177
set(GGML_SANITIZE_THREAD ${LLAMA_SANITIZE_THREAD})
8278
set(GGML_SANITIZE_ADDRESS ${LLAMA_SANITIZE_ADDRESS})
8379
set(GGML_SANITIZE_UNDEFINED ${LLAMA_SANITIZE_UNDEFINED})

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,17 +245,22 @@ MK_CFLAGS = -std=c11 -fPIC
245245
MK_CXXFLAGS = -std=c++11 -fPIC
246246
MK_NVCCFLAGS = -std=c++11
247247

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
249254
CCACHE := $(shell which ccache)
250255
ifdef CCACHE
251256
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.)
253258
CC := $(CCACHE) $(CC)
254259
CXX := $(CCACHE) $(CXX)
255260
else
256261
$(info I ccache not found. Consider installing it for faster compilation.)
257262
endif # CCACHE
258-
endif # LLAMA_NO_CCACHE
263+
endif # GGML_NO_CCACHE
259264

260265
# clock_gettime came in POSIX.1b (1993)
261266
# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
@@ -926,6 +931,7 @@ $(info - LLAMA_NO_LLAMAFILE)
926931
$(info - LLAMA_NO_ACCELERATE)
927932
$(info - LLAMA_NO_OPENMP)
928933
$(info - LLAMA_NO_METAL)
934+
$(info - LLAMA_NO_CCACHE)
929935
$(info )
930936
endif
931937

0 commit comments

Comments
 (0)