Redo custom attention processor to support other attention types #6550
+347
−116
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
Current attention processor implements only
torch-sdp
attention type, so when any ip-adapter or regional prompt used, we override model to runtorch-sdp
attention.New attention processor combines 4 attention processors(
normal
,sliced
,xformers
,torch-sdp
) by moving parts of attention that differs(mask preparation and attention itself), to separate function call, where required implementation executed.Related Issues / Discussions
None
QA Instructions
Change
attention_type
ininvokeai.yaml
and then run generation with ip-adapter or regional prompt.Merge Plan
None?
Checklist
@dunkeroni @RyanJDick