Re apply optional ScalarType changes #22237
Closed
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
… optional scalartype parameter" This reverts commit e016a42.
pytorchbot
added
oncall: jit
nairbv
commented
Jun 25, 2019
aten/src/ATen/core/jit_type.h
Outdated
| if (auto opt_rhs = rhs.cast<OptionalType>()) { | ||
| return getElementType()->isSubtypeOf(opt_rhs->getElementType()); | ||
| return *getElementType() == *opt_rhs->getElementType(); | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
these are the new changes added to (hopefully) fix the tests that failed due to #22104
Collaborator
wanchaol
approved these changes
Jun 25, 2019
Collaborator
wanchaol
left a comment
wanchaol
left a comment
There was a problem hiding this comment.
looks good, the jit_type changes is landing so please rebase and you can safely delete the jit_type changes here.
aten/src/ATen/core/jit_type.h
Outdated
| if (auto opt_rhs = rhs.cast<OptionalType>()) { | ||
| return getElementType()->isSubtypeOf(opt_rhs->getElementType()); | ||
| return *getElementType() == *opt_rhs->getElementType(); | ||
| } |
Collaborator
Collaborator
Author
|
@pytorchbot rebase this please |
Collaborator
|
Sorry, I can't merge this because there are conflicts. To merge this yourself, run the commands below: (To learn more about this bot, see Bot commands.) |
Collaborator
Author
|
for reference, this is the change that fixes this PR: |
Contributor
facebook-github-bot
left a comment
facebook-github-bot
left a comment
There was a problem hiding this comment.
@nairbv is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
zdevito
pushed a commit
to zdevito/ATen
that referenced
this pull request
Jun 26, 2019
Summary: This is (mostly) the re-application of: pytorch/pytorch#21088 which was reverted due to an issue conflicting with changes in: pytorch/pytorch#22104 Pull Request resolved: pytorch/pytorch#22237 Differential Revision: D16012838 Pulled By: nairbv fbshipit-source-id: 35f4a73c97ab68b4e2648aca96b2176f07b5a883
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 is (mostly) the re-application of:
#21088
which was reverted due to an issue conflicting with changes in:
#22104