From 3e6f7850f8ab41d5b113e633a6607a94c6ae3e99 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 12 Oct 2024 14:00:38 -0400 Subject: [PATCH] cleanup config Signed-off-by: Vladimir Mandic --- modules/shared.py | 9 +++++---- scripts/xyz_grid_shared.py | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/shared.py b/modules/shared.py index 2249d1db6..152060e5b 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -402,7 +402,7 @@ def get_default_modes(): # sdp_options_default = ['Math attention'] else: default_sdp_options = ['Flash attention', 'Memory attention', 'Math attention'] - if (cmd_opts.lowvram or cmd_opts.medvram) and 'Flash attention' not in default_sdp_options: + if (cmd_opts.lowvram or cmd_opts.medvram) and ('Flash attention' not in default_sdp_options): default_sdp_options.append('Dynamic attention') return default_offload_mode, default_cross_attention, default_sdp_options @@ -980,9 +980,10 @@ class Options: if self.data_labels[k].default != v: diff[k] = v else: - if k not in compatibility_opts and not k.startswith('uiux_'): - unused_settings.append(k) - diff[k] = v + if k not in compatibility_opts: + diff[k] = v + if not k.startswith('uiux_'): + unused_settings.append(k) writefile(diff, filename, silent=silent) if len(unused_settings) > 0: log.debug(f"Unused settings: {unused_settings}") diff --git a/scripts/xyz_grid_shared.py b/scripts/xyz_grid_shared.py index ee8977f52..963121ddd 100644 --- a/scripts/xyz_grid_shared.py +++ b/scripts/xyz_grid_shared.py @@ -172,7 +172,6 @@ def apply_dict(p, x, xs): def apply_clip_skip(p, x, xs): p.clip_skip = x - shared.opts.data["clip_skip"] = x shared.log.debug(f'XYZ grid apply clip-skip: "{x}"')