Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-06 04:50:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

- all guidance values set to -1 to enable using model defaults

Browse Source 
- log default values used if not overriden by user
- rename inconsistent guidance variables:

p.cfg_scale
p.image_cfg_scale -> p.cfg_image
p.diffusers_guidance_rescale -> p.cfg_rescale
p.pag_scale -> p.cfg_true
p.pag_adaptive -> p.cfg_adaptive

Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2026-05-16 11:06:23 +02:00
parent 632032308d
commit f67562b912
30 changed files with 199 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/processing_diffusers.py
+9 -7
View File
@@ -156,9 +156,9 @@ def process_base(p: processing.StableDiffusionProcessing):
negative_prompts_2=[p.refiner_negative] if len(p.refiner_negative) > 0 else p.negative_prompts,
num_inference_steps=calculate_base_steps(p, use_refiner_start=use_refiner_start, use_denoise_start=use_denoise_start),
eta=sched_eta,
guidance_scale=p.cfg_scale,
guidance_rescale=p.diffusers_guidance_rescale,
true_cfg_scale=p.pag_scale,
guidance_scale=p.cfg_scale if p.cfg_scale is not None and p.cfg_scale > -1 else None,
guidance_rescale=p.cfg_rescale if p.cfg_rescale is not None and p.cfg_rescale > -1 else None,
true_cfg_scale=p.cfg_true if p.cfg_true is not None and p.cfg_true > -1 else None,
denoising_start=0 if use_refiner_start else p.refiner_start if use_denoise_start else None,
denoising_end=p.refiner_start if use_refiner_start else 1 if use_denoise_start else None,
num_frames=getattr(p, 'frames', 1),
@@ -323,8 +323,9 @@ def process_hires(p: processing.StableDiffusionProcessing, output):
negative_prompts_2=len(output.images) * [p.refiner_negative] if len(p.refiner_negative) > 0 else p.negative_prompts,
num_inference_steps=calculate_hires_steps(p),
eta=sched_eta,
guidance_scale=p.image_cfg_scale if p.image_cfg_scale is not None else p.cfg_scale,
guidance_rescale=p.diffusers_guidance_rescale,
guidance_scale=p.cfg_image if p.cfg_image is not None and p.cfg_image > -1 else p.cfg_scale,
guidance_rescale=p.cfg_rescale if p.cfg_rescale is not None and p.cfg_rescale > -1 else None,
true_cfg_scale=p.cfg_true if p.cfg_true is not None and p.cfg_true > -1 else None,
output_type=output_type,
clip_skip=p.clip_skip,
image=output.images,
@@ -411,8 +412,9 @@ def process_refine(p: processing.StableDiffusionProcessing, output):
num_inference_steps=calculate_refiner_steps(p),
eta=sched_eta,
noise_level=noise_level, # StableDiffusionUpscalePipeline only
guidance_scale=p.image_cfg_scale if p.image_cfg_scale is not None else p.cfg_scale,
guidance_rescale=p.diffusers_guidance_rescale,
guidance_scale=p.cfg_image if p.cfg_image is not None and p.cfg_image > -1 else p.cfg_scale,
guidance_rescale=p.cfg_rescale if p.cfg_rescale is not None and p.cfg_rescale > -1 else None,
true_cfg_scale=p.cfg_true if p.cfg_true is not None and p.cfg_true > -1 else None,
denoising_start=p.refiner_start if p.refiner_start > 0 and p.refiner_start < 1 else None,
denoising_end=1 if p.refiner_start > 0 and p.refiner_start < 1 else None,
image=image,