Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.devops/nix/package.nix
#	CMakePresets.json
#	README.md
#	flake.lock
#	ggml/src/CMakeLists.txt
#	tests/test-backend-ops.cpp
#	tests/test-chat-template.cpp
This commit is contained in:
Concedo 2024-07-02 21:05:45 +08:00
commit 0fc18d2d82
25 changed files with 1452 additions and 1367 deletions

View file

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