Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	README.md
#	examples/gbnf-validator/gbnf-validator.cpp
#	examples/llava/clip.cpp
#	examples/run/README.md
#	examples/run/run.cpp
#	examples/server/README.md
#	ggml/src/ggml-cpu/CMakeLists.txt
#	src/llama.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-llama-grammar.cpp
This commit is contained in:
Concedo 2024-12-21 09:41:49 +08:00
commit 4c56b7cada
19 changed files with 550 additions and 226 deletions

View file

@ -56,7 +56,7 @@ maxhordelen = 400
modelbusy = threading.Lock()
requestsinqueue = 0
defaultport = 5001
KcppVersion = "1.80"
KcppVersion = "1.80.1"
showdebug = True
guimode = False
showsamplerwarning = True