aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_vae.py
diff options
context:
space:
mode:
authorAUTOMATIC <16777216c@gmail.com>2023-01-15 21:44:46 +0000
committerAUTOMATIC <16777216c@gmail.com>2023-01-15 21:44:52 +0000
commit3f887f7f61d69fa699a272166b79fdb787e9ce1d (patch)
treef9094a80a633612e8c7cb520a82f1cdf2fd07b00 /modules/sd_vae.py
parent300d4a80df13137407e713b93c7481af3c202999 (diff)
downloadstable-diffusion-webui-gfx803-3f887f7f61d69fa699a272166b79fdb787e9ce1d.tar.gz
stable-diffusion-webui-gfx803-3f887f7f61d69fa699a272166b79fdb787e9ce1d.tar.bz2
stable-diffusion-webui-gfx803-3f887f7f61d69fa699a272166b79fdb787e9ce1d.zip
support old configs that say "auto" for ssd_vae
change sd_vae_as_default to True by default as it's a more sensible setting
Diffstat (limited to 'modules/sd_vae.py')
-rw-r--r--modules/sd_vae.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/sd_vae.py b/modules/sd_vae.py
index add5cecf..e9c6bb40 100644
--- a/modules/sd_vae.py
+++ b/modules/sd_vae.py
@@ -94,8 +94,10 @@ def resolve_vae(checkpoint_file):
if shared.cmd_opts.vae_path is not None:
return shared.cmd_opts.vae_path, 'from commandline argument'
+ is_automatic = shared.opts.sd_vae in {"Automatic", "auto"} # "auto" for people with old config
+
vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
- if vae_near_checkpoint is not None and (shared.opts.sd_vae_as_default or shared.opts.sd_vae == "Automatic"):
+ if vae_near_checkpoint is not None and (shared.opts.sd_vae_as_default or is_automatic):
return vae_near_checkpoint, 'found near the checkpoint'
if shared.opts.sd_vae == "None":
@@ -105,7 +107,7 @@ def resolve_vae(checkpoint_file):
if vae_from_options is not None:
return vae_from_options, 'specified in settings'
- if shared.opts.sd_vae != "Automatic":
+ if is_automatic:
print(f"Couldn't find VAE named {shared.opts.sd_vae}; using None instead")
return None, None