Skip to content

Commit 814f56d

Browse files
authored
🐛 fix ip-adapter controlnet img2img missing code (#6528)
* 🐛 fix ip-adapter controlnet img2img missing code * 📝 edit test * 📝 edit test * 📝 run make style and quality * 🎨 remove slow tests
1 parent 96d6e16 commit 814f56d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from ...image_processor import PipelineImageInput, VaeImageProcessor
2525
from ...loaders import FromSingleFileMixin, IPAdapterMixin, LoraLoaderMixin, TextualInversionLoaderMixin
26-
from ...models import AutoencoderKL, ControlNetModel, UNet2DConditionModel
26+
from ...models import AutoencoderKL, ControlNetModel, ImageProjection, UNet2DConditionModel
2727
from ...models.lora import adjust_lora_scale_text_encoder
2828
from ...schedulers import KarrasDiffusionSchedulers
2929
from ...utils import (
@@ -1087,7 +1087,10 @@ def __call__(
10871087
prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds])
10881088

10891089
if ip_adapter_image is not None:
1090-
image_embeds, negative_image_embeds = self.encode_image(ip_adapter_image, device, num_images_per_prompt)
1090+
output_hidden_state = False if isinstance(self.unet.encoder_hid_proj, ImageProjection) else True
1091+
image_embeds, negative_image_embeds = self.encode_image(
1092+
ip_adapter_image, device, num_images_per_prompt, output_hidden_state
1093+
)
10911094
if self.do_classifier_free_guidance:
10921095
image_embeds = torch.cat([negative_image_embeds, image_embeds])
10931096

0 commit comments

Comments
 (0)