diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-17 06:26:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 06:26:26 +0000 |
| commit | 85232a5b26666854deae59cf950f744740dd5c37 (patch) | |
| tree | 3af76d8c6ba3173ffd925336d902da058df4e02d /modules/sd_vae.py | |
| parent | 56a2672831751480f94a018f861f0143a8234ae8 (diff) | |
| parent | 4b07f2f584596604c4499efb0b0295e96985080f (diff) | |
| download | stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.tar.gz stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.tar.bz2 stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.zip | |
Merge branch 'dev' into taesd-a
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 |