Public/koboldcpp
1
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-09-19 09:15:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into concedo_experimental

Browse Source 
# Conflicts:
#	README.md
#	examples/llama-bench/llama-bench.cpp
#	examples/llama.android/llama/src/main/cpp/llama-android.cpp
#	examples/llama.android/llama/src/main/java/android/llama/cpp/LLamaAndroid.kt
#	src/llama-vocab.cpp
#	tests/test-backend-ops.cpp
This commit is contained in:
Concedo
2025-01-17 23:13:50 +08:00
parent e8570de0e6 3edfa7d375
commit 96407502cd
43 changed files with 15434 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
koboldcpp.py
+9 -3
View File
@@ -2933,7 +2933,7 @@ def RunServerMultiThreaded(addr, port):
while 1:
try:
time.sleep(10)
except KeyboardInterrupt:
except (KeyboardInterrupt,SystemExit):
global exitcounter
exitcounter = 999
for i in range(numThreads):
@@ -4177,7 +4177,7 @@ def show_gui():
ctk.CTkButton(tabs , text = "Update", fg_color="#9900cc", hover_color="#aa11dd", command = display_updates, width=90, height = 35 ).grid(row=1,column=0, stick="sw", padx= 5, pady=5)
ctk.CTkButton(tabs , text = "Save", fg_color="#084a66", hover_color="#085a88", command = save_config_gui, width=60, height = 35 ).grid(row=1,column=1, stick="sw", padx= 5, pady=5)
ctk.CTkButton(tabs , text = "Load", fg_color="#084a66", hover_color="#085a88", command = load_config_gui, width=60, height = 35 ).grid(row=1,column=1, stick="sw", padx= 70, pady=5)
ctk.CTkButton(tabs , text = "Help", fg_color="#992222", hover_color="#bb3333", command = display_help, width=60, height = 35 ).grid(row=1,column=1, stick="sw", padx= 135, pady=5)
ctk.CTkButton(tabs , text = "Help (Find Models)", fg_color="#992222", hover_color="#bb3333", command = display_help, width=100, height = 35 ).grid(row=1,column=1, stick="sw", padx= 135, pady=5)
# start a thread that tries to get actual gpu names and layer counts
gpuinfo_thread = threading.Thread(target=auto_set_backend_gui)
@@ -4189,7 +4189,13 @@ def show_gui():
import_vars(dict)
# runs main loop until closed or launch clicked
root.mainloop()
try:
root.mainloop()
except (KeyboardInterrupt,SystemExit):
exitcounter = 999
print("Exiting by user request.")
sys.exit(0)
if nextstate==0:
exitcounter = 999