Merge branch 'main_upstream'

This commit is contained in:
Manuel Schmid
2024-05-26 22:14:20 +02:00
6 changed files with 12 additions and 41 deletions
-6
View File
@@ -177,7 +177,6 @@ def worker():
adm_scaler_negative = args.pop()
adm_scaler_end = args.pop()
adaptive_cfg = args.pop()
clip_skip = args.pop()
sampler_name = args.pop()
scheduler_name = args.pop()
vae_name = args.pop()
@@ -306,7 +305,6 @@ def worker():
negative_prompt = translate2en(negative_prompt, 'negative prompt')
print(f'[Parameters] Adaptive CFG = {adaptive_cfg}')
print(f'[Parameters] CLIP Skip = {clip_skip}')
print(f'[Parameters] Sharpness = {sharpness}')
print(f'[Parameters] ControlNet Softness = {controlnet_softness}')
print(f'[Parameters] ADM Scale = '
@@ -480,8 +478,6 @@ def worker():
loras=loras, base_model_additional_loras=base_model_additional_loras,
use_synthetic_refiner=use_synthetic_refiner, vae_name=vae_name)
pipeline.set_clip_skip(clip_skip)
progressbar(async_task, 3, 'Processing prompts ...')
tasks = []
@@ -941,8 +937,6 @@ def worker():
d.append(
('CFG Mimicking from TSNR', 'adaptive_cfg', modules.patch.patch_settings[pid].adaptive_cfg))
if clip_skip > 1:
d.append(('CLIP Skip', 'clip_skip', clip_skip))
d.append(('Sampler', 'sampler', sampler_name))
d.append(('Scheduler', 'scheduler', scheduler_name))
d.append(('VAE', 'vae', vae_name))