Update pipeline.py

pipeline.py

@@ -266,17 +266,17 @@ class FluxWithCFGPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
                     " the batch size of `prompt`."
                 )
 
-            negative_clip_prompt_embed, negative_pooled_prompt_embed = self._get_clip_prompt_embeds(
+            negative_clip_prompt_embed = self._get_clip_prompt_embeds(
                 prompt=negative_prompt,
                 device=device,
                 num_images_per_prompt=num_images_per_prompt,
             )
             
-            t5_negative_prompt_embed, negative_pooled_prompt_2_embed = self._get_t5_prompt_embeds(
+            t5_negative_prompt_embed = self._get_t5_prompt_embeds(
                 prompt=negative_prompt_2,
+                device=device,
                 num_images_per_prompt=num_images_per_prompt,
                 max_sequence_length=max_sequence_length,
-                device=device,
             )
 
             negative_clip_prompt_embed = torch.nn.functional.pad(
@@ -286,7 +286,7 @@ class FluxWithCFGPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
 
             negative_prompt_embeds = torch.cat([negative_clip_prompt_embed, t5_negative_prompt_embed], dim=-2)
             negative_pooled_prompt_embeds = torch.cat(
-                [negative_pooled_prompt_embed, negative_pooled_prompt_2_embed], dim=-1
+                [negative_clip_prompt_embed, t5_negative_prompt_embed], dim=-1
             )
 
         if self.text_encoder is not None:
@@ -305,6 +305,9 @@ class FluxWithCFGPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
         pooled_prompt_embeds = pooled_prompt_embeds.repeat(1, num_images_per_prompt, 1)
         pooled_prompt_embeds = pooled_prompt_embeds.view(batch_size * num_images_per_prompt, -1)
 
+        negative_pooled_prompt_embeds = negative_pooled_prompt_embeds.repeat(1, num_images_per_prompt, 1)
+        negative_pooled_prompt_embeds = negative_pooled_prompt_embeds.view(batch_size * num_images_per_prompt, -1)
+
         return prompt_embeds, pooled_prompt_embeds, text_ids, negative_prompt_embeds, negative_pooled_prompt_embeds
 
     def check_inputs(
@@ -347,16 +350,6 @@ class FluxWithCFGPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
             raise ValueError(
                 "If `prompt_embeds` are provided, `pooled_prompt_embeds` also have to be passed. Make sure to generate `pooled_prompt_embeds` from the same text encoder that was used to generate `prompt_embeds`."
             )
-        if negative_prompt is not None and negative_prompt_embeds is not None:
-            raise ValueError(
-                f"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:"
-                f" {negative_prompt_embeds}. Please make sure to only forward one of the two."
-            )
-        elif negative_prompt_2 is not None and negative_prompt_embeds is not None:
-            raise ValueError(
-                f"Cannot forward both `negative_prompt_2`: {negative_prompt_2} and `negative_prompt_embeds`:"
-                f" {negative_prompt_embeds}. Please make sure to only forward one of the two."
-            )
         if negative_prompt_embeds is not None and negative_pooled_prompt_embeds is None:
             raise ValueError("Must provide `negative_prompt_attention_mask` when specifying `negative_prompt_embeds`.")