Skip to content

GitLab

Unverified Commit 87e81574 authored by hlky's avatar hlky Committed by GitHub
Browse files

Fix ControlNetUnion _callback_tensor_inputs (#10218)

parent 3f421fe0
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 20 deletions
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py
View file @ 87e81574
...@@ -205,11 +205,8 @@ class StableDiffusionXLControlNetUnionInpaintPipeline( ...@@ -205,11 +205,8 @@ class StableDiffusionXLControlNetUnionInpaintPipeline(
_callback_tensor_inputs = [ _callback_tensor_inputs = [
"latents", "latents",
"prompt_embeds", "prompt_embeds",
"negative_prompt_embeds",
"add_text_embeds", "add_text_embeds",
"add_time_ids", "add_time_ids",
"negative_pooled_prompt_embeds",
"add_neg_time_ids",
"mask", "mask",
"masked_image_latents", "masked_image_latents",
] ]
......
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py
View file @ 87e81574
...@@ -221,12 +221,8 @@ class StableDiffusionXLControlNetUnionPipeline( ...@@ -221,12 +221,8 @@ class StableDiffusionXLControlNetUnionPipeline(
_callback_tensor_inputs = [ _callback_tensor_inputs = [
"latents", "latents",
"prompt_embeds", "prompt_embeds",
"negative_prompt_embeds",
"add_text_embeds", "add_text_embeds",
"add_time_ids", "add_time_ids",
"negative_pooled_prompt_embeds",
"negative_add_time_ids",
"image",
] ]
def __init__( def __init__(
...@@ -1451,13 +1447,8 @@ class StableDiffusionXLControlNetUnionPipeline( ...@@ -1451,13 +1447,8 @@ class StableDiffusionXLControlNetUnionPipeline(
latents = callback_outputs.pop("latents", latents) latents = callback_outputs.pop("latents", latents)
prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds) prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds)
negative_prompt_embeds = callback_outputs.pop("negative_prompt_embeds", negative_prompt_embeds)
add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds) add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds)
negative_pooled_prompt_embeds = callback_outputs.pop(
"negative_pooled_prompt_embeds", negative_pooled_prompt_embeds
)
add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids) add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids)
negative_add_time_ids = callback_outputs.pop("negative_add_time_ids", negative_add_time_ids)
# call the callback, if provided # call the callback, if provided
if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0): 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
View file @ 87e81574
...@@ -244,11 +244,8 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline( ...@@ -244,11 +244,8 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline(
_callback_tensor_inputs = [ _callback_tensor_inputs = [
"latents", "latents",
"prompt_embeds", "prompt_embeds",
"negative_prompt_embeds",
"add_text_embeds", "add_text_embeds",
"add_time_ids", "add_time_ids",
"negative_pooled_prompt_embeds",
"add_neg_time_ids",
] ]
def __init__( def __init__(
...@@ -1566,13 +1563,8 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline( ...@@ -1566,13 +1563,8 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline(
latents = callback_outputs.pop("latents", latents) latents = callback_outputs.pop("latents", latents)
prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds) prompt_embeds = callback_outputs.pop("prompt_embeds", prompt_embeds)
negative_prompt_embeds = callback_outputs.pop("negative_prompt_embeds", negative_prompt_embeds)
add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds) add_text_embeds = callback_outputs.pop("add_text_embeds", add_text_embeds)
negative_pooled_prompt_embeds = callback_outputs.pop(
"negative_pooled_prompt_embeds", negative_pooled_prompt_embeds
)
add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids) add_time_ids = callback_outputs.pop("add_time_ids", add_time_ids)
add_neg_time_ids = callback_outputs.pop("add_neg_time_ids", add_neg_time_ids)
# call the callback, if provided # call the callback, if provided
if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0): if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment