Expose LexicalScopeContext in checker.py #5693

isdanni · 2023-10-21T01:14:27Z

Description

Expose LexicalScopeContext checker Python API

`🤖 Generated by Copilot at e1497f7`

Summary

📝🔬🐍

This pull request adds lexical scope validation support to the checker module of ONNX. It modifies the Python and C++ code to allow users to create and pass LexicalScopeContext objects to the checker functions. It also updates the tests and the type annotations for the checker module.

checker module
validates lexical scope
autumn of errors

Walkthrough

Add LEXICAL_SCOPE_CONTEXT variable to the public API of the checker module and remove helper module from it (link, link)
Create a global LEXICAL_SCOPE_CONTEXT variable in the checker module and use it as the default argument for the check_attribute, check_node, check_function, and check_graph functions (link, link)
Add a Python binding for the C.LexicalScopeContext class in the onnx/cpp2py_export.cc file and use it to pass the lex_ctx argument to the C++ checker functions (link, link)
Update the type annotations for the checker module in the onnx/onnx_cpp2py_export/checker.pyi file to include the LexicalScopeContext class and the lex_ctx parameter (link)
Modify the test_check_function_nested and test_check_graph_ir_version_3 functions in the onnx/test/checker_test.py file to create and pass custom lex_ctx values to the checker functions (link, link)

Motivation and Context

Closes #4870

onnx/checker.py

codecov · 2023-10-21T02:10:49Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Files	Coverage Δ
onnx/checker.py	`91.83% <100.00%> (+0.92%)`	⬆️
onnx/test/checker_test.py	`99.21% <100.00%> (+0.01%)`	⬆️

... and 1 file with indirect coverage changes

📢 Thoughts on this report? Let us know!

onnx/checker.py

onnx/test/checker_test.py

Signed-off-by: isdanni <leedanni@gmail.com>

justinchuby · 2023-11-07T15:38:23Z

Could you resolve conflicts? Thanks!

justinchuby · 2023-11-07T15:38:37Z

@gramalingam

Signed-off-by: Danni <leedanni@gmail.com>

isdanni · 2023-11-09T01:25:47Z

btw this PR can be merged now :) @justinchuby

justinchuby · 2023-11-09T01:29:51Z

onnx/checker.py

-    attr: AttributeProto, ctx: C.CheckerContext = DEFAULT_CONTEXT
+    attr: AttributeProto,
+    ctx: C.CheckerContext = DEFAULT_CONTEXT,
+    lex_ctx: C.LexicalScopeContext = LEXICAL_SCOPE_CONTEXT,


Sorry for being late to point this out but we should avoid abbreviations for readability. Consider lexical_scope_ctx (keep ctx for consistency)?

If @gramalingam likes the suggestion, I suggest creating a follow up PR to amend this change.

lexical_scope_ctx sounds good to me. I could work on this. Same with parameterizing the checker tests

justinchuby · 2023-11-13T23:20:28Z

onnx/checker.py

+    function: FunctionProto,
+    ctx: C.CheckerContext,
+    lex_ctx: C.LexicalScopeContext,


Should we provide default contexts to check_function as well? This is failing tests in https://github.com/microsoft/onnxscript/actions/runs/6856753046/job/18644541143?pr=1154

Will update tonight!

justinchuby · 2023-11-13T23:22:27Z

#5755

#5757) ### Description - Use `lexical_scope_ctx` instead of `ctx` in `checker.py` - Provide default contexts in `check_function()` ### Motivation and Context Follow up to #5693 Close #5755 Signed-off-by: isdanni <leedanni@gmail.com>

justinchuby · 2023-11-29T17:43:06Z

onnx/test/checker_test.py

+        ctx = checker.C.CheckerContext()
+        ctx.ir_version = IR_VERSION
+        ctx.opset_imports = {"": 14}
+
+        lex_ctx = checker.C.LexicalScopeContext()
+
+        checker.check_function(func_nested_identity_add, ctx, lex_ctx)



Removed in #5778

### Description - Expose LexicalScopeContext checker Python API  ### <samp>🤖 Generated by Copilot at e1497f7</samp> ### Summary 📝🔬🐍  This pull request adds lexical scope validation support to the `checker` module of ONNX. It modifies the Python and C++ code to allow users to create and pass `LexicalScopeContext` objects to the checker functions. It also updates the tests and the type annotations for the `checker` module. > _`checker` module_ > _validates lexical scope_ > _autumn of errors_ ### Walkthrough * Add `LEXICAL_SCOPE_CONTEXT` variable to the public API of the `checker` module and remove `helper` module from it ([link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-02263d309b5f73a30725601891d76efb5b1c72e484298bdea671f104e19eb68cR18), [link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-02263d309b5f73a30725601891d76efb5b1c72e484298bdea671f104e19eb68cL42)) * Create a global `LEXICAL_SCOPE_CONTEXT` variable in the `checker` module and use it as the default argument for the `check_attribute`, `check_node`, `check_function`, and `check_graph` functions ([link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-02263d309b5f73a30725601891d76efb5b1c72e484298bdea671f104e19eb68cL59-R61), [link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-02263d309b5f73a30725601891d76efb5b1c72e484298bdea671f104e19eb68cL83-R117)) * Add a Python binding for the `C.LexicalScopeContext` class in the `onnx/cpp2py_export.cc` file and use it to pass the `lex_ctx` argument to the C++ checker functions ([link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-901b627f812650417003b35cded512164308bb73dc9df1e92950b048625d64aeR484-R486), [link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-901b627f812650417003b35cded512164308bb73dc9df1e92950b048625d64aeL504-R545)) * Update the type annotations for the `checker` module in the `onnx/onnx_cpp2py_export/checker.pyi` file to include the `LexicalScopeContext` class and the `lex_ctx` parameter ([link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-f30ab95b6239698fb733b19a75ff6ed19b4b7475c55677d986de0086baa362f7L5-R20)) * Modify the `test_check_function_nested` and `test_check_graph_ir_version_3` functions in the `onnx/test/checker_test.py` file to create and pass custom `lex_ctx` values to the checker functions ([link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-ba056a79b8f17fee8bf49ee51c5f3fadcab77398b81d38c761e838e9c9086d66L94-R101), [link](https://github.com/onnx/onnx/pull/5693/files?diff=unified&w=0#diff-ba056a79b8f17fee8bf49ee51c5f3fadcab77398b81d38c761e838e9c9086d66L101-R110)) ### Motivation and Context Closes onnx#4870 Signed-off-by: isdanni <leedanni@gmail.com> Signed-off-by: Danni <leedanni@gmail.com> Signed-off-by: Linsho Kaku <linsho@preferred.jp>

onnx#5757) ### Description - Use `lexical_scope_ctx` instead of `ctx` in `checker.py` - Provide default contexts in `check_function()` ### Motivation and Context Follow up to onnx#5693 Close onnx#5755 Signed-off-by: isdanni <leedanni@gmail.com> Signed-off-by: Linsho Kaku <linsho@preferred.jp>

isdanni requested a review from a team as a code owner October 21, 2023 01:14

isdanni commented Oct 21, 2023

View reviewed changes

onnx/checker.py Show resolved Hide resolved

isdanni force-pushed the expose-lexical-scope-context-in-checker branch 3 times, most recently from e3e29d6 to c94f216 Compare October 21, 2023 02:04

isdanni force-pushed the expose-lexical-scope-context-in-checker branch from 2835105 to e1497f7 Compare October 21, 2023 02:21

isdanni commented Oct 21, 2023

View reviewed changes

onnx/checker.py Show resolved Hide resolved

xadupre reviewed Oct 23, 2023

View reviewed changes

onnx/checker.py Show resolved Hide resolved

gramalingam reviewed Oct 30, 2023

View reviewed changes

onnx/test/checker_test.py Outdated Show resolved Hide resolved

gramalingam reviewed Oct 30, 2023

View reviewed changes

onnx/test/checker_test.py Outdated Show resolved Hide resolved

isdanni force-pushed the expose-lexical-scope-context-in-checker branch 2 times, most recently from b39cb02 to 77a498d Compare November 2, 2023 03:34

isdanni requested a review from a team as a code owner November 2, 2023 03:34

isdanni force-pushed the expose-lexical-scope-context-in-checker branch 2 times, most recently from dee15e3 to 1bb82a5 Compare November 2, 2023 04:07

Expose LexicalScopeContext in checker.py

d3a6864

Signed-off-by: isdanni <leedanni@gmail.com>

isdanni force-pushed the expose-lexical-scope-context-in-checker branch from 8c9295d to d3a6864 Compare November 3, 2023 02:38

isdanni requested a review from gramalingam November 5, 2023 23:11

gramalingam approved these changes Nov 8, 2023

View reviewed changes

Merge branch 'main' into expose-lexical-scope-context-in-checker

b794d5f

Signed-off-by: Danni <leedanni@gmail.com>

justinchuby enabled auto-merge November 9, 2023 00:23

justinchuby disabled auto-merge November 9, 2023 00:23

justinchuby added this pull request to the merge queue Nov 9, 2023

justinchuby reviewed Nov 9, 2023

View reviewed changes

Merged via the queue into onnx:main with commit 799dcfe Nov 9, 2023

justinchuby reviewed Nov 13, 2023

View reviewed changes

justinchuby mentioned this pull request Nov 13, 2023

check_function requires contexts as arguments which breaks backward compatibility #5755

Closed

isdanni mentioned this pull request Nov 14, 2023

Add default for check_function & Use lexical_scope_ctx for readability #5757

Merged

justinchuby mentioned this pull request Nov 28, 2023

Resurrect check function context logic #5774

Closed

justinchuby reviewed Nov 29, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Expose LexicalScopeContext in checker.py #5693

Expose LexicalScopeContext in checker.py #5693

isdanni commented Oct 21, 2023 •

edited by ghost

Loading

Uh oh!

Uh oh!

codecov bot commented Oct 21, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

justinchuby commented Nov 7, 2023

Uh oh!

justinchuby commented Nov 7, 2023

Uh oh!

isdanni commented Nov 9, 2023

Uh oh!

justinchuby Nov 9, 2023

Uh oh!

isdanni Nov 9, 2023

Uh oh!

justinchuby Nov 13, 2023

Uh oh!

isdanni Nov 14, 2023

Uh oh!

justinchuby commented Nov 13, 2023

Uh oh!

justinchuby Nov 29, 2023

Uh oh!

Uh oh!

Expose LexicalScopeContext in checker.py #5693

Expose LexicalScopeContext in checker.py #5693

Conversation

isdanni commented Oct 21, 2023 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

🤖 Generated by Copilot at e1497f7

Summary

Walkthrough

Motivation and Context

Uh oh!

Uh oh!

codecov bot commented Oct 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

justinchuby commented Nov 7, 2023

Uh oh!

justinchuby commented Nov 7, 2023

Uh oh!

isdanni commented Nov 9, 2023

Uh oh!

justinchuby Nov 9, 2023

Choose a reason for hiding this comment

Uh oh!

isdanni Nov 9, 2023

Choose a reason for hiding this comment

Uh oh!

justinchuby Nov 13, 2023

Choose a reason for hiding this comment

Uh oh!

isdanni Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

justinchuby commented Nov 13, 2023

Uh oh!

justinchuby Nov 29, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

isdanni commented Oct 21, 2023 •

edited by ghost

Loading

`🤖 Generated by Copilot at e1497f7`

codecov bot commented Oct 21, 2023 •

edited

Loading