mirror of
https://github.com/vladmandic/automatic
synced 2026-09-20 09:38:23 +02:00
chore(settings): remove dead attention options
xformers_options had no reader, and Sub-quadratic has not been an attention choice for a long time, so the hypertile branches keyed on it never ran. Configs that still store xformers_options load without the unknown-setting warning.
This commit is contained in:
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
|
||||
import builtins
|
||||
|
||||
cmd_opts = cmd_args.parse_args()
|
||||
compatibility_opts = ['clip_skip', 'uni_pc_lower_order_final', 'uni_pc_order']
|
||||
compatibility_opts = ['clip_skip', 'uni_pc_lower_order_final', 'uni_pc_order', 'xformers_options']
|
||||
secrets_pattern = ['_version', '_token', '_key', '_secret', '_password']
|
||||
|
||||
|
||||
|
||||
@@ -186,12 +186,8 @@ def context_hypertile_vae(p):
|
||||
from modules import shared
|
||||
if shared.sd_model is None or not get_opt(p, 'hypertile_vae_enabled'):
|
||||
return nullcontext()
|
||||
if shared.opts.cross_attention_optimization == 'Sub-quadratic':
|
||||
log.warning('Hypertile UNet is not compatible with Sub-quadratic cross-attention optimization')
|
||||
return nullcontext()
|
||||
global max_h, max_w, error_reported # pylint: disable=global-statement
|
||||
error_reported = False
|
||||
error_reported = False
|
||||
set_resolution(p)
|
||||
max_h, max_w = 0, 0
|
||||
vae = getattr(shared.sd_model, "vae", None)
|
||||
@@ -217,9 +213,6 @@ def context_hypertile_unet(p):
|
||||
from modules import shared
|
||||
if shared.sd_model is None or not get_opt(p, 'hypertile_unet_enabled'):
|
||||
return nullcontext()
|
||||
if shared.opts.cross_attention_optimization == 'Sub-quadratic' and not shared.cmd_opts.experimental:
|
||||
log.warning('Hypertile UNet is not compatible with Sub-quadratic cross-attention optimization')
|
||||
return nullcontext()
|
||||
global max_h, max_w, error_reported # pylint: disable=global-statement
|
||||
error_reported = False
|
||||
set_resolution(p)
|
||||
|
||||
@@ -250,7 +250,6 @@ def create_settings(cmd_opts):
|
||||
"sdp_options": OptionInfo(startup_sdp_options, "SDP kernels", gr.CheckboxGroup, {"choices": startup_sdp_choices}),
|
||||
"sdp_overrides": OptionInfo(startup_sdp_override_options, "SDP overrides", gr.CheckboxGroup, {"choices": startup_sdp_override_choices}),
|
||||
"attention_slicing": OptionInfo('Default', "Attention slicing", gr.Radio, {"choices": ['Default', 'Enabled', 'Disabled']}),
|
||||
"xformers_options": OptionInfo(['Flash attention'], "xFormers options", gr.CheckboxGroup, {"choices": ['Flash attention'] }),
|
||||
"dynamic_attention_slice_rate": OptionInfo(0.5, "Dynamic Attention slicing rate", gr.Slider, {"minimum": 0.01, "maximum": max(gpu_memory,4), "step": 0.01}),
|
||||
"dynamic_attention_trigger_rate": OptionInfo(1, "Dynamic Attention trigger rate", gr.Slider, {"minimum": 0.01, "maximum": max(gpu_memory,4)*2, "step": 0.01}),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user