vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make: fix debug options not being applied to NVCC (#7714)

Browse source
This commit is contained in:
Johannes Gäßler 2024-06-03 16:28:58 +02:00 • committed by GitHub
parent 3d7ebf6312
commit 0b832d53ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -135,12 +135,16 @@ MK_NVCCFLAGS = -std=c++11
ifdef LLAMA_FAST ifdef LLAMA_FAST
MK_CFLAGS += -Ofast MK_CFLAGS += -Ofast
HOST_CXXFLAGS += -Ofast HOST_CXXFLAGS += -Ofast
ifndef LLAMA_DEBUG
MK_NVCCFLAGS += -O3 MK_NVCCFLAGS += -O3
endif # LLAMA_DEBUG
else else
MK_CFLAGS += -O3 MK_CFLAGS += -O3
MK_CXXFLAGS += -O3 MK_CXXFLAGS += -O3
ifndef LLAMA_DEBUG
MK_NVCCFLAGS += -O3 MK_NVCCFLAGS += -O3
endif endif # LLAMA_DEBUG
endif # LLAMA_FAST
ifndef LLAMA_NO_CCACHE ifndef LLAMA_NO_CCACHE
CCACHE := $(shell which ccache) CCACHE := $(shell which ccache)
@ -204,6 +208,7 @@ ifdef LLAMA_DEBUG
MK_CFLAGS += -O0 -g MK_CFLAGS += -O0 -g
MK_CXXFLAGS += -O0 -g MK_CXXFLAGS += -O0 -g
MK_LDFLAGS += -g MK_LDFLAGS += -g
MK_NVCCFLAGS += -O0 -g
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
MK_CPPFLAGS += -D_GLIBCXX_ASSERTIONS MK_CPPFLAGS += -D_GLIBCXX_ASSERTIONS