Merge branch 'main' into remove-explicit-typing

sayakpaul · web-flow · commit 6f2ded53a15d · 2025-10-28T07:21:12.000+05:30
diff --git a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py
@@ -267,7 +267,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py
@@ -285,7 +285,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py
@@ -237,7 +237,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py
@@ -253,7 +253,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py
@@ -248,7 +248,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py
@@ -272,7 +272,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,
diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py
@@ -278,7 +278,7 @@ def _get_t5_prompt_embeds(
             return torch.zeros(
                 (
                     batch_size * num_images_per_prompt,
-                    self.tokenizer_max_length,
+                    max_sequence_length,
                     self.transformer.config.joint_attention_dim,
                 ),
                 device=device,

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ def _get_t5_prompt_embeds(`
`267`	`267`	`return torch.zeros(`
`268`	`268`	`(`
`269`	`269`	`batch_size * num_images_per_prompt,`
`270`		`- self.tokenizer_max_length,`
	`270`	`+ max_sequence_length,`
`271`	`271`	`self.transformer.config.joint_attention_dim,`
`272`	`272`	`),`
`273`	`273`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ def _get_t5_prompt_embeds(`
`285`	`285`	`return torch.zeros(`
`286`	`286`	`(`
`287`	`287`	`batch_size * num_images_per_prompt,`
`288`		`- self.tokenizer_max_length,`
	`288`	`+ max_sequence_length,`
`289`	`289`	`self.transformer.config.joint_attention_dim,`
`290`	`290`	`),`
`291`	`291`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ def _get_t5_prompt_embeds(`
`237`	`237`	`return torch.zeros(`
`238`	`238`	`(`
`239`	`239`	`batch_size * num_images_per_prompt,`
`240`		`- self.tokenizer_max_length,`
	`240`	`+ max_sequence_length,`
`241`	`241`	`self.transformer.config.joint_attention_dim,`
`242`	`242`	`),`
`243`	`243`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ def _get_t5_prompt_embeds(`
`253`	`253`	`return torch.zeros(`
`254`	`254`	`(`
`255`	`255`	`batch_size * num_images_per_prompt,`
`256`		`- self.tokenizer_max_length,`
	`256`	`+ max_sequence_length,`
`257`	`257`	`self.transformer.config.joint_attention_dim,`
`258`	`258`	`),`
`259`	`259`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ def _get_t5_prompt_embeds(`
`248`	`248`	`return torch.zeros(`
`249`	`249`	`(`
`250`	`250`	`batch_size * num_images_per_prompt,`
`251`		`- self.tokenizer_max_length,`
	`251`	`+ max_sequence_length,`
`252`	`252`	`self.transformer.config.joint_attention_dim,`
`253`	`253`	`),`
`254`	`254`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ def _get_t5_prompt_embeds(`
`272`	`272`	`return torch.zeros(`
`273`	`273`	`(`
`274`	`274`	`batch_size * num_images_per_prompt,`
`275`		`- self.tokenizer_max_length,`
	`275`	`+ max_sequence_length,`
`276`	`276`	`self.transformer.config.joint_attention_dim,`
`277`	`277`	`),`
`278`	`278`	`device=device,`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ def _get_t5_prompt_embeds(`
`278`	`278`	`return torch.zeros(`
`279`	`279`	`(`
`280`	`280`	`batch_size * num_images_per_prompt,`
`281`		`- self.tokenizer_max_length,`
	`281`	`+ max_sequence_length,`
`282`	`282`	`self.transformer.config.joint_attention_dim,`
`283`	`283`	`),`
`284`	`284`	`device=device,`