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

WIP

Browse Source
This commit is contained in:
Hameer Abbasi
2023-08-06 18:52:01 +02:00
parent cdbb310fde
commit 0933b876d5
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/prompt_parser_diffusers.py
+27 -20
View File
@@ -38,7 +38,7 @@ def compel_encode_prompt(
shared.log.warning(
f"Compel encoding not yet supported for {type(pipeline).__name__}."
)
return (None,) * 4
return (None, None, None, None)
if shared.opts.data["prompt_attention"] != "Compel parser":
prompt = convert_to_compel(prompt)
negative_prompt = convert_to_compel(negative_prompt)
@@ -52,26 +52,33 @@ def compel_encode_prompt(
requires_pooled=False,
)
compel_te2 = Compel(
tokenizer=pipeline.tokenizer_2,
text_encoder=pipeline.text_encoder_2,
returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED,
requires_pooled=True,
)
if not is_refiner:
positive_te1 = compel_te1(prompt)
positive_te2, positive_pooled = compel_te2(prompt_2)
positive = torch.cat((positive_te1, positive_te2), dim=-1)
if shared.sd_model_type == "sdxl":
compel_te2 = Compel(
tokenizer=pipeline.tokenizer_2,
text_encoder=pipeline.text_encoder_2,
returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED,
requires_pooled=True,
)
if not is_refiner:
positive_te1 = compel_te1(prompt)
positive_te2, positive_pooled = compel_te2(prompt_2)
positive = torch.cat((positive_te1, positive_te2), dim=-1)
negative_te1 = compel_te1(negative_prompt)
negative_te2, negative_pooled = compel_te2(negative_prompt_2)
negative = torch.cat((negative_te1, negative_te2), dim=-1)
else:
positive, positive_pooled = compel_te2(prompt)
negative, negative_pooled = compel_te2(negative_prompt)
negative_te1 = compel_te1(negative_prompt)
negative_te2, negative_pooled = compel_te2(negative_prompt_2)
negative = torch.cat((negative_te1, negative_te2), dim=-1)
else:
positive, positive_pooled = compel_te2(prompt)
negative, negative_pooled = compel_te2(negative_prompt)
shared.log.debug(compel_te1.parse_prompt_string(prompt))
[prompt_embed, negative_embed] = compel_te2.pad_conditioning_tensors_to_same_length(
shared.log.debug(f"Parsed Compel string: {compel_te1.parse_prompt_string(prompt)}")
[prompt_embed, negative_embed] = compel_te2.pad_conditioning_tensors_to_same_length(
[positive, negative]
)
return prompt_embed, positive_pooled, negative_embed, negative_pooled
positive, negative = compel_te1(prompt), compel_te1(negative_prompt)
[prompt_embed, negative_embed] = compel_te1.pad_conditioning_tensors_to_same_length(
[positive, negative]
)
return prompt_embed, positive_pooled, negative_embed, negative_pooled
return prompt_embed, None, negative_embed, None