Skip to content

[bug fix] Inpainting for MultiAdapter #5922

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 3 commits into from
Nov 29, 2023
Merged

[bug fix] Inpainting for MultiAdapter #5922

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d35dede
bug in MultiAdapter for Inpainting
Nov 24, 2023
ca131b2
adapter_input is a list for MultiAdapter
affromero Nov 24, 2023
6c4de75
Merge branch 'main' into controlnet_and_t2iadapter_pipeline
sayakpaul Nov 27, 2023
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
22 changes: 17 additions & 5 deletions examples/community/pipeline_stable_diffusion_xl_controlnet_adapter_inpaint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,15 @@ def __call__(
height, width = self._default_height_width(height, width, adapter_image)
device = self._execution_device

adapter_input = _preprocess_adapter_image(adapter_image, height, width).to(device)
if isinstance(adapter, MultiAdapter):
adapter_input = []
for one_image in adapter_image:
one_image = _preprocess_adapter_image(one_image, height, width)
one_image = one_image.to(device=device, dtype=adapter.dtype)
adapter_input.append(one_image)
else:
adapter_input = _preprocess_adapter_image(adapter_image, height, width)
adapter_input = adapter_input.to(device=device, dtype=adapter.dtype)

original_size = original_size or (height, width)
target_size = target_size or (height, width)
Expand Down Expand Up @@ -1643,10 +1651,14 @@ def denoising_value_valid(dnv):
extra_step_kwargs = self.prepare_extra_step_kwargs(generator, eta)

# 10. Prepare added time ids & embeddings & adapter features
adapter_input = adapter_input.type(latents.dtype)
adapter_state = adapter(adapter_input)
for k, v in enumerate(adapter_state):
adapter_state[k] = v * adapter_conditioning_scale
if isinstance(adapter, MultiAdapter):
adapter_state = adapter(adapter_input, adapter_conditioning_scale)
for k, v in enumerate(adapter_state):
adapter_state[k] = v
else:
adapter_state = adapter(adapter_input)
for k, v in enumerate(adapter_state):
adapter_state[k] = v * adapter_conditioning_scale
if num_images_per_prompt > 1:
for k, v in enumerate(adapter_state):
adapter_state[k] = v.repeat(num_images_per_prompt, 1, 1, 1)
Expand Down