improve flux true cfg condition

sayakpaul · sayakpaul · commit fe5bb7c1bd9a · 2025-01-12T18:04:17.000+05:30
diff --git a/src/diffusers/pipelines/flux/pipeline_flux.py b/src/diffusers/pipelines/flux/pipeline_flux.py
@@ -790,7 +790,10 @@ def __call__(
         lora_scale = (
             self.joint_attention_kwargs.get("scale", None) if self.joint_attention_kwargs is not None else None
         )
-        do_true_cfg = true_cfg_scale > 1 and negative_prompt is not None
+        has_neg_prompt = negative_prompt is not None or (
+            negative_prompt_embeds is not None and negative_pooled_prompt_embeds is not None
+        )
+        do_true_cfg = true_cfg_scale > 1 and has_neg_prompt
         (
             prompt_embeds,
             pooled_prompt_embeds,

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,10 @@ def __call__(`
`790`	`790`	`lora_scale = (`
`791`	`791`	`self.joint_attention_kwargs.get("scale", None) if self.joint_attention_kwargs is not None else None`
`792`	`792`	`)`
`793`		`- do_true_cfg = true_cfg_scale > 1 and negative_prompt is not None`
	`793`	`+ has_neg_prompt = negative_prompt is not None or (`
	`794`	`+ negative_prompt_embeds is not None and negative_pooled_prompt_embeds is not None`
	`795`	`+ )`
	`796`	`+ do_true_cfg = true_cfg_scale > 1 and has_neg_prompt`
`794`	`797`	`(`
`795`	`798`	`prompt_embeds,`
`796`	`799`	`pooled_prompt_embeds,`