diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-10 14:04:59 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-10 14:04:59 +0000 |
| commit | ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d (patch) | |
| tree | 523e3f7ce97481751c255b46628fed659b175daf /modules/sd_models.py | |
| parent | 70a01cd4440d708bf25cc50393c0430935a8ebc2 (diff) | |
| download | stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.tar.gz stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.tar.bz2 stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.zip | |
resolve merge issues
Diffstat (limited to 'modules/sd_models.py')
| -rw-r--r-- | modules/sd_models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index f6cb2f34..a178adca 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -640,8 +640,11 @@ def reuse_model_from_already_loaded(sd_model, checkpoint_info, timer): timer.record("send model to device")
model_data.set_sd_model(already_loaded)
- shared.opts.data["sd_model_checkpoint"] = already_loaded.sd_checkpoint_info.title
- shared.opts.data["sd_checkpoint_hash"] = already_loaded.sd_checkpoint_info.sha256
+
+ if not SkipWritingToConfig.skip:
+ shared.opts.data["sd_model_checkpoint"] = already_loaded.sd_checkpoint_info.title
+ shared.opts.data["sd_checkpoint_hash"] = already_loaded.sd_checkpoint_info.sha256
+
print(f"Using already loaded model {already_loaded.sd_checkpoint_info.title}: done in {timer.summary()}")
return model_data.sd_model
elif shared.opts.sd_checkpoints_limit > 1 and len(model_data.loaded_sd_models) < shared.opts.sd_checkpoints_limit:
|