[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274

jroesch · 2020-08-13T23:27:43Z

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.

include/tvm/ir/diagnostic.h

junrushao · 2020-08-14T20:31:34Z

May be out of the scope of this PR, but shall we also consider make type inference non-recursive some time?

src/ir/module.cc

src/parser/parser.cc

src/relay/transforms/type_infer.cc

tests/python/relay/test_ir_parser.py

src/ir/diagnostic.cc

include/tvm/ir/module.h

jroesch · 2020-09-22T23:16:41Z

python/tvm/ir/module.py


-    def _add(self, var, val, update=False):
+    def _add(self, var, val, update=True):


Remove update/add in future PR.

python/tvm/parser/__init__.py

jroesch · 2020-09-22T23:17:18Z

python/tvm/relay/backend/interpreter.py

@@ -213,13 +213,15 @@ def optimize(self):
        """
        seq = tvm.transform.Sequential(
            [
+                # tvm.parser.AnnotateSpans(),


Should we provide a flag for spans here?

jroesch · 2020-09-22T23:18:31Z

python/tvm/relay/prelude.py

@@ -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


I don't think this is true anymore.

python/tvm/relay/std/prelude.rly

src/printer/relay_text_printer.cc

src/parser/parser.cc

tmoreau89 · 2020-10-09T18:44:30Z

Thank you @jroesch @mbrookhart @rkimball the PR has been merged.

…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 <[email protected]> Co-authored-by: Junru Shao <[email protected]> * Apply suggestions from code review Co-authored-by: Tristan Konolige <[email protected]> * 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 <[email protected]> Co-authored-by: Junru Shao <[email protected]> Co-authored-by: Tristan Konolige <[email protected]> Co-authored-by: Cody Yu <[email protected]> Co-authored-by: Zhi <[email protected]>

…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 <[email protected]> Co-authored-by: Junru Shao <[email protected]> * Apply suggestions from code review Co-authored-by: Tristan Konolige <[email protected]> * 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 <[email protected]> Co-authored-by: Junru Shao <[email protected]> Co-authored-by: Tristan Konolige <[email protected]> Co-authored-by: Cody Yu <[email protected]> Co-authored-by: Zhi <[email protected]>

junrushao reviewed Aug 14, 2020

View reviewed changes

include/tvm/ir/diagnostic.h Outdated Show resolved Hide resolved

junrushao reviewed Aug 14, 2020

View reviewed changes

zhiics mentioned this pull request Aug 17, 2020

[BYOC][ETHOSN] Introduce the Ethos-N BYOC integration #6222

Merged

jroesch force-pushed the diag_infer_type branch from 72ed73f to d0deb8f Compare August 25, 2020 18:59

jroesch mentioned this pull request Aug 25, 2020

[Relay] Mutual Recursion Support #5881

Closed

MarisaKirisame reviewed Aug 25, 2020

View reviewed changes

src/ir/module.cc Show resolved Hide resolved

src/parser/parser.cc Outdated Show resolved Hide resolved

src/relay/transforms/type_infer.cc Outdated Show resolved Hide resolved

tests/python/relay/test_ir_parser.py Outdated Show resolved Hide resolved

jroesch marked this pull request as ready for review September 4, 2020 02:10

jroesch force-pushed the diag_infer_type branch from d9bcbe6 to d3b0c22 Compare September 4, 2020 02:18

tkonolige reviewed Sep 4, 2020

View reviewed changes

src/ir/diagnostic.cc Outdated Show resolved Hide resolved

tkonolige reviewed Sep 4, 2020

View reviewed changes

src/ir/diagnostic.cc Outdated Show resolved Hide resolved

tkonolige reviewed Sep 4, 2020

View reviewed changes

src/ir/diagnostic.cc Outdated Show resolved Hide resolved

tkonolige reviewed Sep 4, 2020

View reviewed changes

src/ir/diagnostic.cc Outdated Show resolved Hide resolved

jroesch force-pushed the diag_infer_type branch 2 times, most recently from eacb4a7 to da61680 Compare September 14, 2020 08:16

This was referenced Sep 14, 2020

[BUG] Parser error with nn.dense #6470

Closed

[TypeChecker][Relay] Issue with return type not being properly inferred. #6489

Closed

jroesch force-pushed the diag_infer_type branch 4 times, most recently from 8cbc61d to 495606d Compare September 22, 2020 02:04

jroesch commented Sep 22, 2020

View reviewed changes

include/tvm/ir/module.h Show resolved Hide resolved

jroesch commented Sep 22, 2020

View reviewed changes

python/tvm/parser/__init__.py Outdated Show resolved Hide resolved

jroesch commented Sep 22, 2020

View reviewed changes

python/tvm/relay/std/prelude.rly Show resolved Hide resolved

jroesch commented Sep 22, 2020

View reviewed changes

src/printer/relay_text_printer.cc Show resolved Hide resolved

jroesch commented Sep 23, 2020

View reviewed changes

src/parser/parser.cc Outdated Show resolved Hide resolved

jroesch commented Sep 23, 2020

View reviewed changes

src/parser/parser.cc Outdated Show resolved Hide resolved

jroesch and others added 13 commits October 9, 2020 00:09

Fix dignostic tests

2209b08

Fix more tests

222b7c1

fix more tests (#11)

433deeb

Fix diagnostic.py deinit bug

e81eadb

Fix deinit issue

f81e85e

Format

ca065d8

Tweak disabling of override

46f9658

Format

885e404

Fix BYOC

f6c0524

Fix TensorArray stuff

b32cf3a

Fix PyTorch

d8c85b5

Format

9e22dbd

Format

c2f368b

jroesch force-pushed the diag_infer_type branch from c0094fd to c2f368b Compare October 9, 2020 08:19

tmoreau89 approved these changes Oct 9, 2020

View reviewed changes

tmoreau89 merged commit 98c2096 into apache:master Oct 9, 2020

tkonolige mentioned this pull request Nov 6, 2020

[TIR] Add spans to all ExprNodes #6860

Merged

t-vi mentioned this pull request Jan 29, 2021

Refactor Dynamic to Static #7368

Merged

jroesch deleted the diag_infer_type branch February 4, 2021 04:42

chiwwang mentioned this pull request Jun 11, 2021

[DOCS] Add docs for Pass Instrument #8220

Merged

junrushao mentioned this pull request Nov 1, 2021

Apache TVM v0.8 Release Note Candidate #9416

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274

[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274

jroesch commented Aug 13, 2020 •

edited

Loading

junrushao commented Aug 14, 2020

jroesch Sep 22, 2020

jroesch Sep 22, 2020

jroesch Sep 22, 2020

tmoreau89 commented Oct 9, 2020


		def _add(self, var, val, update=False):
		def _add(self, var, val, update=True):

[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274

[Diagnostics][Relay][InferType] Refactor InferType to work on whole module, and use new diagnostics. #6274

Conversation

jroesch commented Aug 13, 2020 • edited Loading

junrushao commented Aug 14, 2020

jroesch Sep 22, 2020

Choose a reason for hiding this comment

jroesch Sep 22, 2020

Choose a reason for hiding this comment

jroesch Sep 22, 2020

Choose a reason for hiding this comment

tmoreau89 commented Oct 9, 2020

jroesch commented Aug 13, 2020 •

edited

Loading