Fix SparseCtrl RGB conditioning under CFG (#9508)#10
Open
srlynch1 wants to merge 2 commits into
Open
Conversation
Documents the open bug where conditioning images are ignored when the prompt is unrelated; test inspired by community PR huggingface#12115. Co-authored-by: Cursor <cursoragent@cursor.com>
Align controlnet_cond batch size with classifier-free guidance and add guess_mode zero-padding for unconditional residuals, matching pipeline_controlnet. Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
controlnet_condandcontrolnet_cond_maskfor the unconditional/conditional batch (matching ControlNet pipeline behavior).guess_mode, zero-pad controlnet residuals so they apply only to the conditional batch, for parity withpipeline_controlnet.test_conditioning_image_affects_output_with_unrelated_promptand remove the prior@unittest.expectedFailureworkaround for AnimateDiff SparseCtrl RGB does not work as expected huggingface/diffusers#9508.Test plan
pytest tests/pipelines/animatediff/test_animatediff_sparsectrl.py::AnimateDiffSparseControlNetPipelineFastTests::test_conditioning_image_affects_output_with_unrelated_prompt -vpytest tests/pipelines/animatediff/test_animatediff_sparsectrl.py -vguidance_scale > 1) and confirm conditioning RGB frames affect output with an unrelated promptMade with Cursor