Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	Makefile
#	ggml-metal.m
This commit is contained in:
Concedo 2024-03-15 10:37:48 +08:00
commit 93d3871056
22 changed files with 341 additions and 198 deletions

View file

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