Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/diffusers/pipelines/animatediff/pipeline_animatediff.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
6 changes: 5 additions & 1 deletion src/diffusers/pipelines/controlnet/pipeline_controlnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
12 changes: 10 additions & 2 deletions src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down Expand Up @@ -315,7 +319,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
negative_prompt_embeds = self.text_encoder.text_model.final_layer_norm(negative_prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
negative_prompt_embeds = text_model.final_layer_norm(negative_prompt_embeds)

if self.do_classifier_free_guidance:
# duplicate unconditional embeddings for each generation per prompt, using mps friendly method
Expand Down
6 changes: 5 additions & 1 deletion src/diffusers/pipelines/deprecated/pia/pipeline_pia.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,11 @@ def encode_prompt(
# representations. The `last_hidden_states` that we typically use for
# obtaining the final prompt representations passes through the LayerNorm
# layer.
prompt_embeds = self.text_encoder.text_model.final_layer_norm(prompt_embeds)
# CLIPTextModel was flattened in transformers>=5.6 (no longer wrapped in .text_model).
text_model = (
self.text_encoder.text_model if hasattr(self.text_encoder, "text_model") else self.text_encoder
)
prompt_embeds = text_model.final_layer_norm(prompt_embeds)

if self.text_encoder is not None:
prompt_embeds_dtype = self.text_encoder.dtype
Expand Down
Loading
Loading