diff options
| author | d8ahazard <d8ahazard@gmail.com> | 2022-10-02 12:56:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 12:56:22 +0000 |
| commit | 5d26ba2b4b84b64d82150ae70495f928b3b0b116 (patch) | |
| tree | 71cb73ba018dab302ea1dfa8c3f368137106a6af /modules/extras.py | |
| parent | 8deae077004f0332ca607fc3a5d568b1a4705bec (diff) | |
| parent | 5f561ee95dcb09d92ea67bab5561dced93fe3d00 (diff) | |
| download | stable-diffusion-webui-gfx803-5d26ba2b4b84b64d82150ae70495f928b3b0b116.tar.gz stable-diffusion-webui-gfx803-5d26ba2b4b84b64d82150ae70495f928b3b0b116.tar.bz2 stable-diffusion-webui-gfx803-5d26ba2b4b84b64d82150ae70495f928b3b0b116.zip | |
Merge branch 'master' into ScuNET
Diffstat (limited to 'modules/extras.py')
| -rw-r--r-- | modules/extras.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/extras.py b/modules/extras.py index 1bff5874..6a0d5cb0 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -191,9 +191,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)
|