diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index bc5c0bd5..141546b4 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,17 +1,14 @@ controlnet_softness, \ - 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] * 14 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 9 def set_all_advanced_parameters(*args): global controlnet_softness, \ - 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 controlnet_softness, \ - 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 = args diff --git a/modules/async_worker.py b/modules/async_worker.py index 301918c2..22c33c74 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -157,6 +157,11 @@ def worker(): canny_low_threshold = args.pop() canny_high_threshold = args.pop() refiner_swap_method = args.pop() + freeu_enabled = args.pop() + freeu_b1 = args.pop() + freeu_b2 = args.pop() + freeu_s1 = args.pop() + freeu_s2 = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -698,14 +703,14 @@ def worker(): if len(all_ip_tasks) > 0: pipeline.final_unet = ip_adapter.patch_model(pipeline.final_unet, all_ip_tasks) - if advanced_parameters.freeu_enabled: + if freeu_enabled: print(f'FreeU is enabled!') pipeline.final_unet = core.apply_freeu( pipeline.final_unet, - advanced_parameters.freeu_b1, - advanced_parameters.freeu_b2, - advanced_parameters.freeu_s1, - advanced_parameters.freeu_s2 + freeu_b1, + freeu_b2, + freeu_s1, + freeu_s2 ) all_steps = steps * image_number diff --git a/webui.py b/webui.py index c26dcb5b..75bc7ceb 100644 --- a/webui.py +++ b/webui.py @@ -447,7 +447,6 @@ with shared.gradio_root: freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2] adps = [controlnet_softness] - adps += freeu_ctrls adps += inpaint_ctrls def dev_mode_checked(r): @@ -530,6 +529,7 @@ with shared.gradio_root: ctrls += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint] ctrls += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold] ctrls += [refiner_swap_method] + ctrls += freeu_ctrls ctrls += ip_ctrls state_is_generating = gr.State(False)