More fixes

Signed-off-by: Justin Chu <[email protected]>

Author: justinchuby

.github/workflows/lint.yml

@@ -63,7 +63,7 @@ jobs:
           if ! lintrunner --force-color --all-files --tee-json=lint.json -v; then
               echo ""
               echo -e "\e[1m\e[36mYou can reproduce these results locally by using \`lintrunner\`.\e[0m"
-              echo -e "\e[1m\e[36mSee https://github.com/microsoft/onnxscript#coding-style for setup instructions.\e[0m"
+              echo -e "\e[1m\e[36mSee https://github.com/onnx/onnx_ir/blob/main/CONTRIBUTING.md for setup instructions.\e[0m"
               exit 1
           fi
       - name: Produce SARIF

src/onnx_ir/__init__.py

@@ -84,8 +84,8 @@
 ]
 
 from onnx_ir import convenience, external_data, passes, serde, tape, traversal
-from onnxscript.ir._convenience._constructors import node, tensor
-from onnxscript.ir._core import (
+from onnx_ir._convenience._constructors import node, tensor
+from onnx_ir._core import (
     Attr,
     AttrFloat32,
     AttrFloat32s,
@@ -121,12 +121,12 @@
     TypeAndShape,
     Value,
 )
-from onnxscript.ir._enums import (
+from onnx_ir._enums import (
     AttributeType,
     DataType,
 )
-from onnxscript.ir._io import load, save
-from onnxscript.ir._protocols import (
+from onnx_ir._io import load, save
+from onnx_ir._protocols import (
     ArrayCompatible,
     AttributeProtocol,
     DLPackCompatible,
@@ -145,7 +145,7 @@
     TypeProtocol,
     ValueProtocol,
 )
-from onnxscript.ir.serde import TensorProtoTensor, from_onnx_text, from_proto, to_proto
+from onnx_ir.serde import TensorProtoTensor, from_onnx_text, from_proto, to_proto
 
 
 def __set_module() -> None:

src/onnx_ir/_convenience/_constructors_test.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 import onnx_ir as ir
-from onnxscript.ir._convenience import _constructors
+from onnx_ir._convenience import _constructors
 
 
 class ConstructorsTest(unittest.TestCase):

src/onnx_ir/_core.py

@@ -44,7 +44,7 @@
 import numpy as np
 from typing_extensions import TypeIs
 
-import onnxscript
+import onnx_ir
 from onnx_ir import (
     _display,
     _enums,
@@ -186,7 +186,7 @@ def display(self, *, page: bool = False) -> None:
 
             status_manager = rich.status.Status(f"Computing tensor stats for {self!r}")
 
-        from onnxscript._thirdparty import (  # pylint: disable=import-outside-toplevel
+        from onnx_ir._thirdparty import (  # pylint: disable=import-outside-toplevel
             asciichartpy,
         )
 
@@ -582,7 +582,7 @@ def __init__(
         # NOTE: Do not verify the location by default. This is because the location field
         # in the tensor proto can be anything and we would like deserialization from
         # proto to IR to not fail.
-        if onnxscript.DEBUG:
+        if onnx_ir.DEBUG:
             if os.path.isabs(location):
                 raise ValueError(
                     "The location must be a relative path. Please specify base_dir as well."
@@ -2052,7 +2052,7 @@ def const_value(
         self,
         value: _protocols.TensorProtocol | None,
     ) -> None:
-        if onnxscript.DEBUG:
+        if onnx_ir.DEBUG:
             if value is not None and not isinstance(value, _protocols.TensorProtocol):
                 raise TypeError(
                     f"Expected value to be a TensorProtocol or None, got '{type(value)}'"
@@ -2469,7 +2469,7 @@ def sort(self) -> None:
             ValueError: If the graph contains a cycle, making topological sorting impossible.
         """
         # Obtain all nodes from the graph and its subgraphs for sorting
-        nodes = list(onnxscript.ir.traversal.RecursiveGraphIterator(self))
+        nodes = list(onnx_ir.traversal.RecursiveGraphIterator(self))
         # Store the sorted nodes of each subgraph
         sorted_nodes_by_graph: dict[Graph, list[Node]] = {
             graph: [] for graph in {node.graph for node in nodes if node.graph is not None}
@@ -2858,7 +2858,7 @@ def graphs(self) -> Iterable[Graph]:
         """Get all graphs and subgraphs in the model.
 
         This is a convenience method to traverse the model. Consider using
-        `onnxscript.ir.traversal.RecursiveGraphIterator` for more advanced
+        `onnx_ir.traversal.RecursiveGraphIterator` for more advanced
         traversals on nodes.
         """
         # NOTE(justinchuby): Given
@@ -2868,7 +2868,7 @@ def graphs(self) -> Iterable[Graph]:
         # I created this method as a core method instead of an iterator in
         # `traversal.py`.
         seen_graphs: set[Graph] = set()
-        for node in onnxscript.ir.traversal.RecursiveGraphIterator(self.graph):
+        for node in onnx_ir.traversal.RecursiveGraphIterator(self.graph):
             if node.graph is not None and node.graph not in seen_graphs:
                 seen_graphs.add(node.graph)
                 yield node.graph
@@ -3226,7 +3226,7 @@ def as_strings(self) -> Sequence[str]:
         """Get the attribute value as a sequence of strings."""
         if not isinstance(self.value, Sequence):
             raise TypeError(f"Value of attribute '{self!r}' is not a Sequence.")
-        if onnxscript.DEBUG:
+        if onnx_ir.DEBUG:
             if not all(isinstance(x, str) for x in self.value):
                 raise TypeError(f"Value of attribute '{self!r}' is not a Sequence of strings.")
         # Create a copy of the list to prevent mutation
@@ -3236,7 +3236,7 @@ def as_tensors(self) -> Sequence[_protocols.TensorProtocol]:
         """Get the attribute value as a sequence of tensors."""
         if not isinstance(self.value, Sequence):
             raise TypeError(f"Value of attribute '{self!r}' is not a Sequence.")
-        if onnxscript.DEBUG:
+        if onnx_ir.DEBUG:
             if not all(isinstance(x, _protocols.TensorProtocol) for x in self.value):
                 raise TypeError(f"Value of attribute '{self!r}' is not a Sequence of tensors.")
         # Create a copy of the list to prevent mutation
@@ -3246,7 +3246,7 @@ def as_graphs(self) -> Sequence[Graph]:
         """Get the attribute value as a sequence of graphs."""
         if not isinstance(self.value, Sequence):
             raise TypeError(f"Value of attribute '{self!r}' is not a Sequence.")
-        if onnxscript.DEBUG:
+        if onnx_ir.DEBUG:
             if not all(isinstance(x, Graph) for x in self.value):
                 raise TypeError(f"Value of attribute '{self!r}' is not a Sequence of graphs.")
         # Create a copy of the list to prevent mutation

src/onnx_ir/_display_test.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 
-import onnxscript.ir as ir
+import onnx_ir as ir
 
 
 class DisplayTest(unittest.TestCase):

src/onnx_ir/_graph_containers.py

@@ -14,8 +14,6 @@
 import collections
 from typing import TYPE_CHECKING, Iterable, SupportsIndex
 
-import onnxscript
-
 if TYPE_CHECKING:
     from onnx_ir import _core
 
@@ -132,7 +130,7 @@ class GraphInputs(_GraphIO):
 
     def _check_invariance(self) -> None:
         """Check the invariance of the graph."""
-        if not onnxscript.DEBUG:
+        if not onnx_ir.DEBUG:
             return
         for value in self.data:
             if value._graph is self._graph:
@@ -170,7 +168,7 @@ class GraphOutputs(_GraphIO):
 
     def _check_invariance(self) -> None:
         """Check the invariance of the graph."""
-        if not onnxscript.DEBUG:
+        if not onnx_ir.DEBUG:
             return
         for value in self.data:
             if value._graph is self._graph:

src/onnx_ir/_io.py

@@ -12,7 +12,7 @@
 
 from onnx_ir import _core, serde
 from onnx_ir import external_data as _external_data
-from onnxscript.ir._polyfill import zip
+from onnx_ir._polyfill import zip
 
 
 def load(path: str | os.PathLike, format: str | None = None) -> _core.Model: