[prototype] Video Classes Clean up#6751
Merged
datumbox merged 4 commits intopytorch:mainfrom Oct 12, 2022
Merged
Conversation
datumbox
commented
Oct 12, 2022
| features.VideoTypeJIT, | ||
| features.VideoTypeJIT, | ||
| features.VideoTypeJIT, | ||
| ], |
Contributor
Author
There was a problem hiding this comment.
JIT doesn't like this:
____________ TestDispatchers.test_scripted_smoke[cpu-five_crop-06] _____________
Traceback (most recent call last):
File "/home/runner/work/vision/vision/test/test_prototype_transforms_functional.py", line 24, in script
return torch.jit.script(fn)
File "/opt/hostedtoolcache/Python/3.7.14/x64/lib/python3.7/site-packages/torch/jit/_script.py", line 1344, in script
qualified_name, ast, _rcb, get_default_args(obj)
RuntimeError: false INTERNAL ASSERT FAILED at "../aten/src/ATen/core/union_type.cpp":212, please report a bug to PyTorch. After type unification was performed, the Union with the original types {Tuple[Tensor, Tensor, Tensor, Tensor, Tensor] Tuple[Tensor, Tensor, Tensor, Tensor, Tensor], } has the single type Tuple[Tensor, Tensor, Tensor, Tensor, Tensor]. Use the common supertype instead of creating a Uniontype
The above exception was the direct cause of the following exception:
Traceback (most recent call last):
File "/home/runner/work/vision/vision/test/test_prototype_transforms_functional.py", line 221, in test_scripted_smoke
dispatcher = script(info.dispatcher)
File "/home/runner/work/vision/vision/test/common_utils.py", line 225, in wrapper
raise exc_tb[0].with_traceback(exc_tb[1])
File "/home/runner/work/vision/vision/test/common_utils.py", line 228, in wrapper
out = fn(*args, **kwargs)
File "/home/runner/work/vision/vision/test/test_prototype_transforms_functional.py", line 26, in script
raise AssertionError(f"Trying to `torch.jit.script` '{fn.__name__}' raised the error above.") from error
AssertionError: Trying to `torch.jit.script` 'five_crop' raised the error above.
76a66fd to
50722ee
Compare
datumbox
commented
Oct 12, 2022
| return five_crop_image_tensor(video, size) | ||
|
|
||
|
|
||
| ImageOrVideoTypeJIT = Union[features.ImageTypeJIT, features.VideoTypeJIT] |
Contributor
Author
There was a problem hiding this comment.
Necessary to get around the JIT issue.
Contributor
There was a problem hiding this comment.
JIT is just so cumbersome ... It seems it recognizes that this Union flattens to torch.Tensor, but if we use that for the output it bails out ...
pmeier
approved these changes
Oct 12, 2022
Contributor
pmeier
left a comment
There was a problem hiding this comment.
Two comments out of morbid curiosity, but otherwise LGTM is CI is green. Thanks Vasilis!
| return five_crop_image_tensor(video, size) | ||
|
|
||
|
|
||
| ImageOrVideoTypeJIT = Union[features.ImageTypeJIT, features.VideoTypeJIT] |
Contributor
There was a problem hiding this comment.
JIT is just so cumbersome ... It seems it recognizes that this Union flattens to torch.Tensor, but if we use that for the output it bails out ...
| inpt: features.ImageOrVideoTypeJIT, size: List[int], vertical_flip: bool = False | ||
| ) -> List[features.ImageOrVideoTypeJIT]: | ||
| inpt: Union[features.ImageTypeJIT, features.VideoTypeJIT], size: List[int], vertical_flip: bool = False | ||
| ) -> Union[List[features.ImageTypeJIT], List[features.VideoTypeJIT]]: |
Contributor
There was a problem hiding this comment.
I haven't seen that before. So this works, but it doesn't for tuples? 🤯
Contributor
Author
There was a problem hiding this comment.
Yes. This is possibly because they do various mitigations for Tuples as we've seen previously.
Contributor
Author
facebook-github-bot
pushed a commit
that referenced
this pull request
Oct 17, 2022
Summary: * Removing unnecessary methods/classes. * Unions instead of ImageOrVideo types * Fixing JIT issue. Reviewed By: NicolasHug Differential Revision: D40427460 fbshipit-source-id: 4ffb95e8e13240b302b9236467c95afb82d17c17
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Few of the final clean ups on the API:
ImageOrVideotype in favour of a Union