diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2023-05-21 14:37:09 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2023-05-21 14:37:09 +0000 |
| commit | 1f3182924ba8e70d0e0fc3ed270782f324376ba3 (patch) | |
| tree | 27a9e5167e5b981dfe56f5084ea8e1e8743f3fc0 /modules/sd_vae.py | |
| parent | 89f9faa63388756314e8a1d96cf86bf5e0663045 (diff) | |
| parent | fdaf0147b6d2a5f599464bb7c65817ef5832eff1 (diff) | |
| download | stable-diffusion-webui-gfx803-1f3182924ba8e70d0e0fc3ed270782f324376ba3.tar.gz stable-diffusion-webui-gfx803-1f3182924ba8e70d0e0fc3ed270782f324376ba3.tar.bz2 stable-diffusion-webui-gfx803-1f3182924ba8e70d0e0fc3ed270782f324376ba3.zip | |
Merge branch 'dev' into release_candidate
Diffstat (limited to 'modules/sd_vae.py')
| -rw-r--r-- | modules/sd_vae.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/sd_vae.py b/modules/sd_vae.py index 521e485a..e4ff2994 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -1,8 +1,5 @@ -import torch -import safetensors.torch import os import collections -from collections import namedtuple from modules import paths, shared, devices, script_callbacks, sd_models import glob from copy import deepcopy @@ -88,10 +85,10 @@ def refresh_vae_list(): def find_vae_near_checkpoint(checkpoint_file): - checkpoint_path = os.path.splitext(checkpoint_file)[0] - for vae_location in [f"{checkpoint_path}.vae.pt", f"{checkpoint_path}.vae.ckpt", f"{checkpoint_path}.vae.safetensors"]: - if os.path.isfile(vae_location): - return vae_location + checkpoint_path = os.path.basename(checkpoint_file).rsplit('.', 1)[0] + for vae_file in vae_dict.values(): + if os.path.basename(vae_file).startswith(checkpoint_path): + return vae_file return None |