aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--launch.py2
-rw-r--r--modules/extras.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/launch.py b/launch.py
index 4462631c..58e28f94 100644
--- a/launch.py
+++ b/launch.py
@@ -108,7 +108,7 @@ if not is_installed("torch") or not is_installed("torchvision"):
run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch")
if not skip_torch_cuda_test:
- run_python("import torch; assert torch.cuda.is_available(), 'Torch is not able to use GPU; add --skip-torch-cuda-test to COMMANDINE_ARGS variable to disable this check'")
+ run_python("import torch; assert torch.cuda.is_available(), 'Torch is not able to use GPU; add --skip-torch-cuda-test to COMMANDLINE_ARGS variable to disable this check'")
if not is_installed("k_diffusion.sampling"):
run_pip(f"install {k_diffusion_package}", "k-diffusion")
diff --git a/modules/extras.py b/modules/extras.py
index 15873204..c4ee2b62 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -186,7 +186,7 @@ def run_modelmerger(modelname_0, modelname_1, interp_method, interp_amount):
if 'model' in key and key not in theta_0:
theta_0[key] = theta_1[key]
- output_modelname = 'models/' + modelname_0 + '-' + modelname_1 + '-merged.ckpt'
+ output_modelname = 'models/' + modelname_0 + '-' + modelname_1 + '-' + interp_method.replace(" ", "_") + '-' + str(interp_amount) + '-merged.ckpt'
print(f"Saving to {output_modelname}...")
torch.save(model_0, output_modelname)