add self.use_ada_layer_norm_* params back to BasicTransformerBlock
#6841
+14
−4
Conversation
This file contains 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
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
sayakpaul
reviewed
Feb 4, 2024
| @@ -538,7 +538,7 @@ def hack_CrossAttnDownBlock2D_forward( | |||
|
|
|||
| return hidden_states, output_states | |||
|
|
|||
| def hacked_DownBlock2D_forward(self, hidden_states, temb=None): | |||
| def hacked_DownBlock2D_forward(self, hidden_states, temb=None, **kwargs): | |||
There was a problem hiding this comment.
hacked_DownBlock2D_forward is a function they wrote to replace the forward method of the DownBlock2D ,hence the signature has to match. We added a new argument scale for the lora refactor and causes an error here without **kwargs
I think they should write their custom blocks instead
sayakpaul
reviewed
Feb 4, 2024
| @@ -634,7 +634,9 @@ def hacked_CrossAttnUpBlock2D_forward( | |||
|
|
|||
| return hidden_states | |||
|
|
|||
| def hacked_UpBlock2D_forward(self, hidden_states, res_hidden_states_tuple, temb=None, upsample_size=None): | |||
| def hacked_UpBlock2D_forward( | |||
| self, hidden_states, res_hidden_states_tuple, temb=None, upsample_size=None, **kwargs | |||
sayakpaul
reviewed
Feb 4, 2024
Comment on lines
+161
to
+165
| self.use_ada_layer_norm_zero = (num_embeds_ada_norm is not None) and norm_type == "ada_norm_zero" | ||
| self.use_ada_layer_norm = (num_embeds_ada_norm is not None) and norm_type == "ada_norm" | ||
| self.use_ada_layer_norm_single = norm_type == "ada_norm_single" | ||
| self.use_layer_norm = norm_type == "layer_norm" | ||
| self.use_ada_layer_norm_continuous = norm_type == "ada_norm_continuous" |
There was a problem hiding this comment.
Sorry for the late reply. I'd maybe just add a comment to state that they are kept for back-compatibility reasons.
sayakpaul
reviewed
Feb 4, 2024
| @@ -603,7 +603,9 @@ def hacked_CrossAttnUpBlock2D_forward( | |||
|
|
|||
| return hidden_states | |||
|
|
|||
| def hacked_UpBlock2D_forward(self, hidden_states, res_hidden_states_tuple, temb=None, upsample_size=None): | |||
| def hacked_UpBlock2D_forward( | |||
| self, hidden_states, res_hidden_states_tuple, temb=None, upsample_size=None, **kwargs | |||
sayakpaul
approved these changes
Feb 4, 2024
2 tasks
sayakpaul
pushed a commit
that referenced
this pull request
Feb 6, 2024
#6841) fix sd reference community ppeline Co-authored-by: yiyixuxu <yixu310@gmail,com>
AmericanPresidentJimmyCarter
pushed a commit
to AmericanPresidentJimmyCarter/diffusers
that referenced
this pull request
Apr 26, 2024
huggingface#6841) fix sd reference community ppeline Co-authored-by: yiyixuxu <yixu310@gmail,com>
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.
fix #6838
I also fixed some other error in the sd reference community pipelines while I'm at it (so also fix #5028 (comment))
we should deprecate these params too