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

feat: extract attribute adm_scaler_negative

This commit is contained in:
Manuel Schmid 2024-01-22 17:02:43 +01:00
parent 3607059224
commit 64dcdbbef3
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 @@
adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \ adm_scaler_end, adaptive_cfg, sampler_name, \
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
overwrite_vary_strength, overwrite_upscale_strength, \ overwrite_vary_strength, overwrite_upscale_strength, \
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
@ -6,11 +6,11 @@ adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
refiner_swap_method, \ refiner_swap_method, \
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \ freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ 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] * 33 inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 32
def set_all_advanced_parameters(*args): def set_all_advanced_parameters(*args):
global adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \ global adm_scaler_end, adaptive_cfg, sampler_name, \
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
overwrite_vary_strength, overwrite_upscale_strength, \ overwrite_vary_strength, overwrite_upscale_strength, \
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ 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, \ 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 inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \ adm_scaler_end, adaptive_cfg, sampler_name, \
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
overwrite_vary_strength, overwrite_upscale_strength, \ overwrite_vary_strength, overwrite_upscale_strength, \
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \

5
modules/async_worker.py
View File

@ -142,6 +142,7 @@ def worker():
inpaint_mask_image_upload = args.pop() inpaint_mask_image_upload = args.pop()
disable_preview = args.pop() disable_preview = args.pop()
adm_scaler_positive = args.pop() adm_scaler_positive = args.pop()
adm_scaler_negative = args.pop()
cn_tasks = {x: [] for x in flags.ip_list} cn_tasks = {x: [] for x in flags.ip_list}
for _ in range(4): for _ in range(4):
@ -195,7 +196,7 @@ def worker():
modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg = 1.0 modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg = 1.0
refiner_switch = 1.0 refiner_switch = 1.0
modules.patch.positive_adm_scale = adm_scaler_positive = 1.0 modules.patch.positive_adm_scale = adm_scaler_positive = 1.0
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative = 1.0 modules.patch.negative_adm_scale = adm_scaler_negative = 1.0
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end = 0.0 modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end = 0.0
steps = 8 steps = 8
@ -206,7 +207,7 @@ def worker():
print(f'[Parameters] Sharpness = {modules.patch.sharpness}') print(f'[Parameters] Sharpness = {modules.patch.sharpness}')
modules.patch.positive_adm_scale = adm_scaler_positive modules.patch.positive_adm_scale = adm_scaler_positive
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative modules.patch.negative_adm_scale = adm_scaler_negative
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end
print(f'[Parameters] ADM Scale = ' print(f'[Parameters] ADM Scale = '
f'{modules.patch.positive_adm_scale} : ' f'{modules.patch.positive_adm_scale} : '

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_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] freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2]
adps = [adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, adps = [adm_scaler_end, adaptive_cfg, sampler_name,
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height,
overwrite_vary_strength, overwrite_upscale_strength, overwrite_vary_strength, overwrite_upscale_strength,
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, 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 += [input_image_checkbox, current_tab]
ctrls += [uov_method, uov_input_image] ctrls += [uov_method, uov_input_image]
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image] ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
ctrls += [disable_preview, adm_scaler_positive] ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative]
ctrls += ip_ctrls ctrls += ip_ctrls
state_is_generating = gr.State(False) state_is_generating = gr.State(False)