Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	README.md
#	docs/build.md
#	examples/infill/infill.cpp
#	examples/main/README.md
#	examples/server/README.md
#	flake.lock
#	scripts/sync-ggml.last
#	src/llama.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-sampling.cpp
This commit is contained in:
Concedo 2024-10-17 16:36:02 +08:00
commit a9dbcdd3ec
34 changed files with 1701 additions and 928 deletions

View file

@ -44,7 +44,7 @@ maxhordelen = 400
modelbusy = threading.Lock()
requestsinqueue = 0
defaultport = 5001
KcppVersion = "1.76"
KcppVersion = "1.77"
showdebug = True
guimode = False
showsamplerwarning = True
@ -2250,8 +2250,8 @@ def show_gui():
import customtkinter as ctk
nextstate = 0 #0=exit, 1=launch
original_windowwidth = 550
original_windowheight = 550
original_windowwidth = 580
original_windowheight = 560
windowwidth = original_windowwidth
windowheight = original_windowheight
ctk.set_appearance_mode("dark")