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

another merge conflict

Browse Source
This commit is contained in:
Enes Sadık Özbek
2025-06-26 01:58:09 +03:00
committed by GitHub
parent 943b45fdb6
commit f040d67f64
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sd_vae_taesd.py
+1 -13
View File
@@ -52,29 +52,17 @@ def warn_once(msg, variant=None):
def get_model(model_type = 'decoder', variant = None):
global prev_cls, prev_type, prev_model # pylint: disable=global-statement
from modules import shared
<<<<<<< feature/chroma-support
cls = shared.sd_model_type
if cls in {'ldm', 'pixartalpha'}:
cls = 'sd'
elif cls in {'h1', 'lumina2', 'chroma'}:
cls = 'f1'
elif cls == 'pixartsigma':
cls = 'sdxl'
elif cls not in supported:
warn_once(f'cls={shared.sd_model.__class__.__name__} type={cls} unsuppported', variant=variant)
=======
model_cls = shared.sd_model_type
if model_cls is None or model_cls == 'none':
return None
elif model_cls in {'ldm', 'pixartalpha'}:
model_cls = 'sd'
elif model_cls in {'h1', 'lumina2'}:
elif model_cls in {'h1', 'lumina2', 'chroma'}:
model_cls = 'f1'
elif model_cls in {'pixartsigma', 'omnigen'}:
model_cls = 'sdxl'
elif model_cls not in supported:
warn_once(f'cls={shared.sd_model.__class__.__name__} type={model_cls} unsuppported', variant=variant)
>>>>>>> dev
variant = variant or shared.opts.taesd_variant
folder = os.path.join(paths.models_path, "TAESD")
os.makedirs(folder, exist_ok=True)