Merge

Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com>

Author: justinchuby

onnxscript/_converter.py

@@ -5,31 +5,26 @@
 from __future__ import annotations
 
 import ast
-from collections import defaultdict
 import dataclasses
 import logging
+from collections import defaultdict
 from typing import (
-    TYPE_CHECKING,
     Any,
     Dict,
     List,
-    Mapping,
     NoReturn,
     Optional,
     Sequence,
     Tuple,
     Union,
-    _GenericAlias
 )
 
 import onnx_ir as ir
-from onnxscript.ir import _schemas
 
 import onnxscript
 from onnxscript import onnx_types, sourceinfo, values
 from onnxscript import type_annotation as ta
-from onnxscript._internal import _analysis, ast_utils, autocast
-
+from onnxscript._internal import analysis, ast_utils, autocast
 
 logger = logging.getLogger(__name__)
 

onnxscript/_internal/_analysis.py onnxscript/_internal/analysis.pyonnxscript/_internal/_analysis.py renamed to onnxscript/_internal/analysis.py

@@ -4,15 +4,11 @@
 from __future__ import annotations
 
 import ast
-from typing import Any, Optional, Sequence, TYPE_CHECKING
-from collections import defaultdict
+from typing import Any, Optional, Sequence
 
 from onnxscript import sourceinfo
 from onnxscript._internal import ast_utils
 
-if TYPE_CHECKING:
-    from onnxscript import _converter
-
 
 def _get_loop_var(for_stmt: ast.For, formatter: sourceinfo.Formatter) -> str:
     if not isinstance(for_stmt.target, ast.Name):

onnxscript/_internal/_analysis_test.py onnxscript/_internal/analysis_test.pyonnxscript/_internal/_analysis_test.py renamed to onnxscript/_internal/analysis_test.py

@@ -6,7 +6,7 @@
 import unittest
 from typing import Any
 
-from onnxscript._internal import _analysis, ast_utils
+from onnxscript._internal import analysis, ast_utils
 from onnxscript.onnx_opset import opset15 as op
 from onnxscript.sourceinfo import formatter
 
@@ -33,7 +33,7 @@ def generic_visit(self, node):
 class TestLivenessAnalysis(unittest.TestCase):
     def analyze(self, fun):
         source, parse_tree = ast_utils.get_src_and_ast(fun)
-        analyzer = _analysis.AstAnalyzer(parse_tree, formatter(source))
+        analyzer = analysis.AstAnalyzer(parse_tree, formatter(source))
         visitor = AnalysisResultsVisitor(analyzer)
         visitor.visit(parse_tree)
         return visitor.results

onnxscript/ir/_schemas.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import collections.abc
-import copy
 import dataclasses
 import inspect
 import logging

onnxscript/irbuilder.py

@@ -194,6 +194,7 @@ class IRStmt:
     - `sub_functions`: A dictionary of sub-functions that this statement may call, mapping
       function names to `onnx.FunctionProto` instances.
     """
+
     def __init__(
         self,
         result: Sequence[str],

onnxscript/values.py

@@ -8,7 +8,6 @@
 import logging
 import types
 import typing
-from enum import IntFlag
 from typing import (  # type: ignore[attr-defined]
     Any,
     Callable,
@@ -18,14 +17,13 @@
     Protocol,
     Sequence,
     TypeVar,
-    _GenericAlias,
 )
 
 import onnx
 import onnx.defs
 from typing_extensions import ParamSpec
 
-from onnxscript import _converter, irbuilder, sourceinfo, type_annotation
+from onnxscript import _converter, irbuilder, type_annotation
 from onnxscript._internal import ast_utils, deprecation
 from onnxscript.ir import _schemas