Skip to content

[Utils] Improve " # Copied from ..." statements in the pipelines #6917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 8, 2024
Merged

[Utils] Improve " # Copied from ..." statements in the pipelines #6917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9f22b4f
copied from for t2i pipelines without ip adapter support.
sayakpaul Feb 8, 2024
3e956d6
Merge branch 'main' into harmonize-check-inputs
sayakpaul Feb 9, 2024
0d20d05
two more pipelines with proper copied from comments.
sayakpaul Feb 9, 2024
2f40f31
Merge branch 'main' into harmonize-check-inputs
sayakpaul Feb 9, 2024
0399999
revert to the original implementation
sayakpaul Feb 9, 2024
2efcd9d
Merge branch 'main' into harmonize-check-inputs
sayakpaul Feb 9, 2024
1b5418b
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 6, 2024
d75cbc6
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 7, 2024
0943671
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 7, 2024
09457f0
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 8, 2024
e9d6a9f
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 8, 2024
2dc2b34
Merge branch 'main' into harmonize-check-inputs
sayakpaul Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/diffusers/pipelines/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
extra_step_kwargs["generator"] = generator
return extra_step_kwargs

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
def check_inputs(
self,
prompt,
Expand Down
8 changes: 1 addition & 7 deletions ...iffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
extra_step_kwargs["generator"] = generator
return extra_step_kwargs

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
Copy link
Collaborator

@yiyixuxu yiyixuxu Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh nice:)

def check_inputs(
self,
prompt,
Expand All @@ -454,8 +455,6 @@ def check_inputs(
negative_prompt=None,
prompt_embeds=None,
negative_prompt_embeds=None,
ip_adapter_image=None,
ip_adapter_image_embeds=None,
callback_on_step_end_tensor_inputs=None,
):
if height % 8 != 0 or width % 8 != 0:
Expand Down Expand Up @@ -499,11 +498,6 @@ def check_inputs(
f" {negative_prompt_embeds.shape}."
)

if ip_adapter_image is not None and ip_adapter_image_embeds is not None:
raise ValueError(
"Provide either `ip_adapter_image` or `ip_adapter_image_embeds`. Cannot leave both `ip_adapter_image` and `ip_adapter_image_embeds` defined."
)

# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.prepare_latents
def prepare_latents(self, batch_size, num_channels_latents, height, width, dtype, device, generator, latents=None):
shape = (batch_size, num_channels_latents, height // self.vae_scale_factor, width // self.vae_scale_factor)
Expand Down
1 change: 1 addition & 0 deletions src/diffusers/pipelines/stable_diffusion_safe/pipeline_stable_diffusion_safe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
extra_step_kwargs["generator"] = generator
return extra_step_kwargs

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
def check_inputs(
self,
prompt,
Expand Down
1 change: 1 addition & 0 deletions src/diffusers/pipelines/stable_diffusion_sag/pipeline_stable_diffusion_sag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
extra_step_kwargs["generator"] = generator
return extra_step_kwargs

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
def check_inputs(
self,
prompt,
Expand Down
1 change: 1 addition & 0 deletions src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ def prepare_extra_step_kwargs(self, generator, eta):
extra_step_kwargs["generator"] = generator
return extra_step_kwargs

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
def check_inputs(
self,
prompt,
Expand Down
1 change: 1 addition & 0 deletions src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ def backward_loop(
callback(step_idx, t, latents)
return latents.clone().detach()

# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs
def check_inputs(
self,
prompt,
Expand Down