From fc3da75baf77849905c8f55814f426590d9510b0 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 22 Jan 2024 17:27:15 +0100 Subject: [PATCH] feat: extract attribute adaptive_cfg --- modules/advanced_parameters.py | 8 ++++---- modules/async_worker.py | 5 +++-- webui.py | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index e90a8295..314a27ca 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,4 +1,4 @@ -adaptive_cfg, sampler_name, \ +sampler_name, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ @@ -6,11 +6,11 @@ adaptive_cfg, sampler_name, \ refiner_swap_method, \ freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \ debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ - inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 31 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 30 def set_all_advanced_parameters(*args): - global adaptive_cfg, sampler_name, \ + global sampler_name, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ @@ -20,7 +20,7 @@ def set_all_advanced_parameters(*args): debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate - adaptive_cfg, sampler_name, \ + sampler_name, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ diff --git a/modules/async_worker.py b/modules/async_worker.py index e0093cea..6333cc56 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -144,6 +144,7 @@ def worker(): adm_scaler_positive = args.pop() adm_scaler_negative = args.pop() adm_scaler_end = args.pop() + adaptive_cfg = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -194,14 +195,14 @@ def worker(): scheduler_name = advanced_parameters.scheduler_name = 'lcm' modules.patch.sharpness = sharpness = 0.0 cfg_scale = guidance_scale = 1.0 - modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg = 1.0 + modules.patch.adaptive_cfg = adaptive_cfg = 1.0 refiner_switch = 1.0 modules.patch.positive_adm_scale = adm_scaler_positive = 1.0 modules.patch.negative_adm_scale = adm_scaler_negative = 1.0 modules.patch.adm_scaler_end = adm_scaler_end = 0.0 steps = 8 - modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg + modules.patch.adaptive_cfg = adaptive_cfg print(f'[Parameters] Adaptive CFG = {modules.patch.adaptive_cfg}') modules.patch.sharpness = sharpness diff --git a/webui.py b/webui.py index ba3f9d8c..d8d146e3 100644 --- a/webui.py +++ b/webui.py @@ -446,7 +446,7 @@ with shared.gradio_root: freeu_s2 = gr.Slider(label='S2', minimum=0, maximum=4, step=0.01, value=0.95) freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2] - adps = [adaptive_cfg, sampler_name, + adps = [sampler_name, scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength, overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, @@ -528,7 +528,7 @@ with shared.gradio_root: ctrls += [input_image_checkbox, current_tab] ctrls += [uov_method, uov_input_image] ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image] - ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end] + ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg] ctrls += ip_ctrls state_is_generating = gr.State(False)