Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 09:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from Gazzoo-byte/patch-4

Browse Source 
sd_vae automatic behaviour fix for non-Windows users
This commit is contained in:
Vladimir Mandic
2023-04-25 19:11:36 -04:00
committed by GitHub
parent 6981262beb 97e8224200
commit bc79ab50c5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sd_vae.py
+3 -5
View File
@@ -5,7 +5,6 @@ from copy import deepcopy
from rich import print # pylint: disable=redefined-builtin
import torch
from modules import paths, shared, devices, script_callbacks, sd_models
from pathlib import Path
vae_ignore_keys = {"model_ema.decay", "model_ema.num_updates"}
@@ -103,13 +102,10 @@ def resolve_vae(checkpoint_file):
return vae_near_checkpoint, 'found near the checkpoint'
if is_automatic:
for named_vae_location in [vae_path + "\\" + Path(checkpoint_file).stem + ".vae.pt", vae_path + "\\" + Path(checkpoint_file).stem + ".vae.ckpt", vae_path + "\\" + Path(checkpoint_file).stem + ".vae.safetensors"]:
for named_vae_location in [os.path.join(vae_path, os.path.splitext(os.path.basename(checkpoint_file))[0] + ".vae.pt"), os.path.join(vae_path, os.path.splitext(os.path.basename(checkpoint_file))[0] + ".vae.ckpt"), os.path.join(vae_path, os.path.splitext(os.path.basename(checkpoint_file))[0] + ".vae.safetensors")]:
if os.path.isfile(named_vae_location):
print(named_vae_location+' found in VAE dir')
return named_vae_location, ' found in VAE dir'
else:
print(f"Couldn't find a VAE with a matching name in {vae_path}, using None instead")
return None, None
if shared.opts.sd_vae == "None":
return None, None
@@ -120,6 +116,8 @@ def resolve_vae(checkpoint_file):
if not is_automatic:
print(f"Couldn't find VAE named {shared.opts.sd_vae}; using None instead")
print(f"No matching VAE found, using None instead")
return None, None