Skip to content

Transformers fix #1526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Artheriax wants to merge 1 commit into from
Closed

Transformers fix #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/model/WuerstchenModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def encode_text(
return_dict=True,
)
if self.model_type.is_wuerstchen_v2():
final_layer_norm = self.prior_text_encoder.text_model.final_layer_norm
final_layer_norm = self.prior_text_encoder.final_layer_norm
pooled_text_encoder_output = None
text_encoder_output = final_layer_norm(
text_encoder_output.hidden_states[-(1 + text_encoder_layer_skip)]
Expand Down
2 changes: 1 addition & 1 deletion modules/model/util/clip_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def encode_clip(
text_encoder_output = text_encoder_output.hidden_states[default_layer - layer_skip] if add_output else None

if add_layer_norm and text_encoder_output is not None:
final_layer_norm = text_encoder.text_model.final_layer_norm
final_layer_norm = text_encoder.text_model.final_layer_norm if hasattr(text_encoder, 'text_model') else text_encoder.final_layer_norm
text_encoder_output = final_layer_norm(text_encoder_output)

return text_encoder_output, pooled_text_encoder_output
2 changes: 1 addition & 1 deletion modules/modelLoader/stableDiffusionXL/StableDiffusionXLModelLoader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def __load_ckpt(
)

text_encoder_1 = pipeline.text_encoder.to(dtype=weight_dtypes.text_encoder.torch_dtype())
text_encoder_1.text_model.embeddings.to(dtype=weight_dtypes.text_encoder.torch_dtype(False))
text_encoder_1.embeddings.to(dtype=weight_dtypes.text_encoder.torch_dtype(False))
text_encoder_2 = pipeline.text_encoder_2.to(dtype=weight_dtypes.text_encoder_2.torch_dtype())
text_encoder_2.text_model.embeddings.to(dtype=weight_dtypes.text_encoder_2.torch_dtype(False))
vae = pipeline.vae.to(dtype=weight_dtypes.vae.torch_dtype())
Expand Down
2 changes: 1 addition & 1 deletion modules/modelSampler/WuerstchenSampler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def __sample_decoder(
return_dict=True,
output_hidden_states=True,
)
final_layer_norm = decoder_text_encoder.text_model.final_layer_norm
final_layer_norm = decoder_text_encoder.final_layer_norm
prompt_embedding = final_layer_norm(
text_encoder_output.hidden_states[-(1 + text_encoder_layer_skip)]
)
Expand Down
2 changes: 1 addition & 1 deletion modules/modelSetup/BaseFluxSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def _setup_embedding_wrapper(
if model.tokenizer_1 is not None and model.text_encoder_1 is not None:
model.embedding_wrapper_1 = AdditionalEmbeddingWrapper(
tokenizer=model.tokenizer_1,
orig_module=model.text_encoder_1.text_model.embeddings.token_embedding,
orig_module=model.text_encoder_1.embeddings.token_embedding,
embeddings=model.all_text_encoder_1_embeddings(),
)
if model.tokenizer_2 is not None and model.text_encoder_2 is not None:
Expand Down
2 changes: 1 addition & 1 deletion modules/modelSetup/BaseHunyuanVideoSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def _setup_embedding_wrapper(
if model.tokenizer_2 is not None and model.text_encoder_2 is not None:
model.embedding_wrapper_2 = AdditionalEmbeddingWrapper(
tokenizer=model.tokenizer_2,
orig_module=model.text_encoder_2.text_model.embeddings.token_embedding,
orig_module=model.text_encoder_2.embeddings.token_embedding,
embeddings=model.all_text_encoder_2_embeddings(),
)

Expand Down
2 changes: 1 addition & 1 deletion modules/modelSetup/BaseStableDiffusionSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def _setup_embedding_wrapper(
):
model.embedding_wrapper = AdditionalEmbeddingWrapper(
tokenizer=model.tokenizer,
orig_module=model.text_encoder.text_model.embeddings.token_embedding,
orig_module=model.text_encoder.embeddings.token_embedding,
embeddings=model.all_text_encoder_embeddings(),
)
model.embedding_wrapper.hook_to_module()
Expand Down
2 changes: 1 addition & 1 deletion modules/modelSetup/BaseStableDiffusionXLSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _setup_embedding_wrapper(
):
model.embedding_wrapper_1 = AdditionalEmbeddingWrapper(
tokenizer=model.tokenizer_1,
orig_module=model.text_encoder_1.text_model.embeddings.token_embedding,
orig_module=model.text_encoder_1.embeddings.token_embedding,
embeddings=model.all_text_encoder_1_embeddings(),
)
model.embedding_wrapper_2 = AdditionalEmbeddingWrapper(
Expand Down
2 changes: 1 addition & 1 deletion modules/modelSetup/BaseWuerstchenSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def _setup_embedding_wrapper(
):
model.prior_embedding_wrapper = AdditionalEmbeddingWrapper(
tokenizer=model.prior_tokenizer,
orig_module=model.prior_text_encoder.text_model.embeddings.token_embedding,
orig_module=model.prior_text_encoder.embeddings.token_embedding,
embeddings=model.all_prior_text_encoder_embeddings(),
)
model.prior_embedding_wrapper.hook_to_module()
Expand Down