From 758a9a540e1856e0bd780f4cc257e3cda26f28eb Mon Sep 17 00:00:00 2001 From: LiaMath Date: Mon, 15 Jun 2026 14:15:01 +0900 Subject: [PATCH] Fix silent feature mixing bug in IP-Adapter batch processing by removing redundant batch_size multiplication --- src/diffusers/pipelines/animatediff/pipeline_animatediff.py | 2 +- .../pipelines/animatediff/pipeline_animatediff_controlnet.py | 2 +- .../pipelines/animatediff/pipeline_animatediff_sdxl.py | 2 +- .../pipelines/animatediff/pipeline_animatediff_sparsectrl.py | 2 +- .../pipelines/animatediff/pipeline_animatediff_video2video.py | 2 +- .../pipeline_animatediff_video2video_controlnet.py | 2 +- src/diffusers/pipelines/chroma/pipeline_chroma.py | 4 ++-- src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py | 4 ++-- src/diffusers/pipelines/chroma/pipeline_chroma_inpainting.py | 4 ++-- src/diffusers/pipelines/controlnet/pipeline_controlnet.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_img2img.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_inpaint.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_sd_xl.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py | 2 +- .../controlnet/pipeline_controlnet_union_inpaint_sd_xl.py | 2 +- .../pipelines/controlnet/pipeline_controlnet_union_sd_xl.py | 2 +- .../controlnet/pipeline_controlnet_union_sd_xl_img2img.py | 2 +- .../controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py | 2 +- .../pipeline_stable_diffusion_3_controlnet_inpainting.py | 2 +- src/diffusers/pipelines/deprecated/pia/pipeline_pia.py | 2 +- .../stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py | 2 +- .../pipeline_stable_diffusion_panorama.py | 2 +- .../stable_diffusion_sag/pipeline_stable_diffusion_sag.py | 2 +- src/diffusers/pipelines/flux/pipeline_flux.py | 4 ++-- src/diffusers/pipelines/flux/pipeline_flux_controlnet.py | 4 ++-- src/diffusers/pipelines/flux/pipeline_flux_img2img.py | 4 ++-- src/diffusers/pipelines/flux/pipeline_flux_inpaint.py | 4 ++-- src/diffusers/pipelines/flux/pipeline_flux_kontext.py | 4 ++-- src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py | 4 ++-- src/diffusers/pipelines/kolors/pipeline_kolors.py | 2 +- src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py | 2 +- .../pipeline_latent_consistency_img2img.py | 2 +- .../pipeline_latent_consistency_text2img.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py | 2 +- .../pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py | 2 +- .../pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_kolors.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py | 2 +- src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py | 2 +- .../pipelines/stable_diffusion/pipeline_stable_diffusion.py | 2 +- .../stable_diffusion/pipeline_stable_diffusion_img2img.py | 2 +- .../stable_diffusion/pipeline_stable_diffusion_inpaint.py | 2 +- .../pipeline_stable_diffusion_instruct_pix2pix.py | 2 +- .../stable_diffusion_3/pipeline_stable_diffusion_3.py | 2 +- .../stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py | 2 +- .../stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py | 2 +- .../stable_diffusion_xl/pipeline_stable_diffusion_xl.py | 2 +- .../pipeline_stable_diffusion_xl_img2img.py | 2 +- .../pipeline_stable_diffusion_xl_inpaint.py | 2 +- .../t2i_adapter/pipeline_stable_diffusion_xl_adapter.py | 2 +- 57 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff.py index 83023a8c74d9..382ed4c1c4a5 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff.py @@ -769,7 +769,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py index be1d6d72a009..9cbcb32e51b0 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py @@ -946,7 +946,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py index 2d3752527a95..e1136611a012 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py @@ -1185,7 +1185,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py index 9c65999e3a17..0dd54fea99a4 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py @@ -901,7 +901,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py index 08c1190d9b6d..5575247bcb39 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py @@ -985,7 +985,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py index e383e9c631d0..82683f099794 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py @@ -1189,7 +1189,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/chroma/pipeline_chroma.py b/src/diffusers/pipelines/chroma/pipeline_chroma.py index bc782107022d..4edbe00f7a63 100644 --- a/src/diffusers/pipelines/chroma/pipeline_chroma.py +++ b/src/diffusers/pipelines/chroma/pipeline_chroma.py @@ -883,14 +883,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py b/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py index 6dad6a481c5a..296fbcd3b166 100644 --- a/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py +++ b/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py @@ -968,14 +968,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/chroma/pipeline_chroma_inpainting.py b/src/diffusers/pipelines/chroma/pipeline_chroma_inpainting.py index b8d41a948207..f537ef226c88 100644 --- a/src/diffusers/pipelines/chroma/pipeline_chroma_inpainting.py +++ b/src/diffusers/pipelines/chroma/pipeline_chroma_inpainting.py @@ -1082,14 +1082,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) attention_mask = self._prepare_attention_mask( diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet.py index fb3dc94d6b56..b5d4f100416e 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet.py @@ -1140,7 +1140,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py index f0cfabc66f25..83a4e9a6d5fb 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py @@ -1138,7 +1138,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py index d34278d0086b..bde755338407 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py @@ -1260,7 +1260,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py index f27fcd8aa26f..92a8a076120f 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py @@ -1507,7 +1507,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py index 89e8d2e54123..5bc5b9efa8b5 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py @@ -1300,7 +1300,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py index 8c39856ec7cb..724da1570a5e 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py @@ -1392,7 +1392,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py index 511611f036b4..2dcbac5613de 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py @@ -1499,7 +1499,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py index 87057c2392df..0b02429aff2d 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py @@ -1286,7 +1286,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py index 2fb87e57ea8a..6fbc6d66bb52 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py @@ -1409,7 +1409,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) 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 index 4530a424adb4..ac2f042327a6 100644 --- a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py +++ b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py @@ -1152,7 +1152,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) 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 index d2890d55811c..526623d805de 100644 --- 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 @@ -1311,7 +1311,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py index 93366d10eb9e..1f8c2e10978a 100644 --- a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py @@ -847,7 +847,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py index 70a16f5d522f..36cbc7d909bd 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py @@ -918,7 +918,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py index 481c9c93ddde..30b556fb3003 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py @@ -974,7 +974,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py index 678ef74f387c..104f1c70540b 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py @@ -697,7 +697,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/flux/pipeline_flux.py b/src/diffusers/pipelines/flux/pipeline_flux.py index e125924adf7f..492034f5ff13 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux.py +++ b/src/diffusers/pipelines/flux/pipeline_flux.py @@ -917,14 +917,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py b/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py index da81563e4a66..b1a2ef9c0d37 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py @@ -1064,14 +1064,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 7. Denoising loop diff --git a/src/diffusers/pipelines/flux/pipeline_flux_img2img.py b/src/diffusers/pipelines/flux/pipeline_flux_img2img.py index 51229a1c603e..7764846226c3 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_img2img.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_img2img.py @@ -1023,14 +1023,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py b/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py index 914274397944..3a69a9176afc 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py @@ -1121,14 +1121,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/flux/pipeline_flux_kontext.py b/src/diffusers/pipelines/flux/pipeline_flux_kontext.py index efddc6cea139..d66a078eaf33 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_kontext.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_kontext.py @@ -1059,14 +1059,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py b/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py index c85299eedcd3..14ae0117758a 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py @@ -1375,14 +1375,14 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) if negative_ip_adapter_image is not None or negative_ip_adapter_image_embeds is not None: negative_image_embeds = self.prepare_ip_adapter_image_embeds( negative_ip_adapter_image, negative_ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, ) # 6. Denoising loop diff --git a/src/diffusers/pipelines/kolors/pipeline_kolors.py b/src/diffusers/pipelines/kolors/pipeline_kolors.py index 1e11faf8b9b6..ba1187cc35c4 100644 --- a/src/diffusers/pipelines/kolors/pipeline_kolors.py +++ b/src/diffusers/pipelines/kolors/pipeline_kolors.py @@ -935,7 +935,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py b/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py index d9b519267216..04a1cc529a7c 100644 --- a/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py +++ b/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py @@ -1109,7 +1109,7 @@ def denoising_value_valid(dnv): ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py index 424a2c46e06b..6c5924511583 100644 --- a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py +++ b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py @@ -858,7 +858,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py index 60f59ec7f9d3..54d2a46c9dd0 100644 --- a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py +++ b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py @@ -790,7 +790,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py index 807c42d21bb4..abd17927a9f5 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py @@ -1168,7 +1168,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) for i, image_embeds in enumerate(ip_adapter_image_embeds): diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py index ebc2e882868c..0bab4a98a3fa 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py @@ -1222,7 +1222,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py index b0e2c03faed7..ad68f8ddb605 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py @@ -1285,7 +1285,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py index 8967e50251b9..552b8236f408 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py @@ -1380,7 +1380,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_kolors.py b/src/diffusers/pipelines/pag/pipeline_pag_kolors.py index 4f138d91d9c6..82d7420953ca 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_kolors.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_kolors.py @@ -973,7 +973,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd.py b/src/diffusers/pipelines/pag/pipeline_pag_sd.py index 26ea717556c5..ef8c5d1f3d73 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd.py @@ -933,7 +933,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py index c15865fdd11b..0ad9254ebcad 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py @@ -754,7 +754,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_videos_per_prompt, + num_videos_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py index 822483eca995..7c5ccfb2c315 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py @@ -962,7 +962,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py index a61b8ec14f08..72748bff0481 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py @@ -1246,7 +1246,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py index bd960a64f45e..95770306bb2d 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py @@ -1172,7 +1172,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py index 433b9edc69b7..9789fc7968bf 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py @@ -1360,7 +1360,7 @@ def denoising_value_valid(dnv): ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) for i, image_embeds in enumerate(ip_adapter_image_embeds): diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py index 7dadbc495a28..81edbeffd349 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py @@ -1574,7 +1574,7 @@ def denoising_value_valid(dnv): ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) for i, image_embeds in enumerate(ip_adapter_image_embeds): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py index 42d62f53a20a..3e35b494e3b1 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py @@ -982,7 +982,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py index abcd06a2bb3b..74dcaced20be 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py @@ -1040,7 +1040,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py index 8cc0c2bbea70..e2c443a40428 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py @@ -1131,7 +1131,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py index 7a24e6008351..4fa5bb9d27b1 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py @@ -360,7 +360,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) # 3. Preprocess image 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 index 5c05b469660f..299a18ad2d22 100644 --- a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py +++ b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py @@ -1048,7 +1048,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) 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 index c0ab805a4ef4..316300bf0a3d 100644 --- 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 @@ -1090,7 +1090,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) 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 index 321e9f8dd80e..9b9a9651ce89 100644 --- 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 @@ -1280,7 +1280,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py index d08b6c5a5973..32a213b17149 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py @@ -1159,7 +1159,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py index 19ccfab3de0a..695c5f8fa3b4 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py @@ -1342,7 +1342,7 @@ def denoising_value_valid(dnv): ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py index 7382d597102c..55260c6bbf91 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py @@ -1562,7 +1562,7 @@ def denoising_value_valid(dnv): ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, ) diff --git a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py index a6dd07847de2..9287f793c99d 100644 --- a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py +++ b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py @@ -1125,7 +1125,7 @@ def __call__( ip_adapter_image, ip_adapter_image_embeds, device, - batch_size * num_images_per_prompt, + num_images_per_prompt, self.do_classifier_free_guidance, )