diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py index f8c70e595..47cc2339f 100644 --- a/modules/processing_diffusers.py +++ b/modules/processing_diffusers.py @@ -323,7 +323,6 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro p.extra_generation_params['Pipeline'] = shared.sd_model.__class__.__name__ - cross_attention_kwargs={} if len(getattr(p, 'init_images', [])) > 0: while len(p.init_images) < len(prompts): p.init_images.append(p.init_images[-1]) diff --git a/modules/sd_hijack_hypertile.py b/modules/sd_hijack_hypertile.py index 026a9a8ec..d818a6d30 100644 --- a/modules/sd_hijack_hypertile.py +++ b/modules/sd_hijack_hypertile.py @@ -159,7 +159,7 @@ def context_hypertile_unet(p): from modules import shared if p.sd_model is None or not shared.opts.hypertile_unet_enabled: return nullcontext() - if shared.opts.cross_attention_optimization == 'Sub-quadratic': + if shared.opts.cross_attention_optimization == 'Sub-quadratic' and not shared.cmd_opts.experimental: shared.log.warning('Hypertile UNet is not compatible with Sub-quadratic cross-attention optimization') return nullcontext() unet = getattr(p.sd_model, "unet", None) if shared.backend == shared.Backend.DIFFUSERS else getattr(p.sd_model.model, "diffusion_model", None) diff --git a/modules/sd_models.py b/modules/sd_models.py index 967d527ae..4cd2d5cc4 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -1240,7 +1240,7 @@ def apply_token_merging(sd_model, token_merging_ratio=0): except Exception: pass if token_merging_ratio > 0: - if shared.opts.hypertile_unet_enabled: + if shared.opts.hypertile_unet_enabled and not shared.cmd_opts.experimental: shared.log.warning('Token merging not supported with HyperTile for UNet') return try: