Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix] Renames in 0.15.0 diffusers #3184

Merged
merged 14 commits into from
Apr 27, 2023
Merged

[Bugfix] Renames in 0.15.0 diffusers #3184

merged 14 commits into from
Apr 27, 2023

Conversation

StAlKeR7779
Copy link
Contributor

@StAlKeR7779 StAlKeR7779 commented Apr 12, 2023

Link to PR in diffusers repository:
huggingface/diffusers#2691

Imports:
diffusers.models.cross_attention -> diffusers.models.attention_processor

Unions:
AttnProcessor -> AttentionProcessor

Classes:

Old name New name
CrossAttention Attention
CrossAttnProcessor AttnProcessor
XFormersCrossAttnProcessor XFormersAttnProcessor
CrossAttnAddedKVProcessor AttnAddedKVProcessor
LoRACrossAttnProcessor LoRAAttnProcessor
LoRAXFormersCrossAttnProcessor LoRAXFormersAttnProcessor
FlaxCrossAttention FlaxAttention
AttendExciteCrossAttnProcessor AttendExciteAttnProcessor
Pix2PixZeroCrossAttnProcessor Pix2PixZeroAttnProcessor

Also config values no longer sets as attributes of object:
huggingface/diffusers#2849

Imports:
`diffusers.models.cross_attention -> diffusers.models.attention_processor`

Unions:
`AttnProcessor -> AttentionProcessor`

Classes:
| Old name | New name|
| --- | --- |
| CrossAttention | Attention |
| CrossAttnProcessor | AttnProcessor |
| XFormersCrossAttnProcessor | XFormersAttnProcessor |
| CrossAttnAddedKVProcessor | AttnAddedKVProcessor |
| LoRACrossAttnProcessor | LoRAAttnProcessor |
| LoRAXFormersCrossAttnProcessor | LoRAXFormersAttnProcessor |

Same names in this class:
`SlicedAttnProcessor, SlicedAttnAddedKVProcessor`
@StAlKeR7779
Copy link
Contributor Author

@lstein, @blessedcoolant Looks like i'm done with it.

@lstein
Copy link
Collaborator

lstein commented Apr 13, 2023 via email

@lstein lstein requested review from mauwii and ebr as code owners April 14, 2023 02:39
Copy link
Collaborator

@lstein lstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I committed a couple of small fixes, and have a question about the use of self.config above. Otherwise looks great and passed a bit of testing.

ldm/invoke/generator/diffusers_pipeline.py Show resolved Hide resolved
lstein added a commit that referenced this pull request Apr 14, 2023
- This is a port of #3184 to the main branch
@lstein
Copy link
Collaborator

lstein commented Apr 18, 2023

@damian0815 , @blessedcoolant We'll need a codeowner review on this. Thanks!

@lstein lstein enabled auto-merge April 20, 2023 16:20
@lstein
Copy link
Collaborator

lstein commented Apr 20, 2023

@damian0815 @blessedcoolant We need a codeowner review on this PR. Thanks!

@blessedcoolant blessedcoolant self-requested a review April 20, 2023 17:20
- Change diffusers dependency to `diffusers~=0.15.0` which *should*
  enforce  non-breaking changes.
lstein added a commit that referenced this pull request Apr 25, 2023
Copy link
Contributor

@GreggHelt2 GreggHelt2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. And thanks for the clear explanation of class renaming etc in the PR message!

@lstein lstein merged commit 5bbf7fe into invoke-ai:v2.3 Apr 27, 2023
@StAlKeR7779 StAlKeR7779 deleted the fix/new_diffusers_names branch April 28, 2023 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants