Skip to content

Fix ControlNet img2img and inpaint control image validation#14069

Open
C1-BA-B1-F3 wants to merge 1 commit into
huggingface:mainfrom
C1-BA-B1-F3:fix-controlnet-img2img-inpaint-control-image
Open

Fix ControlNet img2img and inpaint control image validation#14069
C1-BA-B1-F3 wants to merge 1 commit into
huggingface:mainfrom
C1-BA-B1-F3:fix-controlnet-img2img-inpaint-control-image

Conversation

@C1-BA-B1-F3

Copy link
Copy Markdown

Fixes #14057.

  • Pass the initial image and ControlNet conditioning image separately into SD1.5 ControlNet img2img/inpaint input checks.
  • Validate control_image for single and multi-ControlNet paths instead of reusing the img2img/inpaint image variable.
  • Add regression coverage for multi-ControlNet img2img and inpaint checks, including inpaint padding-mask validation.

Tests:

  • PYTHONPATH=src python -m pytest tests/pipelines/controlnet/test_controlnet_img2img.py::StableDiffusionMultiControlNetPipelineFastTests::test_multi_controlnet_check_inputs_validates_control_image tests/pipelines/controlnet/test_controlnet_inpaint.py::MultiControlNetInpaintPipelineFastTests::test_multi_controlnet_check_inputs_validates_control_image -q
  • PYTHONPATH=src python -m pytest tests/pipelines/controlnet/test_controlnet_img2img.py::StableDiffusionMultiControlNetPipelineFastTests tests/pipelines/controlnet/test_controlnet_inpaint.py::MultiControlNetInpaintPipelineFastTests -q

@iwr-redmond

Copy link
Copy Markdown

cc @yiyixuxu @asomoza

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

SD1.5 - pipeline_controlnet_img2img and pipeline_controlnet_inpaint are mixing variables "image" and "control_image"

2 participants