diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-17 20:18:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 20:18:56 +0000 |
commit | 04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce (patch) | |
tree | 1cb30a63099a69f678d4901b495203b765a6df59 /modules/sd_vae.py | |
parent | 7201d940a4fe664beb9662fadbeade4ee1d788f7 (diff) | |
parent | b397f63e00bbfbe9087d80abb457aa9a593b181b (diff) | |
download | stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.gz stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.bz2 stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.zip |
Merge branch 'dev' into improve-frontend-responsiveness
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 9b00f76e..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 [checkpoint_path + ".vae.pt", checkpoint_path + ".vae.ckpt", 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 |