Skip to content

Commit 97b78f0

Browse files
committed
version 1.66g and updated cuda build batches
1 parent 6087c10 commit 97b78f0

5 files changed

+24
-7
lines changed

koboldcpp.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,9 @@ def string_contains_sequence_substring(inputstr,sequences):
646646
modelbusy = threading.Lock()
647647
requestsinqueue = 0
648648
defaultport = 5001
649-
KcppVersion = "1.66xx"
650-
LcppVersion = "b29xx"
649+
KcppVersion = "1.66h"
650+
LcppVersion = "b2912+6"
651+
ReleaseDate = "2024/05/18"
651652
showdebug = True
652653
showsamplerwarning = True
653654
showmaxctxwarning = True
@@ -1105,7 +1106,7 @@ def noscript_webui(self):
11051106

11061107
def do_GET(self):
11071108
global embedded_kailite, embedded_kcpp_docs, embedded_kcpp_sdui
1108-
global maxctx, maxhordelen, friendlymodelname, KcppVersion, LcppVersion, totalgens, preloaded_story, exitcounter, currentusergenkey, friendlysdmodelname, fullsdmodelpath, mmprojpath, password
1109+
global maxctx, maxhordelen, friendlymodelname, KcppVersion, LcppVersion, ReleaseDate, totalgens, preloaded_story, exitcounter, currentusergenkey, friendlysdmodelname, fullsdmodelpath, mmprojpath, password
11091110
self.path = self.path.rstrip('/')
11101111
response_body = None
11111112
content_type = 'application/json'
@@ -3365,7 +3366,7 @@ def onready_subprocess():
33653366
s_pp = float(benchmaxctx-benchlen)/t_pp
33663367
s_gen = float(benchlen)/t_gen
33673368
datetimestamp = datetime.now(timezone.utc)
3368-
print(f"\nBenchmark Completed - v{KcppVersion} based on LlamaCPP {LcppVersion} Results:\n======")
3369+
print(f"\nBenchmark Completed - v{KcppVersion} based on LlamaCPP {LcppVersion}; Release date: {ReleaseDate} Results:\n======")
33693370
print(f"Timestamp: {datetimestamp}")
33703371
print(f"Backend: {libname}")
33713372
print(f"Model: {benchmodel}")
@@ -3389,7 +3390,7 @@ def onready_subprocess():
33893390
file.seek(0, 2)
33903391
if file.tell() == 0: #empty file
33913392
file.write(f"Datime,KCPP,LCPP,Backend,Model,Threads,Layers,BlasThreads,BBSize,FlashA,MaxCtx,GenNum,PPTime,PPSpeed,TGTime,TGSpeed,TotalTime,Coherence,Output")
3392-
file.write(f"\n{datetimestamp},{KcppVersion},{LcppVersion},{libname},{benchmodel},{args.threads},{args.gpulayers},{args.blasthreads},{args.blasbatchsize},{args.flashattention},{benchmaxctx},{benchlen},{t_pp:.2f},{s_pp:.2f},{t_gen:.2f},{s_gen:.2f},{(t_pp+t_gen):.2f},{resultok},{result}")
3393+
file.write(f"\n{ReleaseDate},{KcppVersion},{LcppVersion},{libname},{benchmodel},{args.threads},{args.gpulayers},{args.blasthreads},{args.blasbatchsize},{args.flashattention},{benchmaxctx},{benchlen},{t_pp:.2f},{s_pp:.2f},{t_gen:.2f},{s_gen:.2f},{(t_pp+t_gen):.2f},{resultok},{result}")
33933394
except Exception as e:
33943395
print(f"Error writing benchmark to file: {e}")
33953396
global using_gui_launcher
@@ -3446,7 +3447,8 @@ def range_checker(arg: str):
34463447
return range_checker
34473448

34483449
print("***\nWelcome to KoboldCpp Frankenstein Fork - Version " + KcppVersion) # just update version manually
3449-
print("***\nBased on LlamaCpp - Version " + LcppVersion) # just update version manually
3450+
print("***\nBased on LlamaCpp - Version " + LcppVersion) # just update LlamaCPP version manually
3451+
print("***\nRelease date: " + ReleaseDate) # just update date manually
34503452
print("***")
34513453
# print("Python version: " + sys.version)
34523454
parser = argparse.ArgumentParser(description='KoboldCpp Server')

make_pyinstaller_HP.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon "./niko.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data="./kcpp_sdui.embd;." --add-data="./taesd.embd;." --add-data="./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
1+
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon "./niko.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data="./kcpp_sdui.embd;." --add-data="./taesd.embd;." --add-data="./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
2+
pause

make_pyinstaller_HP_NoVul.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon "./niko.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data="./kcpp_sdui.embd;." --add-data="./taesd.embd;." --add-data="./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
2+
pause
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cd /d "%~dp0"
2+
copy "P:\NVIDIAGPUCT\CUDA\v11.7\bin\cudart64_110.dll" .\ /Y
3+
copy "P:\NVIDIAGPUCT\CUDA\v11.7\bin\cublasLt64_11.dll" .\ /Y
4+
copy "P:\NVIDIAGPUCT\CUDA\v11.7\bin\cublas64_11.dll" .\ /Y
5+
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon ".\nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data="./kcpp_sdui.embd;." --add-data="./taesd.embd;." --add-data="./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cudart64_110.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cublas64_11.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp_cuda.exe"
6+
pause
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cd /d "%~dp0"
2+
copy "P:\NVIDIAGPUCT\CUDA\v12.2\bin\cudart64_12.dll" .\ /Y
3+
copy "P:\NVIDIAGPUCT\CUDA\v12.2\bin\cublasLt64_12.dll" .\ /Y
4+
copy "P:\NVIDIAGPUCT\CUDA\v12.2\bin\cublas64_12.dll" .\ /Y
5+
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon ".\nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data="./kcpp_sdui.embd;." --add-data="./taesd.embd;." --add-data="./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cudart64_12.dll;." --add-data "./cublasLt64_12.dll;." --add-data "./cublas64_12.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp_cuda.exe"
6+
pause

0 commit comments

Comments
 (0)