diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-10-06 17:30:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 17:30:29 +0000 |
| commit | ab4ddbf333eef170804ef8de67001f77c8fdd64c (patch) | |
| tree | 21cb1109f8eae463aa4066eec0926cd71ab81740 /modules/extras.py | |
| parent | 2a7f48cdb8dcf9acb02610cccae0d1ee5d260bc2 (diff) | |
| parent | cf7c784fcc0c84a8a4edd8d3aca4dda4c7025c43 (diff) | |
| download | stable-diffusion-webui-gfx803-ab4ddbf333eef170804ef8de67001f77c8fdd64c.tar.gz stable-diffusion-webui-gfx803-ab4ddbf333eef170804ef8de67001f77c8fdd64c.tar.bz2 stable-diffusion-webui-gfx803-ab4ddbf333eef170804ef8de67001f77c8fdd64c.zip | |
Merge branch 'master' into gallery-styling
Diffstat (limited to 'modules/extras.py')
| -rw-r--r-- | modules/extras.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/extras.py b/modules/extras.py index 1bff5874..1d9e64e5 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -100,6 +100,8 @@ def run_extras(extras_mode, image, image_folder, gfpgan_visibility, codeformer_v outputs.append(image)
+ devices.torch_gc()
+
return outputs, plaintext_to_html(info), ''
@@ -191,9 +193,11 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int if save_as_half:
theta_0[key] = theta_0[key].half()
+ ckpt_dir = shared.cmd_opts.ckpt_dir or sd_models.model_path
+
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)
+ output_modelname = os.path.join(ckpt_dir, filename)
print(f"Saving to {output_modelname}...")
torch.save(primary_model, output_modelname)
|