Skip to content

Commit 5c75e82

Browse files
hlkysayakpaul
authored andcommitted
Fix ControlNetUnion _callback_tensor_inputs (#10218)
1 parent feea141 commit 5c75e82

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,8 @@ class StableDiffusionXLControlNetUnionInpaintPipeline(
205205
_callback_tensor_inputs = [
206206
"latents",
207207
"prompt_embeds",
208-
"negative_prompt_embeds",
209208
"add_text_embeds",
210209
"add_time_ids",
211-
"negative_pooled_prompt_embeds",
212-
"add_neg_time_ids",
213210
"mask",
214211
"masked_image_latents",
215212
]

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,8 @@ class StableDiffusionXLControlNetUnionPipeline(
221221
_callback_tensor_inputs = [
222222
"latents",
223223
"prompt_embeds",
224-
"negative_prompt_embeds",
225224
"add_text_embeds",
226225
"add_time_ids",
227-
"negative_pooled_prompt_embeds",
228-
"negative_add_time_ids",
229-
"image",
230226
]
231227

232228
def __init__(
@@ -1451,13 +1447,8 @@ def __call__(
14511447

14521448
latents = callback_outputs.pop("latents", latents)
14531449
prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds)
1454-
negative_prompt_embeds = callback_outputs.pop("negative_prompt_embeds", negative_prompt_embeds)
14551450
add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds)
1456-
negative_pooled_prompt_embeds = callback_outputs.pop(
1457-
"negative_pooled_prompt_embeds", negative_pooled_prompt_embeds
1458-
)
14591451
add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids)
1460-
negative_add_time_ids = callback_outputs.pop("negative_add_time_ids", negative_add_time_ids)
14611452

14621453
# call the callback, if provided
14631454
if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,8 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline(
244244
_callback_tensor_inputs = [
245245
"latents",
246246
"prompt_embeds",
247-
"negative_prompt_embeds",
248247
"add_text_embeds",
249248
"add_time_ids",
250-
"negative_pooled_prompt_embeds",
251-
"add_neg_time_ids",
252249
]
253250

254251
def __init__(
@@ -1566,13 +1563,8 @@ def __call__(
15661563

15671564
latents = callback_outputs.pop("latents", latents)
15681565
prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds)
1569-
negative_prompt_embeds = callback_outputs.pop("negative_prompt_embeds", negative_prompt_embeds)
15701566
add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds)
1571-
negative_pooled_prompt_embeds = callback_outputs.pop(
1572-
"negative_pooled_prompt_embeds", negative_pooled_prompt_embeds
1573-
)
15741567
add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids)
1575-
add_neg_time_ids = callback_outputs.pop("add_neg_time_ids", add_neg_time_ids)
15761568

15771569
# call the callback, if provided
15781570
if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):

0 commit comments

Comments
 (0)