Skip to content

Replace ast.NameConstant with ast.Constant and remove duplicates #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinchuby merged 6 commits into from
Apr 11, 2025
Merged

Replace ast.NameConstant with ast.Constant and remove duplicates #2188

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2884dce
Replace ast.NameConstant with ast.Constant and remove duplicates
justinchuby Apr 11, 2025
e713fbd
Remove deprecated ast.Num and ast.Str nodes
justinchuby Apr 11, 2025
332f096
Update onnxscript/converter.py
justinchuby Apr 11, 2025
29e123c
Fix test failure message in converter_test.py
justinchuby Apr 11, 2025
d03e852
clean up
justinchuby Apr 11, 2025
5391ded
Merge branch 'main' into justinchuby/fix-ast-constant
justinchuby Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions onnxscript/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,14 +435,10 @@ def _is_constant_expr(self, node: ast.AST) -> None:
ast.BinOp,
ast.UnaryOp,
ast.Compare,
ast.Num,
ast.Str,
ast.Attribute,
ast.List,
ast.Load,
ast.NameConstant,
ast.Constant,
ast.Str,
),
):
return all(self._is_constant_expr(c) for c in ast.iter_child_nodes(node))
Expand Down Expand Up @@ -580,7 +576,7 @@ def _translate_opt_expr(self, node: ast.expr) -> Optional[Variable]:
"""Translation of an expression where "None" is permitted (eg., for an optional argument).
None is represented as a NameConstant in Python 3.7 and Constant in Python 3.9.
"""
if isinstance(node, (ast.NameConstant, ast.Constant)) and (node.value is None):
if isinstance(node, ast.Constant) and (node.value is None):
return None
return self._translate_expr(node)

Expand Down
2 changes: 1 addition & 1 deletion onnxscript/converter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def f1(A: FLOAT[...]) -> FLOAT[...]:
return r

ast_name = "_ast" if sys.version_info[:2] < (3, 9) else "ast"
self.check_failure(f1, f"Left term must be a tuple not '<class '{ast_name}.Name'>'")
self.check_failure(f1, f"Left term must be a tuple not '<class '{ast_name}.Constant'>'")

def check_run(self, onnxfn, inputs, expected_output):
# Test by converting to model and running with ORT
Expand Down
Loading