[JIT] NamedTuple serialization #21839
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
pytorchbot
added
oncall: jit
This was referenced Jun 16, 2019
added 7 commits
June 17, 2019 10:49
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
zdevito
reviewed
Jun 18, 2019
Contributor
zdevito
left a comment
zdevito
left a comment
There was a problem hiding this comment.
This looks pretty good. Let's coordinate a few things tomorrow morning to make sure it works for both Interfaces and NamedTuples
torch/csrc/jit/import_source.cpp
Outdated
| auto fullName = c10::QualifiedName(basename_, name); | ||
| if (auto classType = cu_.get_class(fullName)) { | ||
| return std::make_shared<ClassValue>(classType); | ||
| if (auto serializable_type = cu_.get_serializable_type(fullName)) { |
Contributor
There was a problem hiding this comment.
This is going to conflict with #21853 which also needs to redefine how named types are put in the compilation unit.
torch/csrc/jit/import_source.cpp
Outdated
|
|
||
| TypePtr resolveType(const std::string& name, const SourceRange& loc) const override { | ||
| return lib_cu_.get_class(c10::QualifiedName(name)); | ||
| return lib_cu_.get_serializable_type(c10::QualifiedName(name)); |
Contributor
There was a problem hiding this comment.
Yeah, we should coordinate how this will work across interfaces and named tuples, both require extending this API.
torch/csrc/jit/script/parser.cpp
Outdated
| L.reportError( | ||
| "Inheritance is not yet supported for TorchScript classes yet."); | ||
| // Only support inheriting from NamedTuple right now. | ||
| if (L.nextIf(TK_NAMED_TUPLE)) { |
Contributor
There was a problem hiding this comment.
L.nextIf(TK_IDENT).value() == "NamedTuple"
added 6 commits
June 18, 2019 12:12
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
zdevito
approved these changes
Jun 19, 2019
torch/csrc/jit/import_source.cpp
Outdated
| auto fullName = c10::QualifiedName(basename_, name); | ||
| if (auto classType = cu_.get_class(fullName)) { | ||
| return std::make_shared<ClassValue>(classType); | ||
| if (auto serializable_type = cu_.get_serializable_type(fullName)) { |
Contributor
There was a problem hiding this comment.
get_serializabe_type -> get_type
added 2 commits
June 18, 2019 22:14
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
[JIT] NamedTuple serialization gh-metadata: pytorch pytorch 21839 gh/jamesr66a/6/head
zdevito
pushed a commit
to zdevito/ATen
that referenced
this pull request
Jun 19, 2019
Summary: Pull Request resolved: pytorch/pytorch#21839 ghimport-source-id: b9d82018fbf26b22d58cad3a033cbfe4e879a8fe Test Plan: Imported from OSS Reviewed By: zdevito Differential Revision: D15860002 Pulled By: jamesr66a fbshipit-source-id: 0fc97c4adefa9ae4937f21179c7afa817f4099e5
Contributor
|
@jamesr66a merged this pull request in dd046be. |
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: D15860002