extend torch.jit._overload to module methods #24259
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
eellison
changed the title
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
z-a-f
pushed a commit
that referenced
this pull request
Aug 15, 2019
Note: This should be landed ONLY after #24259
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
driazati
reviewed
Aug 16, 2019
| return self.hello("hi"), self.hello(.5) | ||
|
|
||
| w = CompileOverloadError() | ||
| with self.assertRaisesRegex(Exception, "but instead found type \'str\'"): |
Contributor
There was a problem hiding this comment.
Shouldn't a str work here since there's an overload for it?
Contributor
Author
There was a problem hiding this comment.
This is an error here because you're trying to do x + 1 with a str
torch/_jit_internal.py
Outdated
| class_name_map = {} | ||
| _overloaded_methods[qual_name] = class_name_map | ||
|
|
||
| class_name = get_class_name(func) |
Contributor
There was a problem hiding this comment.
This doesn't seem like a safe way to globally identify classes since it will break for nested classes with the same class name and same function names since the name is not fully qualified
Contributor
Author
There was a problem hiding this comment.
Sure, i can add a check that the line number is the same. This is still internal-only tho.
|
|
||
| methods = methods + tuple(exported) | ||
|
|
||
| overload_name_mappings = dict(getattr(mod, "__overloads__", {})) |
Contributor
There was a problem hiding this comment.
Can you delete the __overloads__ and replace it with these new decorators instead of adding both together? (or do that in a stacked PR)
Contributor
Author
There was a problem hiding this comment.
yea i was going to do that as a follow up, since that likely breaks the ScriptModules in quantization
|
|
||
| for orig_fn, overload_fns in overloads: | ||
| orig_ast = torch.jit.get_jit_def(orig_fn, self_name="ScriptModule") | ||
| names = list(map(lambda i: orig_ast.name().name + "__" + str(i), range(len(overload_fns)))) |
Contributor
There was a problem hiding this comment.
Since the overloaded methods aren't directly callable why do they need to be added as normal methods with this mangled name to the ScriptModule? The class could hold its schemas for each overload and check that in OverloadedMethodValue instead of what it's doing now
Contributor
Author
There was a problem hiding this comment.
The normal name isn't being added, only the mangled ones are being added.
Defining the mangled ones lazily would be an improvement but I don't think it's necessary for this PR. It would also complicate export logic / possibly other things, and would require removing the other __overload__ mechanism first.
z-a-f
pushed a commit
that referenced
this pull request
Aug 16, 2019
Note: This should be landed ONLY after #24259 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 16, 2019
Note: This should be landed ONLY after #24259 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
driazati
approved these changes
Aug 16, 2019
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ```
z-a-f
pushed a commit
that referenced
this pull request
Aug 19, 2019
Note: This should be landed ONLY after #24259 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 19, 2019
Note: This should be landed ONLY after #24259 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ``` Differential Revision: [D16921304](https://our.internmc.facebook.com/intern/diff/D16921304)
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266. The usage is: ``` @torch.jit.overload def add(self, y: int) -> int: ... @torch.jit.overload def add(self, y: float) -> float: ... def add(): ... ``` Differential Revision: [D16921304](https://our.internmc.facebook.com/intern/diff/D16921304)
z-a-f
pushed a commit
that referenced
this pull request
Aug 21, 2019
Note: This should be landed ONLY after #24259 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
Contributor
z-a-f
pushed a commit
that referenced
this pull request
Aug 21, 2019
Note: This should be landed ONLY after #24259 Pull Request resolved: #24447 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 23, 2019
Note: This should be landed ONLY after #24259 Pull Request resolved: #24447 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 23, 2019
Note: This should be landed ONLY after #24259 Pull Request resolved: #24447 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 25, 2019
Note: This should be landed ONLY after #24259 Pull Request resolved: #24447 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
z-a-f
pushed a commit
that referenced
this pull request
Aug 25, 2019
Note: This should be landed ONLY after #24259 Pull Request resolved: #24447 Differential Revision: [D16846006](https://our.internmc.facebook.com/intern/diff/D16846006)
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:
Follow up to #23886, add the same overload api specified in PEP 484 to module methods to reduce the friction of adding method overloads that was brought up in #23266.
The usage is:
Differential Revision: D16921304