mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2025-09-10 17:14:36 +00:00
vae test
This commit is contained in:
parent
4807b66907
commit
5d15f8f76a
13 changed files with 70 additions and 13 deletions
1
expose.h
1
expose.h
|
@ -109,6 +109,7 @@ struct token_count_outputs
|
||||||
struct sd_load_model_inputs
|
struct sd_load_model_inputs
|
||||||
{
|
{
|
||||||
const char * model_filename;
|
const char * model_filename;
|
||||||
|
const char * executable_path;
|
||||||
const int clblast_info = 0;
|
const int clblast_info = 0;
|
||||||
const int cublas_info = 0;
|
const int cublas_info = 0;
|
||||||
const char * vulkan_info;
|
const char * vulkan_info;
|
||||||
|
|
44
koboldcpp.py
44
koboldcpp.py
|
@ -102,6 +102,7 @@ class generation_outputs(ctypes.Structure):
|
||||||
|
|
||||||
class sd_load_model_inputs(ctypes.Structure):
|
class sd_load_model_inputs(ctypes.Structure):
|
||||||
_fields_ = [("model_filename", ctypes.c_char_p),
|
_fields_ = [("model_filename", ctypes.c_char_p),
|
||||||
|
("executable_path", ctypes.c_char_p),
|
||||||
("clblast_info", ctypes.c_int),
|
("clblast_info", ctypes.c_int),
|
||||||
("cublas_info", ctypes.c_int),
|
("cublas_info", ctypes.c_int),
|
||||||
("vulkan_info", ctypes.c_char_p),
|
("vulkan_info", ctypes.c_char_p),
|
||||||
|
@ -521,6 +522,7 @@ def sd_load_model(model_filename,vae_filename,lora_filename):
|
||||||
global args
|
global args
|
||||||
inputs = sd_load_model_inputs()
|
inputs = sd_load_model_inputs()
|
||||||
inputs.debugmode = args.debugmode
|
inputs.debugmode = args.debugmode
|
||||||
|
inputs.executable_path = (getdirpath()+"/").encode("UTF-8")
|
||||||
inputs.model_filename = model_filename.encode("UTF-8")
|
inputs.model_filename = model_filename.encode("UTF-8")
|
||||||
thds = args.threads
|
thds = args.threads
|
||||||
quant = 0
|
quant = 0
|
||||||
|
@ -1714,6 +1716,10 @@ def show_new_gui():
|
||||||
password_var = ctk.StringVar()
|
password_var = ctk.StringVar()
|
||||||
|
|
||||||
sd_model_var = ctk.StringVar()
|
sd_model_var = ctk.StringVar()
|
||||||
|
sd_lora_var = ctk.StringVar()
|
||||||
|
sd_loramult_var = ctk.StringVar(value="1.0")
|
||||||
|
sd_vae_var = ctk.StringVar()
|
||||||
|
sd_vaeauto_var = ctk.IntVar(value=0)
|
||||||
sd_clamped_var = ctk.IntVar(value=0)
|
sd_clamped_var = ctk.IntVar(value=0)
|
||||||
sd_threads_var = ctk.StringVar(value=str(default_threads))
|
sd_threads_var = ctk.StringVar(value=str(default_threads))
|
||||||
sd_quant_var = ctk.IntVar(value=0)
|
sd_quant_var = ctk.IntVar(value=0)
|
||||||
|
@ -1782,7 +1788,7 @@ def show_new_gui():
|
||||||
|
|
||||||
|
|
||||||
def makefileentry(parent, text, searchtext, var, row=0, width=200, filetypes=[], onchoosefile=None, singlerow=False, tooltiptxt=""):
|
def makefileentry(parent, text, searchtext, var, row=0, width=200, filetypes=[], onchoosefile=None, singlerow=False, tooltiptxt=""):
|
||||||
makelabel(parent, text, row,0,tooltiptxt)
|
label = makelabel(parent, text, row,0,tooltiptxt)
|
||||||
def getfilename(var, text):
|
def getfilename(var, text):
|
||||||
initialDir = os.path.dirname(var.get())
|
initialDir = os.path.dirname(var.get())
|
||||||
initialDir = initialDir if os.path.isdir(initialDir) else None
|
initialDir = initialDir if os.path.isdir(initialDir) else None
|
||||||
|
@ -1799,7 +1805,7 @@ def show_new_gui():
|
||||||
else:
|
else:
|
||||||
entry.grid(row=row+1, column=0, padx=8, stick="nw")
|
entry.grid(row=row+1, column=0, padx=8, stick="nw")
|
||||||
button.grid(row=row+1, column=1, stick="nw")
|
button.grid(row=row+1, column=1, stick="nw")
|
||||||
return
|
return label, entry, button
|
||||||
|
|
||||||
# decided to follow yellowrose's and kalomaze's suggestions, this function will automatically try to determine GPU identifiers
|
# decided to follow yellowrose's and kalomaze's suggestions, this function will automatically try to determine GPU identifiers
|
||||||
# run in new thread so it doesnt block. does not return anything, instead overwrites specific values and redraws GUI
|
# run in new thread so it doesnt block. does not return anything, instead overwrites specific values and redraws GUI
|
||||||
|
@ -2200,11 +2206,26 @@ def show_new_gui():
|
||||||
togglehorde(1,1,1)
|
togglehorde(1,1,1)
|
||||||
|
|
||||||
# Image Gen Tab
|
# Image Gen Tab
|
||||||
|
|
||||||
images_tab = tabcontent["Image Gen"]
|
images_tab = tabcontent["Image Gen"]
|
||||||
makefileentry(images_tab, "Stable Diffusion Model (safetensors/gguf):", "Select Stable Diffusion Model File", sd_model_var, 1, filetypes=[("*.safetensors *.gguf","*.safetensors *.gguf")], tooltiptxt="Select a .safetensors or .gguf Stable Diffusion model file on disk to be loaded.")
|
makefileentry(images_tab, "Stable Diffusion Model (safetensors/gguf):", "Select Stable Diffusion Model File", sd_model_var, 1, filetypes=[("*.safetensors *.gguf","*.safetensors *.gguf")], tooltiptxt="Select a .safetensors or .gguf Stable Diffusion model file on disk to be loaded.")
|
||||||
makecheckbox(images_tab, "Clamped Mode (Limit Resolution)", sd_clamped_var, 4,tooltiptxt="Limit generation steps and resolution settings for shared use.")
|
makecheckbox(images_tab, "Clamped Mode (Limit Resolution)", sd_clamped_var, 4,tooltiptxt="Limit generation steps and resolution settings for shared use.")
|
||||||
makelabelentry(images_tab, "Image threads:" , sd_threads_var, 6, 50,"How many threads to use during image generation.\nIf left blank, uses same value as threads.")
|
makelabelentry(images_tab, "Image Threads:" , sd_threads_var, 6, 50,"How many threads to use during image generation.\nIf left blank, uses same value as threads.")
|
||||||
makecheckbox(images_tab, "Compress Weights (Saves Memory)", sd_quant_var, 8,tooltiptxt="Quantizes the SD model weights to save memory. May degrade quality.")
|
makecheckbox(images_tab, "Compress Weights (Saves Memory)", sd_quant_var, 8,tooltiptxt="Quantizes the SD model weights to save memory. May degrade quality.")
|
||||||
|
makefileentry(images_tab, "Image LoRA:", "Select SD lora file",sd_lora_var, 10 ,filetypes=[("*.safetensors *.gguf", "*.safetensors *.gguf")],tooltiptxt="Select a .safetensors or .gguf SD LoRA model file to be loaded.")
|
||||||
|
makelabelentry(images_tab, "Image LoRA Multiplier:" , sd_loramult_var, 12, 50,"What mutiplier value to apply the SD LoRA with.")
|
||||||
|
|
||||||
|
sdvaeitem1,sdvaeitem2,sdvaeitem3 = makefileentry(images_tab, "Image VAE:", "Select SD VAE file",sd_vae_var, 14, filetypes=[("*.safetensors *.gguf", "*.safetensors *.gguf")],tooltiptxt="Select a .safetensors or .gguf SD VAE file to be loaded.")
|
||||||
|
def toggletaesd(a,b,c):
|
||||||
|
if sd_vaeauto_var.get()==1:
|
||||||
|
sdvaeitem1.grid_forget()
|
||||||
|
sdvaeitem2.grid_forget()
|
||||||
|
sdvaeitem3.grid_forget()
|
||||||
|
else:
|
||||||
|
sdvaeitem1.grid(row=14,column=0,padx=8,stick="nw")
|
||||||
|
sdvaeitem2.grid(row=15,column=0,padx=8,stick="nw")
|
||||||
|
sdvaeitem3.grid(row=15,column=1,stick="nw")
|
||||||
|
makecheckbox(images_tab, "Use TAE SD VAE", sd_vaeauto_var, 16,command=toggletaesd,tooltiptxt="Replace VAE with TAESD.")
|
||||||
|
|
||||||
# launch
|
# launch
|
||||||
def guilaunch():
|
def guilaunch():
|
||||||
|
@ -2308,6 +2329,19 @@ def show_new_gui():
|
||||||
args.sdthreads = (0 if sd_threads_var.get()=="" else int(sd_threads_var.get()))
|
args.sdthreads = (0 if sd_threads_var.get()=="" else int(sd_threads_var.get()))
|
||||||
if sd_quant_var.get()==1:
|
if sd_quant_var.get()==1:
|
||||||
args.sdquant = True
|
args.sdquant = True
|
||||||
|
if sd_vaeauto_var.get()==1:
|
||||||
|
args.sdvaeauto = True
|
||||||
|
args.sdvae = ""
|
||||||
|
else:
|
||||||
|
args.sdvaeauto = False
|
||||||
|
args.sdvae = ""
|
||||||
|
if sd_vae_var.get() != "":
|
||||||
|
args.sdvae = sd_vae_var.get()
|
||||||
|
if sd_lora_var.get() != "":
|
||||||
|
args.sdlora = sd_lora_var.get()
|
||||||
|
args.sdloramult = float(sd_loramult_var.get())
|
||||||
|
else:
|
||||||
|
args.sdlora = ""
|
||||||
|
|
||||||
def import_vars(dict):
|
def import_vars(dict):
|
||||||
dict = convert_outdated_args(dict)
|
dict = convert_outdated_args(dict)
|
||||||
|
@ -2442,6 +2476,10 @@ def show_new_gui():
|
||||||
sd_clamped_var.set(1 if ("sdclamped" in dict and dict["sdclamped"]) else 0)
|
sd_clamped_var.set(1 if ("sdclamped" in dict and dict["sdclamped"]) else 0)
|
||||||
sd_threads_var.set(str(dict["sdthreads"]) if ("sdthreads" in dict and dict["sdthreads"]) else str(default_threads))
|
sd_threads_var.set(str(dict["sdthreads"]) if ("sdthreads" in dict and dict["sdthreads"]) else str(default_threads))
|
||||||
sd_quant_var.set(1 if ("sdquant" in dict and dict["sdquant"]) else 0)
|
sd_quant_var.set(1 if ("sdquant" in dict and dict["sdquant"]) else 0)
|
||||||
|
sd_vae_var.set(dict["sdvae"] if ("sdvae" in dict and dict["sdvae"]) else "")
|
||||||
|
sd_vaeauto_var.set(1 if ("sdvaeauto" in dict and dict["sdvaeauto"]) else 0)
|
||||||
|
sd_lora_var.set(dict["sdlora"] if ("sdlora" in dict and dict["sdlora"]) else "")
|
||||||
|
sd_loramult_var.set(str(dict["sdloramult"]) if ("sdloramult" in dict and dict["sdloramult"]) else "1.0")
|
||||||
|
|
||||||
def save_config():
|
def save_config():
|
||||||
file_type = [("KoboldCpp Settings", "*.kcpps")]
|
file_type = [("KoboldCpp Settings", "*.kcpps")]
|
||||||
|
|
|
@ -26,8 +26,8 @@ if [[ $1 == "rebuild" ]]; then
|
||||||
echo Rebuild complete, you can now try to launch Koboldcpp.
|
echo Rebuild complete, you can now try to launch Koboldcpp.
|
||||||
elif [[ $1 == "dist" ]]; then
|
elif [[ $1 == "dist" ]]; then
|
||||||
bin/micromamba remove -r conda -n linux --force ocl-icd -y
|
bin/micromamba remove -r conda -n linux --force ocl-icd -y
|
||||||
bin/micromamba run -r conda -n linux pyinstaller --noconfirm --onefile --collect-all customtkinter --add-data='./koboldcpp_default.so:.' --add-data='./koboldcpp_cublas.so:.' --add-data='./koboldcpp_vulkan.so:.' --add-data='./koboldcpp_openblas.so:.' --add-data='./koboldcpp_clblast.so:.' --add-data "./koboldcpp_failsafe.so:." --add-data "./koboldcpp_noavx2.so:." --add-data "./koboldcpp_clblast_noavx2.so:." --add-data "./koboldcpp_vulkan_noavx2.so:." --add-data "./koboldcpp_vulkan.so:." --add-data='./klite.embd:.' --add-data='./kcpp_docs.embd:.' --add-data='./kcpp_sdui.embd:.' --add-data='./rwkv_vocab.embd:.' --add-data='./rwkv_world_vocab.embd:.' --clean --console koboldcpp.py -n "koboldcpp-linux-x64$KCPP_CUDAAPPEND"
|
bin/micromamba run -r conda -n linux pyinstaller --noconfirm --onefile --collect-all customtkinter --add-data='./koboldcpp_default.so:.' --add-data='./koboldcpp_cublas.so:.' --add-data='./koboldcpp_vulkan.so:.' --add-data='./koboldcpp_openblas.so:.' --add-data='./koboldcpp_clblast.so:.' --add-data "./koboldcpp_failsafe.so:." --add-data "./koboldcpp_noavx2.so:." --add-data "./koboldcpp_clblast_noavx2.so:." --add-data "./koboldcpp_vulkan_noavx2.so:." --add-data "./koboldcpp_vulkan.so:." --add-data='./klite.embd:.' --add-data='./kcpp_docs.embd:.' --add-data='./kcpp_sdui.embd:.' --add-data='./taesd.embd:.' --add-data='./rwkv_vocab.embd:.' --add-data='./rwkv_world_vocab.embd:.' --clean --console koboldcpp.py -n "koboldcpp-linux-x64$KCPP_CUDAAPPEND"
|
||||||
bin/micromamba run -r conda -n linux pyinstaller --noconfirm --onefile --collect-all customtkinter --add-data='./koboldcpp_default.so:.' --add-data='./koboldcpp_openblas.so:.' --add-data='./koboldcpp_vulkan.so:.' --add-data='./koboldcpp_clblast.so:.' --add-data "./koboldcpp_failsafe.so:." --add-data "./koboldcpp_noavx2.so:." --add-data "./koboldcpp_clblast_noavx2.so:." --add-data "./koboldcpp_vulkan_noavx2.so:." --add-data "./koboldcpp_vulkan.so:." --add-data='./klite.embd:.' --add-data='./kcpp_docs.embd:.' --add-data='./kcpp_sdui.embd:.' --add-data='./rwkv_vocab.embd:.' --add-data='./rwkv_world_vocab.embd:.' --clean --console koboldcpp.py -n "koboldcpp-linux-x64-nocuda$KCPP_APPEND"
|
bin/micromamba run -r conda -n linux pyinstaller --noconfirm --onefile --collect-all customtkinter --add-data='./koboldcpp_default.so:.' --add-data='./koboldcpp_openblas.so:.' --add-data='./koboldcpp_vulkan.so:.' --add-data='./koboldcpp_clblast.so:.' --add-data "./koboldcpp_failsafe.so:." --add-data "./koboldcpp_noavx2.so:." --add-data "./koboldcpp_clblast_noavx2.so:." --add-data "./koboldcpp_vulkan_noavx2.so:." --add-data "./koboldcpp_vulkan.so:." --add-data='./klite.embd:.' --add-data='./kcpp_docs.embd:.' --add-data='./kcpp_sdui.embd:.' --add-data='./taesd.embd:.' --add-data='./rwkv_vocab.embd:.' --add-data='./rwkv_world_vocab.embd:.' --clean --console koboldcpp.py -n "koboldcpp-linux-x64-nocuda$KCPP_APPEND"
|
||||||
bin/micromamba install -r conda -n linux ocl-icd -c conda-forge -y
|
bin/micromamba install -r conda -n linux ocl-icd -c conda-forge -y
|
||||||
else
|
else
|
||||||
bin/micromamba run -r conda -n linux python koboldcpp.py $*
|
bin/micromamba run -r conda -n linux python koboldcpp.py $*
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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_nocuda.exe"
|
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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_nocuda.exe"
|
|
@ -4,6 +4,7 @@ pyinstaller --noconfirm --onefile --clean --console --collect-all customtkinter
|
||||||
--add-data "./klite.embd:." \
|
--add-data "./klite.embd:." \
|
||||||
--add-data "./kcpp_docs.embd:." \
|
--add-data "./kcpp_docs.embd:." \
|
||||||
--add-data "./kcpp_sdui.embd:." \
|
--add-data "./kcpp_sdui.embd:." \
|
||||||
|
--add-data "./taesd.embd:." \
|
||||||
--add-data "./koboldcpp_default.so:." \
|
--add-data "./koboldcpp_default.so:." \
|
||||||
--add-data "./koboldcpp_openblas.so:." \
|
--add-data "./koboldcpp_openblas.so:." \
|
||||||
--add-data "./koboldcpp_failsafe.so:." \
|
--add-data "./koboldcpp_failsafe.so:." \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.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.exe"
|
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.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.exe"
|
|
@ -1 +1 @@
|
||||||
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_12.dll;." --add-data "./cublasLt64_12.dll;." --add-data "./cudart64_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_cu12.exe"
|
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_12.dll;." --add-data "./cublasLt64_12.dll;." --add-data "./cudart64_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_cu12.exe"
|
|
@ -31,7 +31,7 @@ static std::string hexToUnicode(const std::string& hexString) {
|
||||||
void read_rwkv_vocab()
|
void read_rwkv_vocab()
|
||||||
{
|
{
|
||||||
std::string line;
|
std::string line;
|
||||||
auto filepath = executable_path+ "rwkv_vocab.embd";
|
auto filepath = executable_path + "rwkv_vocab.embd";
|
||||||
printf("\nReading vocab from %s",filepath.c_str());
|
printf("\nReading vocab from %s",filepath.c_str());
|
||||||
std::ifstream myfile(filepath);
|
std::ifstream myfile(filepath);
|
||||||
if (myfile.is_open())
|
if (myfile.is_open())
|
||||||
|
@ -61,7 +61,7 @@ void read_rwkv_world_vocab() //its in hexadecimal
|
||||||
{
|
{
|
||||||
std::string line;
|
std::string line;
|
||||||
std::string unicodeString;
|
std::string unicodeString;
|
||||||
auto filepath = executable_path+ "rwkv_world_vocab.embd";
|
auto filepath = executable_path + "rwkv_world_vocab.embd";
|
||||||
printf("\nReading world vocab from %s",filepath.c_str());
|
printf("\nReading world vocab from %s",filepath.c_str());
|
||||||
std::ifstream myfile(filepath);
|
std::ifstream myfile(filepath);
|
||||||
if (myfile.is_open())
|
if (myfile.is_open())
|
||||||
|
|
|
@ -150,7 +150,22 @@ std::string base64_encode(const unsigned char* data, unsigned int data_length) {
|
||||||
static std::string sdplatformenv, sddeviceenv, sdvulkandeviceenv;
|
static std::string sdplatformenv, sddeviceenv, sdvulkandeviceenv;
|
||||||
bool sdtype_load_model(const sd_load_model_inputs inputs) {
|
bool sdtype_load_model(const sd_load_model_inputs inputs) {
|
||||||
|
|
||||||
|
executable_path = inputs.executable_path;
|
||||||
|
std::string taesdpath = "";
|
||||||
printf("\nImageGen Init - Load Model: %s\n",inputs.model_filename);
|
printf("\nImageGen Init - Load Model: %s\n",inputs.model_filename);
|
||||||
|
if(inputs.lora_filename!="")
|
||||||
|
{
|
||||||
|
printf("With LoRA: %s at %f power\n",inputs.lora_filename,inputs.lora_multiplier);
|
||||||
|
}
|
||||||
|
if(inputs.taesd)
|
||||||
|
{
|
||||||
|
taesdpath = executable_path + "taesd.embd";
|
||||||
|
printf("With TAE SD VAE: %s\n",taesdpath);
|
||||||
|
}
|
||||||
|
else if(inputs.vae_filename!="")
|
||||||
|
{
|
||||||
|
printf("With Custom VAE: %s\n",inputs.vae_filename);
|
||||||
|
}
|
||||||
|
|
||||||
//duplicated from expose.cpp
|
//duplicated from expose.cpp
|
||||||
int cl_parseinfo = inputs.clblast_info; //first digit is whether configured, second is platform, third is devices
|
int cl_parseinfo = inputs.clblast_info; //first digit is whether configured, second is platform, third is devices
|
||||||
|
@ -184,6 +199,8 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) {
|
||||||
sd_params->n_threads = inputs.threads; //if -1 use physical cores
|
sd_params->n_threads = inputs.threads; //if -1 use physical cores
|
||||||
sd_params->input_path = ""; //unused
|
sd_params->input_path = ""; //unused
|
||||||
sd_params->batch_count = 1;
|
sd_params->batch_count = 1;
|
||||||
|
sd_params->vae_path = inputs.vae_filename;
|
||||||
|
sd_params->taesd_path = taesdpath;
|
||||||
|
|
||||||
sddebugmode = inputs.debugmode;
|
sddebugmode = inputs.debugmode;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
echo This file is only for my own usage, please do not use it. I am lazy.
|
echo This file is only for my own usage, please do not use it. I am lazy.
|
||||||
|
|
||||||
set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
|
set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
|
||||||
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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_nocuda.exe"
|
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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_nocuda.exe"
|
|
@ -1,4 +1,4 @@
|
||||||
echo This file is only for my own usage, please do not use it. I am lazy.
|
echo This file is only for my own usage, please do not use it. I am lazy.
|
||||||
|
|
||||||
set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
|
set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
|
||||||
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.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.exe"
|
PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.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.exe"
|
|
@ -2,4 +2,4 @@ cd /d "%~dp0"
|
||||||
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cudart64_110.dll" .\ /Y
|
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cudart64_110.dll" .\ /Y
|
||||||
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublasLt64_11.dll" .\ /Y
|
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublasLt64_11.dll" .\ /Y
|
||||||
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublas64_11.dll" .\ /Y
|
copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublas64_11.dll" .\ /Y
|
||||||
PyInstaller --noconfirm --onefile --collect-all customtkinter --clean --console --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cudart64_110.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cublas64_11.dll;." --add-data "./rwkv_vocab.embd;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp.exe"
|
PyInstaller --noconfirm --onefile --collect-all customtkinter --clean --console --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 "./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 "./koboldcpp_cublas.dll;." --add-data "./cudart64_110.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cublas64_11.dll;." --add-data "./rwkv_vocab.embd;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp.exe"
|
BIN
taesd.embd
Normal file
BIN
taesd.embd
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue