diff options
| author | Muhammad Rizqi Nur <rizqinur2010@gmail.com> | 2022-11-19 09:38:21 +0000 |
|---|---|---|
| committer | Muhammad Rizqi Nur <rizqinur2010@gmail.com> | 2022-11-19 09:38:21 +0000 |
| commit | 8662b5e57fb66ca16237107e67af97a709457eab (patch) | |
| tree | 587098ef7713725d24691554cc821b1828d708c0 /modules/sd_models.py | |
| parent | 45dca0562e0a68d2f92a5b6fe0412dcd8ba0659e (diff) | |
| parent | ff35ae9abb0e2d680bd881e219baf6c998019a9a (diff) | |
| download | stable-diffusion-webui-gfx803-8662b5e57fb66ca16237107e67af97a709457eab.tar.gz stable-diffusion-webui-gfx803-8662b5e57fb66ca16237107e67af97a709457eab.tar.bz2 stable-diffusion-webui-gfx803-8662b5e57fb66ca16237107e67af97a709457eab.zip | |
Merge branch 'a1111' into vae-fix-none
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 cd7fe37a..7a3b1a47 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
@@ -222,6 +215,7 @@ def load_model_weights(model, checkpoint_info, vae_file="auto"): sd_vae.delete_base_vae()
sd_vae.clear_loaded_vae()
+ vae_file = sd_vae.resolve_vae(checkpoint_file, vae_file=vae_file)
sd_vae.load_vae(model, vae_file)
|