aboutsummaryrefslogtreecommitdiffstats
path: root/modules/extras.py
diff options
context:
space:
mode:
authorsafentisAuth <safentis@csd.auth.gr>2022-09-28 23:50:34 +0000
committerAUTOMATIC1111 <16777216c@gmail.com>2022-09-29 09:41:47 +0000
commit66fed8ffb8e75bbed4e36ae39c30df686b477677 (patch)
tree040e90a35699cb163b7a8becd52eea9250e5c031 /modules/extras.py
parent819fd3af40d7cb5bac9a496f0e08c062fedf100b (diff)
downloadstable-diffusion-webui-gfx803-66fed8ffb8e75bbed4e36ae39c30df686b477677.tar.gz
stable-diffusion-webui-gfx803-66fed8ffb8e75bbed4e36ae39c30df686b477677.tar.bz2
stable-diffusion-webui-gfx803-66fed8ffb8e75bbed4e36ae39c30df686b477677.zip
Add custom name and try-except
Diffstat (limited to 'modules/extras.py')
-rw-r--r--modules/extras.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/extras.py b/modules/extras.py
index 9a825530..c2543fcf 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -141,7 +141,7 @@ def run_pnginfo(image):
return '', geninfo, info
-def run_modelmerger(primary_model_name, secondary_model_name, interp_method, interp_amount, save_as_half):
+def run_modelmerger(primary_model_name, secondary_model_name, interp_method, interp_amount, save_as_half, custom_name):
# Linear interpolation (https://en.wikipedia.org/wiki/Linear_interpolation)
def weighted_sum(theta0, theta1, alpha):
return ((1 - alpha) * theta0) + (alpha * theta1)
@@ -190,6 +190,7 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
theta_0[key] = theta_0[key].half()
filename = primary_model_info.model_name + '_' + str(round(interp_amount, 2)) + '-' + secondary_model_info.model_name + '_' + str(round((float(1.0) - interp_amount), 2)) + '-' + interp_method.replace(" ", "_") + '-merged.ckpt'
+ filename = filename if custom_name == '' else (custom_name + '.ckpt')
output_modelname = os.path.join(shared.cmd_opts.ckpt_dir, filename)
print(f"Saving to {output_modelname}...")