diff options
| author | xucj98 <975114697@qq.com> | 2022-11-25 09:07:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 09:07:00 +0000 |
| commit | 263b323de12eb2444b0818105575a2bc69ab0344 (patch) | |
| tree | 7bc4a7802bdaba21550ad281cc08c3fc1037b074 /modules/sd_models.py | |
| parent | d20dbe47e06de7f6c0e65242a04c9bb1410ef7cb (diff) | |
| parent | 828438b4a190759807f9054932cae3a8b880ddf1 (diff) | |
| download | stable-diffusion-webui-gfx803-263b323de12eb2444b0818105575a2bc69ab0344.tar.gz stable-diffusion-webui-gfx803-263b323de12eb2444b0818105575a2bc69ab0344.tar.bz2 stable-diffusion-webui-gfx803-263b323de12eb2444b0818105575a2bc69ab0344.zip | |
Merge branch 'AUTOMATIC1111:master' into draft
Diffstat (limited to 'modules/sd_models.py')
| -rw-r--r-- | modules/sd_models.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index 80addf03..c59151e0 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -165,16 +165,9 @@ def load_model_weights(model, checkpoint_info, vae_file="auto"): cache_enabled = shared.opts.sd_checkpoint_cache > 0
- if cache_enabled:
- sd_vae.restore_base_vae(model)
-
- vae_file = sd_vae.resolve_vae(checkpoint_file, vae_file=vae_file)
-
if cache_enabled and checkpoint_info in checkpoints_loaded:
# use checkpoint cache
- vae_name = sd_vae.get_filename(vae_file) if vae_file else None
- vae_message = f" with {vae_name} VAE" if vae_name else ""
- print(f"Loading weights [{sd_model_hash}]{vae_message} from cache")
+ print(f"Loading weights [{sd_model_hash}] from cache")
model.load_state_dict(checkpoints_loaded[checkpoint_info])
else:
# load from file
@@ -220,6 +213,7 @@ def load_model_weights(model, checkpoint_info, vae_file="auto"): model.sd_model_checkpoint = checkpoint_file
model.sd_checkpoint_info = checkpoint_info
+ vae_file = sd_vae.resolve_vae(checkpoint_file, vae_file=vae_file)
sd_vae.load_vae(model, vae_file)
|