@@ -8468,6 +8468,7 @@ def export_vars():
84688468 args.usevulkan = None
84698469 args.usecuda = None
84708470 args.noavx2 = False
8471+ args.failsafe = False
84718472 if gpu_choice_var.get()!="All":
84728473 gpuchoiceidx = int(gpu_choice_var.get())-1
84738474 if runopts_var.get() == "Use CUDA" or runopts_var.get() == "Use hipBLAS (ROCm)":
@@ -8491,10 +8492,9 @@ def export_vars():
84918492 elif runopts_var.get() == "Use Vulkan (Older CPU)":
84928493 args.noavx2 = True
84938494 args.failsafe = True
8494- if gpulayers_var.get():
8495- args.gpulayers = (0 if gpulayers_var.get()=="" else int(gpulayers_var.get()))
8496- if autofit_padding_var.get():
8497- args.autofitpadding = (default_autofit_padding if autofit_padding_var.get()=="" else int(autofit_padding_var.get()))
8495+
8496+ args.gpulayers = (-1 if gpulayers_var.get()=="" else int(gpulayers_var.get()))
8497+ args.autofitpadding = (default_autofit_padding if autofit_padding_var.get()=="" else int(autofit_padding_var.get()))
84988498 if runopts_var.get()=="Use CPU":
84998499 args.usecpu = True
85008500 if runopts_var.get()=="Use CPU (Old CPU)":
@@ -8505,12 +8505,14 @@ def export_vars():
85058505 args.usecpu = True
85068506 args.usemmap = False
85078507 args.failsafe = True
8508+ args.tensor_split = None
85088509 if tensor_split_str_vars.get()!="":
85098510 tssv = tensor_split_str_vars.get()
85108511 if "," in tssv:
85118512 args.tensor_split = [float(x) for x in tssv.split(",")]
85128513 else:
85138514 args.tensor_split = [float(x) for x in tssv.split(" ")]
8515+ args.draftgpusplit = None
85148516 if draftgpusplit_str_vars.get()!="":
85158517 tssv = draftgpusplit_str_vars.get()
85168518 if "," in tssv:
@@ -8541,10 +8543,8 @@ def export_vars():
85418543 args.nobostoken = (nobostoken_var.get()==1)
85428544 args.jinja = (jinja_var.get()==1)
85438545 args.jinja_tools = (jinja_tools_var.get()==1)
8544- if jinja_kwargs_var.get() != "":
8545- args.jinja_kwargs = jinja_kwargs_var.get()
8546- if jinjatemplate_var.get() != "":
8547- args.jinjatemplate = jinjatemplate_var.get()
8546+ args.jinja_kwargs = jinja_kwargs_var.get() if jinja_kwargs_var.get() != "" else ""
8547+ args.jinjatemplate = jinjatemplate_var.get() if jinjatemplate_var.get() != "" else ""
85488548 args.enableguidance = (enableguidance_var.get()==1)
85498549 args.overridekv = None if override_kv_var.get() == "" else override_kv_var.get()
85508550 args.overridetensors = None if override_tensors_var.get() == "" else override_tensors_var.get()
@@ -8607,7 +8607,7 @@ def export_vars():
86078607 args.hordekey = horde_apikey_var.get()
86088608 args.hordeworkername = horde_workername_var.get()
86098609
8610- args.sdmodel = sd_model_var.get() if sd_model_var.get() != "" else ""
8610+ args.sdmodel = sd_model_var.get() if sd_model_var.get() != "" else ""
86118611 args.sdflashattention = True if sd_flash_attention_var.get()==1 else False
86128612 args.sdoffloadcpu = True if sd_offload_cpu_var.get()==1 else False
86138613 args.sdvaecpu = True if sd_vae_cpu_var.get()==1 else False
0 commit comments