From 848558d7d95a5036ac057efdefa9b2a2e6fb61b7 Mon Sep 17 00:00:00 2001 From: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com> Date: Sun, 30 Jul 2023 20:02:52 -0500 Subject: [PATCH] import vars logic fix --- koboldcpp.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/koboldcpp.py b/koboldcpp.py index 5b0a6dd7a669d..d9b8c91b31447 100755 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -1158,10 +1158,7 @@ def import_vars(dict): if str(g) in dict["usecublas"]: gpu_choice_var.set(str(g+1)) break - if "gpulayers" in dict and dict["gpulayers"]: - gpulayers_var.set(dict["gpulayers"]) - - if "noavx2" in dict and "noblas" in dict and dict["noblas"] and dict["noavx2"]: + elif "noavx2" in dict and "noblas" in dict and dict["noblas"] and dict["noavx2"]: if failsafe_option is not None: runopts_var.set(failsafe_option) elif "noavx2" in dict and dict["noavx2"]: @@ -1172,6 +1169,8 @@ def import_vars(dict): runopts_var.set(default_option) elif openblas_option is not None: runopts_var.set(openblas_option) + if "gpulayers" in dict and dict["gpulayers"]: + gpulayers_var.set(dict["gpulayers"]) if "blasthreads" in dict and dict["blasthreads"]: blas_threads_var.set(str(dict["blasthreads"])) else: