happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: extract attribute adaptive_cfg

This commit is contained in:
Manuel Schmid 2024-01-22 17:27:15 +01:00
parent 618b01764c
commit fc3da75baf
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/advanced_parameters.py
View File

@ -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, \

5
modules/async_worker.py
View File

@ -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

4
webui.py
View File

@ -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)