xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-08-23 15:24:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update sd1_clip.py

Browse Source
This commit is contained in:
Koratahiu 2025-09-01 21:48:16 +03:00 committed by GitHub
parent 3147145793
commit 0f7b153f41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
comfy/sd1_clip.py
View File

@ -1,5 +1,4 @@
import os import os
import logging
from transformers import CLIPTokenizer from transformers import CLIPTokenizer
import comfy.ops import comfy.ops
@ -306,7 +305,7 @@ class SDClipModel(torch.nn.Module, ClipTokenWeightEncoder):
else: else:
intermediate_output = self.layer_idx intermediate_output = self.layer_idx
outputs = self.transformer(None, attention_mask_model, embeds=embeds, num_tokens=num_tokens, intermediate_output=intermediate_output, final_layer_norm_intermediate=self.layer_norm_hidden_state, dtype=torch.float32, embeds_info=embeds_info) outputs = self.transformer(None, attention_mask_model, embeds=embeds, num_tokens=num_tokens, intermediate_output=intermediate_output, final_layer_norm_intermediate=self.layer_norm_hidden_state, dtype=torch.float32)
if self.layer == "last": if self.layer == "last":
z = outputs[0].float() z = outputs[0].float()
@ -500,8 +499,16 @@ def load_embed(embedding_name, embedding_directory, embedding_size, embed_key=No
embed_out = {"type": "embedding", "data": torch.cat(out_list, dim=0)} embed_out = {"type": "embedding", "data": torch.cat(out_list, dim=0)}
elif embed_key is not None: elif embed_key is not None:
mapped_key = embed_key_map.get(embed_key, embed_key) mapped_key = embed_key_map.get(embed_key, embed_key)
output_key = f"{mapped_key}_out" # output embeddings has _out tensors like "t5_out" output_key = f"{mapped_key}_out"
if output_key in embed:
# Check for different embedding key conventions.
# 1. SD1.5 'emp_params' convention
if "emp_params_out" in embed:
embed_out = {"type": "output_embedding", "data": embed["emp_params_out"]}
elif "emp_params" in embed:
embed_out = {"type": "embedding", "data": embed["emp_params"]}
# 2. Generic '<text_encoder>_out' convention (SDXL, SD3, FLUX, Chroma, etc.)
elif output_key in embed:
embed_out = {"type": "output_embedding", "data": embed[output_key]} embed_out = {"type": "output_embedding", "data": embed[output_key]}
elif mapped_key in embed: elif mapped_key in embed:
embed_out = {"type": "embedding", "data": embed[mapped_key]} embed_out = {"type": "embedding", "data": embed[mapped_key]}