Use c10::variant-based enums for Nonlinearity and FanMode #27933
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
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
added 14 commits
October 14, 2019 18:06
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
yf225
requested review from
ezyang
and removed request for
ebetica and
goldsborough
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
ezyang
reviewed
Oct 17, 2019
| } else if (nonlinearity == torch::nn::init::Nonlinearity::LeakyReLU) { | ||
| } else if (c10::get_if<enumtype::kLeakyReLU>(&nonlinearity)) { | ||
| return std::sqrt(2.0 / (1 + pow(param, 2))); // NOLINT | ||
| } |
Contributor
There was a problem hiding this comment.
Hmm. If we ever add a new variant to the enum, will we then get an error saying we didn't handle all cases yet? If not, we should add a fallthrough case here...
Contributor
Author
There was a problem hiding this comment.
Yeah we should have a fallthrough case here - I will do it as part of the work for torch::nn::init::calculate_gain parity.
ezyang
reviewed
Oct 17, 2019
| LeakyReLU | ||
| }; | ||
|
|
||
| // This enum class is deprecated and will be removed in 1.5. |
Contributor
There was a problem hiding this comment.
Hmm, I wonder if we can statically warn in these cases... does C10_DEPRECATED work here?
Contributor
Author
There was a problem hiding this comment.
It seems that adding C10_DEPRECATED prevents the enum class from being used in some CI configs such as pytorch_macos_10_13_py3_test, hence breaking BC-support. For now I'll keep the comment instead.
ezyang
reviewed
Oct 17, 2019
|
|
||
| #define COMPUTE_NONLINEARITY_ENUM(name) /* NOLINT(cppcoreguidelines-macro-usage) */ \ | ||
| case Nonlinearity::name: \ | ||
| TORCH_WARN( \ |
Contributor
Author
There was a problem hiding this comment.
I do want people to move to the new enum style sooner than later, because the old style will be deprecated soon :D I think it's probably okay for the warning to be a bit more annoying here, since moving to the new style is minimal effort.
ezyang
reviewed
Oct 17, 2019
ezyang
approved these changes
Oct 17, 2019
added 3 commits
October 18, 2019 02:05
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Use c10::variant-based enums for Nonlinearity and FanMode gh-metadata: pytorch pytorch 27933 gh/yf225/10/head
Contributor
thiagocrepaldi
pushed a commit
to thiagocrepaldi/pytorch
that referenced
this pull request
Feb 4, 2020
Summary: Pull Request resolved: pytorch#27933 Test Plan: Imported from OSS Differential Revision: D18009044 Pulled By: yf225 fbshipit-source-id: e88229ee30badf7a699f62af61d1e88debc0dc7d
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.
Stack from ghstack:
Differential Revision: D18009044