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.
What does this PR do?
In the original code this is not a typical ControlNet, it is integrated into the
transformerand relies on operations performed in thetransformer's forward. In this PR we implement it as a typical ControlNet by duplicating the necessary operations from thetransformer's forward into the ControlNet's forward and passtransformertoZImageControlNetModel'sforwardto access the necessarytransformermodules, as a result this is perhaps a little slower than the original implementation, but it keeps things clean and in style.ZImageTransformer2DModelhas minimal changes,controlnet_block_samplesis introduced, this is aDict[int, torch.Tensor]returned fromZImageControlNetModelwhere theintis theZImageTransformer2DModellayersindex, this is another difference from typical ControlNet where every block has the ControlNet output applied.ZImageControlNetPipelinehas minimal changes, compared toZImagePipelineit addsprepare_imagefunction, addscontrol_imageandcontrolnet_conditioning_scaleparameters, prepares and encodescontrol_imageand callscontrolnetto obtaincontrolnet_block_sampleswhich are passed totransformer.control_guidance_start/control_guidance_endis not yet implemented.Test code
Output
Fixes #12769
Who can review?
Anyone in the community is free to review the PR once the tests have passed. Feel free to tag
members/contributors who may be interested in your PR.