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_vae.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_vae.py')
| -rw-r--r-- | modules/sd_vae.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/sd_vae.py b/modules/sd_vae.py index a6310a2e..25638a83 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -95,7 +95,7 @@ def get_vae_from_settings(vae_file="auto"): # if VAE selected but not found, fallback to auto if vae_file not in default_vae_values and not os.path.isfile(vae_file): vae_file = "auto" - print("Selected VAE doesn't exist") + print(f"Selected VAE doesn't exist: {vae_file}") return vae_file @@ -105,15 +105,15 @@ def resolve_vae(checkpoint_file=None, vae_file="auto"): # if vae_file argument is provided, it takes priority, but not saved if vae_file and vae_file not in default_vae_list: if not os.path.isfile(vae_file): + print(f"VAE provided as function argument doesn't exist: {vae_file}") vae_file = "auto" - print("VAE provided as function argument doesn't exist") # for the first load, if vae-path is provided, it takes priority, saved, and failure is reported if first_load and shared.cmd_opts.vae_path is not None: if os.path.isfile(shared.cmd_opts.vae_path): vae_file = shared.cmd_opts.vae_path shared.opts.data['sd_vae'] = get_filename(vae_file) else: - print("VAE provided as command line argument doesn't exist") + print(f"VAE provided as command line argument doesn't exist: {vae_file}") # fallback to selector in settings, if vae selector not set to act as default fallback if not shared.opts.sd_vae_as_default: vae_file = get_vae_from_settings(vae_file) @@ -121,20 +121,20 @@ def resolve_vae(checkpoint_file=None, vae_file="auto"): if vae_file == "auto" and shared.cmd_opts.vae_path is not None: if os.path.isfile(shared.cmd_opts.vae_path): vae_file = shared.cmd_opts.vae_path - print("Using VAE provided as command line argument") + print(f"Using VAE provided as command line argument: {vae_file}") # if still not found, try look for ".vae.pt" beside model model_path = os.path.splitext(checkpoint_file)[0] if vae_file == "auto": vae_file_try = model_path + ".vae.pt" if os.path.isfile(vae_file_try): vae_file = vae_file_try - print("Using VAE found beside selected model") + print(f"Using VAE found similar to selected model: {vae_file}") # if still not found, try look for ".vae.ckpt" beside model if vae_file == "auto": vae_file_try = model_path + ".vae.ckpt" if os.path.isfile(vae_file_try): vae_file = vae_file_try - print("Using VAE found beside selected model") + print(f"Using VAE found similar to selected model: {vae_file}") # No more fallbacks for auto if vae_file == "auto": vae_file = None @@ -150,6 +150,7 @@ def load_vae(model, vae_file=None): # save_settings = False if vae_file: + assert os.path.isfile(vae_file), f"VAE file doesn't exist: {vae_file}" print(f"Loading VAE weights from: {vae_file}") store_base_vae(model) vae_ckpt = torch.load(vae_file, map_location=shared.weight_load_location) |