[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274
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
junrushao
reviewed
Aug 14, 2020
junrushao
reviewed
Aug 14, 2020
|
May be out of the scope of this PR, but shall we also consider make type inference non-recursive some time? |
72ed73f to
d0deb8f
Compare
d9bcbe6 to
d3b0c22
Compare
tkonolige
reviewed
Sep 4, 2020
tkonolige
reviewed
Sep 4, 2020
tkonolige
reviewed
Sep 4, 2020
tkonolige
reviewed
Sep 4, 2020
eacb4a7 to
da61680
Compare
This was referenced Sep 14, 2020
8cbc61d to
495606d
Compare
jroesch
commented
Sep 22, 2020
jroesch
commented
Sep 22, 2020
|
|
||
| def _add(self, var, val, update=False): | ||
| def _add(self, var, val, update=True): |
There was a problem hiding this comment.
Remove update/add in future PR.
jroesch
commented
Sep 22, 2020
jroesch
commented
Sep 22, 2020
| @@ -213,13 +213,15 @@ def optimize(self): | |||
| """ | |||
| seq = tvm.transform.Sequential( | |||
| [ | |||
| # tvm.parser.AnnotateSpans(), | |||
There was a problem hiding this comment.
Should we provide a flag for spans here?
jroesch
commented
Sep 22, 2020
| @@ -1512,3 +1552,6 @@ def load_prelude(self): | |||
| ]: | |||
| tensor_array_ops = TensorArrayOps(self, dtype) | |||
| tensor_array_ops.register() | |||
|
|
|||
| # Renamer doesn't properly deal with constructors, etc | |||
There was a problem hiding this comment.
I don't think this is true anymore.
jroesch
commented
Sep 22, 2020
jroesch
commented
Sep 22, 2020
jroesch
commented
Sep 23, 2020
jroesch
commented
Sep 23, 2020
c0094fd to
c2f368b
Compare
tmoreau89
approved these changes
Oct 9, 2020
|
Thank you @jroesch @mbrookhart @rkimball the PR has been merged. |
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 13, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 14, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 15, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 15, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 16, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
TusharKanekiDey
pushed a commit
to TusharKanekiDey/tvm
that referenced
this pull request
Oct 16, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (neo-ai#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
trevor-m
pushed a commit
to neo-ai/tvm
that referenced
this pull request
Oct 19, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
trevor-m
pushed a commit
to neo-ai/tvm
that referenced
this pull request
Oct 19, 2020
…odule, and use new diagnostics. (apache#6274) * Refactor the type checker to use diagnostics Although this patch is very large and seemingly disjoint the fixes are required to get it working for the entire stack. I started with first changing InferType to use the diagnostics, these weren't yet in the pass manager so this required changes to module and module pass. InferType wasn't actually written correctly as a pass requring refactoring there, then in order to add spans to AST it required turning on AnnotateSpans which in term required changes to the parser, and module to make it possible to use the errors. These changes to parse and module required changes to diagnostics and InferType. Althought seemingly disconnected there are hidden cycles between the components which require simultaneous change in order to remove the old error reporting. A huge change due to this patch is that the module no longer implicitly type checks functions which are added. * Apply suggestions from code review Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> * Apply suggestions from code review Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> * Clean up parser * CR feedback * Apply Bobs suggestions * Fix up Python interface for diagnostics * Fix test_ir_parser and formatting * Fix cpplint * Fix lint * Fix format * More lint * Fix format * Kill dead doc comment * Fix documentation comment * Rebase fixups * Add docs for type.h * Fix parser.cc * Fix unittests * Fix black * Skip previously typechecked functions * fix ACL * Fix numerous issues * Add repr method * Fix issue with Pytest, I am ready to cry * Fix the rest of tests * Kill dead code * Fix dignostic tests * Fix more tests * fix more tests (#11) * Fix diagnostic.py deinit bug * Fix deinit issue * Format * Tweak disabling of override * Format * Fix BYOC * Fix TensorArray stuff * Fix PyTorch * Format * Format Co-authored-by: Robert Kimball <bobkimball@gmail.com> Co-authored-by: Junru Shao <junrushao1994@gmail.com> Co-authored-by: Tristan Konolige <tristan.konolige@gmail.com> Co-authored-by: Cody Yu <comaniac0422@gmail.com> Co-authored-by: Zhi <5145158+zhiics@users.noreply.github.com>
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.
This is now ready for full review. This has become a huge PR where I split the coupling between the type checker and the module enabling more flexible use of the module and type checker. Unfortunately people have heavily relied on implicit type checking occurring each time we add a function. This functionality is not longer supported and examples of fixing it can be found all over the test cases.