Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-17 16:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move embedder object, cleanup stepwise lora

Browse Source
This commit is contained in:
AI-Casanova
2024-10-30 23:24:50 -05:00
parent 38303f0c61
commit 3932d5fd1b
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/processing_args.py
+18 -18
View File
@@ -117,7 +117,7 @@ def set_pipeline_args(p, model, prompts: list, negative_prompts: list, prompts_2
'Flux' in model.__class__.__name__
):
try:
p.embedder = prompt_parser_diffusers.PromptEmbedder(prompts, negative_prompts, clip_skip, p)
prompt_parser_diffusers.embedder = prompt_parser_diffusers.PromptEmbedder(prompts, negative_prompts, steps, clip_skip, p)
parser = shared.opts.prompt_attention
except Exception as e:
shared.log.error(f'Prompt parser encode: {e}')
@@ -128,27 +128,27 @@ def set_pipeline_args(p, model, prompts: list, negative_prompts: list, prompts_2
if 'prompt' in possible:
if 'OmniGen' in model.__class__.__name__:
prompts = [p.replace('|image|', '<|image_1|>') for p in prompts]
if hasattr(model, 'text_encoder') and 'prompt_embeds' in possible and p.embedder is not None:
args['prompt_embeds'] = p.embedder('prompt_embeds')
if hasattr(model, 'text_encoder') and 'prompt_embeds' in possible and prompt_parser_diffusers.embedder is not None:
args['prompt_embeds'] = prompt_parser_diffusers.embedder('prompt_embeds')
if 'StableCascade' in model.__class__.__name__ and len(getattr(p, 'negative_pooleds', [])) > 0:
args['prompt_embeds_pooled'] = p.embedder('positive_pooleds').unsqueeze(0)
elif 'XL' in model.__class__.__name__ and p.embedder is not None:
args['pooled_prompt_embeds'] = p.embedder('positive_pooleds')
elif 'StableDiffusion3' in model.__class__.__name__ and p.embedder is not None:
args['pooled_prompt_embeds'] = p.embedder('positive_pooleds')
elif 'Flux' in model.__class__.__name__ and p.embedder is not None:
args['pooled_prompt_embeds'] = p.embedder('positive_pooleds')
args['prompt_embeds_pooled'] = prompt_parser_diffusers.embedder('positive_pooleds').unsqueeze(0)
elif 'XL' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['pooled_prompt_embeds'] = prompt_parser_diffusers.embedder('positive_pooleds')
elif 'StableDiffusion3' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['pooled_prompt_embeds'] = prompt_parser_diffusers.embedder('positive_pooleds')
elif 'Flux' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['pooled_prompt_embeds'] = prompt_parser_diffusers.embedder('positive_pooleds')
else:
args['prompt'] = prompts
if 'negative_prompt' in possible:
if hasattr(model, 'text_encoder') and 'negative_prompt_embeds' in possible and p.embedder is not None:
args['negative_prompt_embeds'] = p.embedder('negative_prompt_embeds')
if 'StableCascade' in model.__class__.__name__ and p.embedder is not None:
args['negative_prompt_embeds_pooled'] = p.embedder('negative_pooleds').unsqueeze(0)
if 'XL' in model.__class__.__name__ and p.embedder is not None:
args['negative_pooled_prompt_embeds'] = p.embedder('negative_pooleds')
if 'StableDiffusion3' in model.__class__.__name__ and p.embedder is not None:
args['negative_pooled_prompt_embeds'] = p.embedder('negative_pooleds')
if hasattr(model, 'text_encoder') and 'negative_prompt_embeds' in possible and prompt_parser_diffusers.embedder is not None:
args['negative_prompt_embeds'] = prompt_parser_diffusers.embedder('negative_prompt_embeds')
if 'StableCascade' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['negative_prompt_embeds_pooled'] = prompt_parser_diffusers.embedder('negative_pooleds').unsqueeze(0)
if 'XL' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['negative_pooled_prompt_embeds'] = prompt_parser_diffusers.embedder('negative_pooleds')
if 'StableDiffusion3' in model.__class__.__name__ and prompt_parser_diffusers.embedder is not None:
args['negative_pooled_prompt_embeds'] = prompt_parser_diffusers.embedder('negative_pooleds')
else:
if 'PixArtSigmaPipeline' in model.__class__.__name__: # pixart-sigma pipeline throws list-of-list for negative prompt
args['negative_prompt'] = negative_prompts[0]