Skip to content

Commit d9a3b69

Browse files
authored
[Utils] Improve " # Copied from ..." statements in the pipelines (huggingface#6917)
* copied from for t2i pipelines without ip adapter support. * two more pipelines with proper copied from comments. * revert to the original implementation
1 parent f7e5954 commit d9a3b69

6 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/diffusers/pipelines/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
136136
extra_step_kwargs["generator"] = generator
137137
return extra_step_kwargs
138138

139+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
139140
def check_inputs(
140141
self,
141142
prompt,

src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
445445
extra_step_kwargs["generator"] = generator
446446
return extra_step_kwargs
447447

448+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
448449
def check_inputs(
449450
self,
450451
prompt,
@@ -454,8 +455,6 @@ def check_inputs(
454455
negative_prompt=None,
455456
prompt_embeds=None,
456457
negative_prompt_embeds=None,
457-
ip_adapter_image=None,
458-
ip_adapter_image_embeds=None,
459458
callback_on_step_end_tensor_inputs=None,
460459
):
461460
if height % 8 != 0 or width % 8 != 0:
@@ -499,11 +498,6 @@ def check_inputs(
499498
f" {negative_prompt_embeds.shape}."
500499
)
501500

502-
if ip_adapter_image is not None and ip_adapter_image_embeds is not None:
503-
raise ValueError(
504-
"Provide either `ip_adapter_image` or `ip_adapter_image_embeds`. Cannot leave both `ip_adapter_image` and `ip_adapter_image_embeds` defined."
505-
)
506-
507501
# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.prepare_latents
508502
def prepare_latents(self, batch_size, num_channels_latents, height, width, dtype, device, generator, latents=None):
509503
shape = (batch_size, num_channels_latents, height // self.vae_scale_factor, width // self.vae_scale_factor)

src/diffusers/pipelines/stable_diffusion_safe/pipeline_stable_diffusion_safe.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
361361
extra_step_kwargs["generator"] = generator
362362
return extra_step_kwargs
363363

364+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
364365
def check_inputs(
365366
self,
366367
prompt,

src/diffusers/pipelines/stable_diffusion_sag/pipeline_stable_diffusion_sag.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
446446
extra_step_kwargs["generator"] = generator
447447
return extra_step_kwargs
448448

449+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
449450
def check_inputs(
450451
self,
451452
prompt,

src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
374374
extra_step_kwargs["generator"] = generator
375375
return extra_step_kwargs
376376

377+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
377378
def check_inputs(
378379
self,
379380
prompt,

src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ def backward_loop(
447447
callback(step_idx, t, latents)
448448
return latents.clone().detach()
449449

450+
# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
450451
def check_inputs(
451452
self,
452453
prompt,

0 commit comments

Comments
 (0)