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

Fix setting VAE Force Upcast in diffusers

Browse Source
This commit is contained in:
Kubuxu
2023-07-28 23:07:11 +01:00
parent 31e1bb01ff
commit 1da64b9d08
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sd_models.py
+6 -5
View File
@@ -591,6 +591,11 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No
vae = sd_vae.load_vae_diffusers(None, vae_file, vae_source)
if vae is not None:
diffusers_load_config["vae"] = vae
elif shared.opts.diffusers_vae_upcast != 'default':
# There is no good way to change vae.force_upcast while VAE is loading
# as part of the pipeline or to override it after.
# ?? = True if shared.opts.diffusers_vae_upcast == 'true' else False
shared.info(f'Diffusers VAE force upcast ({shared.opts.diffusers_vae_upcast}) is only supported with an explicit VAE.')
if not os.path.isfile(checkpoint_info.path):
try:
@@ -686,11 +691,7 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No
else:
sd_model.disable_attention_slicing()
if hasattr(sd_model, "vae"):
if vae is not None:
shared.log.debug(f'Diffusers {op} VAE: name={vae.config.get("_name_or_path", "default")} upcast={vae.config.get("force_upcast", None)}')
sd_model.vae = vae # pylint: disable=attribute-defined-outside-init
if shared.opts.diffusers_vae_upcast != 'default':
sd_model.vae.config.force_upcast = True if shared.opts.upcast_sampling == 'true' else False
shared.log.debug(f'Diffusers {op} VAE: name={sd_model.vae.config.get("_name_or_path", "default")} upcast={sd_model.vae.config.get("force_upcast", None)}')
if shared.opts.cross_attention_optimization == "xFormers" and hasattr(sd_model, 'enable_xformers_memory_efficient_attention'):
sd_model.enable_xformers_memory_efficient_attention()
if shared.opts.opt_channelslast:
modules/sd_vae.py
+7
View File
@@ -183,10 +183,17 @@ def load_vae_diffusers(_model, vae_file=None, vae_source="from unknown source"):
}
if devices.dtype_vae == torch.float16:
diffusers_load_config['variant'] = 'fp16'
if shared.opts.diffusers_vae_upcast != 'default':
diffusers_load_config['force_upcast'] = True if shared.opts.diffusers_vae_upcast == 'true' else False
shared.log.debug(f'Diffusers VAE load config: {diffusers_load_config}')
try:
import diffusers
if os.path.isfile(vae_file):
# load_config passed to from_single_file doesn't apply
# from_single_file by default downloads VAE1.5 config
shared.log.warning("Using SDXL VAE loaded from singular file will result in low contrast images.")
vae = diffusers.AutoencoderKL.from_single_file(vae_file)
vae = vae.to(devices.dtype_vae)
else: