[Clean up] Clean unused code #245
Merged
Conversation
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
…clean_resnet_file
patrickvonplaten
changed the title
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. |
| @@ -390,7 +390,7 @@ def from_pretrained(cls, pretrained_model_name_or_path: Optional[Union[str, os.P | |||
| ) | |||
| except EntryNotFoundError: | |||
| raise EnvironmentError( | |||
| f"{pretrained_model_name_or_path} does not appear to have a file named {model_file}." | |||
| f"{pretrained_model_name_or_path} does not appear to have a file named {WEIGHTS_NAME}." | |||
There was a problem hiding this comment.
model file is actually not yet defined when this error is hit
|
|
||
| import torch | ||
| import torch.nn.functional as F | ||
| from torch import nn | ||
|
|
||
|
|
||
| class AttentionBlockNew(nn.Module): | ||
| class AttentionBlock(nn.Module): |
There was a problem hiding this comment.
Let's call it AttentionBlock and not AttentionBlockNew
|
Solves #199 |
| @@ -234,7 +178,7 @@ def forward(self, x, context=None, mask=None): | |||
| h = self.heads | |||
|
|
|||
| q = self.to_q(x) | |||
| context = default(context, x) | |||
There was a problem hiding this comment.
death to one-line functions
| @@ -280,155 +224,3 @@ def __init__(self, dim_in, dim_out): | |||
| def forward(self, x): | |||
| x, gate = self.proj(x).chunk(2, dim=-1) | |||
| return x * F.gelu(gate) | |||
|
|
|||
There was a problem hiding this comment.
All of this code is not used anymore
| from .attention import AttentionBlockNew, SpatialTransformer | ||
| from .resnet import Downsample2D, FirDownsample2D, FirUpsample2D, ResnetBlock, Upsample2D | ||
| from .attention import AttentionBlock, SpatialTransformer | ||
| from .resnet import Downsample2D, FirDownsample2D, FirUpsample2D, ResnetBlock2D, Upsample2D |
There was a problem hiding this comment.
2D is more in line with all the other imports here
patrickvonplaten
changed the title
patil-suraj
approved these changes
Aug 25, 2022
| @@ -234,7 +178,7 @@ def forward(self, x, context=None, mask=None): | |||
| h = self.heads | |||
|
|
|||
| q = self.to_q(x) | |||
| context = default(context, x) | |||
| context = context if context is not None else x | |||
natolambert
pushed a commit
that referenced
this pull request
Sep 7, 2022
* CleanResNet * refactor more * correct
yoonseokjin
pushed a commit
to yoonseokjin/diffusers
that referenced
this pull request
Dec 25, 2023
* CleanResNet * refactor more * correct
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.
This PRs finishes the easy refactoring (just deleting old code).
All slow tests pass + stable diffusion pipeline was tested for subjective image quality and all looks good 👍
Now the big single letter variable renaming can begin