Merge branch 'master' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	ci/run.sh
#	llama.cpp
This commit is contained in:
Concedo 2024-01-03 22:33:38 +08:00
commit 234f79fe9d
16 changed files with 5321 additions and 4861 deletions

View file

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