Merge branch 'upstream' into concedo

# Conflicts:
#	README.md
#	llama.cpp
#	otherarch/sdcpp/SDCPP_LICENSE
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.sh
This commit is contained in:
Concedo 2024-04-09 17:18:35 +08:00
parent 44c384d918
commit d1bb126605
33 changed files with 4005 additions and 2204 deletions

View file

@ -622,7 +622,7 @@ maxhordelen = 256
modelbusy = threading.Lock()
requestsinqueue = 0
defaultport = 5001
KcppVersion = "1.62"
KcppVersion = "1.62.1"
showdebug = True
showsamplerwarning = True
showmaxctxwarning = True