diff --git a/modules/model/WuerstchenModel.py b/modules/model/WuerstchenModel.py index c12491245..139416c39 100644 --- a/modules/model/WuerstchenModel.py +++ b/modules/model/WuerstchenModel.py @@ -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)] diff --git a/modules/model/util/clip_util.py b/modules/model/util/clip_util.py index edb825b54..2899da6f5 100644 --- a/modules/model/util/clip_util.py +++ b/modules/model/util/clip_util.py @@ -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 diff --git a/modules/modelLoader/stableDiffusionXL/StableDiffusionXLModelLoader.py b/modules/modelLoader/stableDiffusionXL/StableDiffusionXLModelLoader.py index afbab6581..5a9751525 100644 --- a/modules/modelLoader/stableDiffusionXL/StableDiffusionXLModelLoader.py +++ b/modules/modelLoader/stableDiffusionXL/StableDiffusionXLModelLoader.py @@ -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()) diff --git a/modules/modelSampler/WuerstchenSampler.py b/modules/modelSampler/WuerstchenSampler.py index d679757c2..e5bdfa7b2 100644 --- a/modules/modelSampler/WuerstchenSampler.py +++ b/modules/modelSampler/WuerstchenSampler.py @@ -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)] ) diff --git a/modules/modelSetup/BaseFluxSetup.py b/modules/modelSetup/BaseFluxSetup.py index c8222096e..d541e7a29 100644 --- a/modules/modelSetup/BaseFluxSetup.py +++ b/modules/modelSetup/BaseFluxSetup.py @@ -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: diff --git a/modules/modelSetup/BaseHunyuanVideoSetup.py b/modules/modelSetup/BaseHunyuanVideoSetup.py index d234116d6..d1ff79373 100644 --- a/modules/modelSetup/BaseHunyuanVideoSetup.py +++ b/modules/modelSetup/BaseHunyuanVideoSetup.py @@ -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(), ) diff --git a/modules/modelSetup/BaseStableDiffusionSetup.py b/modules/modelSetup/BaseStableDiffusionSetup.py index 933a02cd1..ebacd3897 100644 --- a/modules/modelSetup/BaseStableDiffusionSetup.py +++ b/modules/modelSetup/BaseStableDiffusionSetup.py @@ -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() diff --git a/modules/modelSetup/BaseStableDiffusionXLSetup.py b/modules/modelSetup/BaseStableDiffusionXLSetup.py index 28b7c2e61..a8aee1af7 100644 --- a/modules/modelSetup/BaseStableDiffusionXLSetup.py +++ b/modules/modelSetup/BaseStableDiffusionXLSetup.py @@ -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( diff --git a/modules/modelSetup/BaseWuerstchenSetup.py b/modules/modelSetup/BaseWuerstchenSetup.py index 93b84cb28..70da555bd 100644 --- a/modules/modelSetup/BaseWuerstchenSetup.py +++ b/modules/modelSetup/BaseWuerstchenSetup.py @@ -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()