Merge branch 'master' into concedo_experimental

# Conflicts:
#	Makefile
#	ggml.c
#	llama.cpp
This commit is contained in:
Concedo
2023-05-14 11:34:41 +08:00
16 changed files with 6698 additions and 350 deletions
+9
View File
@@ -84,6 +84,15 @@ ifeq ($(UNAME_S),Haiku)
CXXFLAGS += -pthread
endif
ifdef LLAMA_GPROF
CFLAGS += -pg
CXXFLAGS += -pg
endif
ifdef LLAMA_PERF
CFLAGS += -DGGML_PERF
CXXFLAGS += -DGGML_PERF
endif
# Architecture specific
# TODO: probably these flags need to be tweaked on some architectures
# feel free to update the Makefile for your architecture and send a pull request or issue