chore(lint): disable mypy warn_any_return

ghstack-source-id: bd109a0
Pull Request resolved: #248

Author: justinchuby

onnxscript/backend/onnx_backend.py

@@ -74,7 +74,7 @@ def _read_proto_from_file(full):
             seq = onnx.SequenceProto()
             try:
                 seq.ParseFromString(serialized)
-                loaded = to_list(seq)
+                loaded = to_list(seq)  # type: ignore[assignment]
             except Exception:  # pylint: disable=W0703
                 try:
                     loaded = onnx.load_model_from_string(serialized)

onnxscript/backend/onnx_export.py

@@ -207,7 +207,10 @@ def _python_make_node_graph(self, graph, opsets, indent=0, output_names=None):
         if hasattr(graph, "initializer"):
             for init in graph.initializer:
                 node = make_node(
-                    "Constant", [], [self._rename_variable(init.name)], value=init
+                    "Constant",
+                    [],
+                    [self._rename_variable(init.name)],  # type: ignore[list-item]
+                    value=init,
                 )
                 code.append(self._python_make_node(node, opsets, indent=indent))
         if hasattr(graph, "sparse_initializer") and len(graph.sparse_initializer) > 0:

onnxscript/function_libs/tools/torch_aten/generate_aten_signatures.py

@@ -192,7 +192,7 @@ def format_arg_name(arg: torchgen.model.Argument) -> str:
     """Returns the python compatible name of the given argument."""
     if arg.name == "from":
         return f"{arg.name}_"
-    return arg.name  # type: ignore[no-any-return]
+    return arg.name
 
 
 def create_signature(func: torchgen.model.NativeFunction) -> cg.FunctionDef:

onnxscript/irbuilder.py

@@ -7,7 +7,7 @@
 import io
 import logging
 import warnings
-from typing import Any, Dict, Optional, Sequence, Tuple, Union
+from typing import Any, Optional, Sequence
 
 import onnx
 from onnx import ValueInfoProto, helper
@@ -185,7 +185,7 @@ def __init__(self, name: str, domain: str = "") -> None:
         self.stmts: list[IRStmt] = []
         self.attrs: list[str] = []  # attribute parameters
         self.attr_protos: list[
-            onnx.AttributeProto
+            IRAttributeValue
         ] = []  # attribute parameters with default value
         self.called_functions: dict[str, onnx.FunctionProto] = {}
         self.docstring: str = ""
@@ -218,7 +218,7 @@ def append_input(self, name: IRVar) -> None:
     def append_output(self, name: IRVar) -> None:
         self.outputs.append(name)
 
-    def add_attr_parameter(self, attr: Union[str, IRAttributeValue]) -> None:
+    def add_attr_parameter(self, attr: str | IRAttributeValue) -> None:
         if isinstance(attr, IRAttributeValue):
             self.attr_protos.append(attr)
         else:
@@ -324,7 +324,7 @@ def to_proto(f):
 
     def to_graph_and_functions(
         self, use_default_type: bool = True
-    ) -> Tuple[onnx.GraphProto, dict[str, onnx.FunctionProto]]:
+    ) -> tuple[onnx.GraphProto, dict[str, onnx.FunctionProto]]:
         """Converts this instance into a `onnx.GraphProto` and a map from
         function-name to `onnx.FunctionProto`.
 
@@ -360,7 +360,7 @@ def to_graph_proto(self, use_default_type: bool = True) -> onnx.GraphProto:
         graph, _ = self.to_graph_and_functions(use_default_type=use_default_type)
         return graph
 
-    def get_opset_import(self) -> Dict[str, int]:
+    def get_opset_import(self) -> dict[str, int]:
         func_opset_imports = {}
         for s in self.stmts:
             if s.callee.opset.domain not in func_opset_imports:

onnxscript/main.py

@@ -9,6 +9,7 @@
 import inspect
 import sys
 import textwrap
+from typing import Any, Callable, Optional
 
 import onnx.helper
 
@@ -52,7 +53,11 @@ def script_check(f: ast.FunctionDef, opset, global_names, source, default_opset=
     return convert.top_level_stmt(f)
 
 
-def script(opset=None, default_opset=None, **kwargs):
+def script(
+    opset: Optional[values.Opset] = None,
+    default_opset: Optional[values.Opset] = None,
+    **kwargs: Any,
+) -> Callable[[Callable[..., Any]], onnxscript.OnnxFunction]:
     """Main decorator. Declares a function as an onnx function.
 
     Args:

onnxscript/tensor.py

@@ -55,7 +55,7 @@ def __float__(self) -> float:
         return float(self.value)
 
     def __index__(self) -> int:
-        return self.value.__index__()  # type: ignore[no-any-return]
+        return self.value.__index__()
 
     def __getitem__(self, index):
         op = self._opset

onnxscript/test/common/onnx_script_test_case.py

@@ -54,11 +54,11 @@ def setUpClass(cls):
         try:
             # experimental version
             # pylint: disable=no-value-for-parameter
-            cls.all_test_cases = node_test.collect_testcases()  # type: ignore[attr-defined]
+            cls.all_test_cases = node_test.collect_testcases()  # type: ignore[attr-defined,call-arg]
             # pylint: enable=no-value-for-parameter
         except TypeError:
             # official version
-            cls.all_test_cases = node_test.collect_testcases(None)  # type: ignore[attr-defined]
+            cls.all_test_cases = node_test.collect_testcases(None)  # type: ignore[attr-defined,arg-type]
 
     def _create_model_from_param(
         self, param: FunctionTestParams, onnx_case_model: onnx.ModelProto

onnxscript/test/function_libs/torch_aten/ops_correctness_test.py

@@ -156,7 +156,8 @@ def wrapped(fn):
 # Modify this section ##########################################################
 
 # Ops to be tested for numerical consistency between onnx and pytorch
-OPINFO_FUNCTION_MAPPING = {
+# Find the names of the OpInfos in torch/testing/_internal/common_methods_invocations.py
+OPINFO_FUNCTION_MAPPING: dict[str, Callable[..., Any]] = {
     "add": core_ops.aten_add,
     "mul": core_ops.aten_mul,
     "nn.functional.elu": nn_ops.aten_elu,

onnxscript/utils.py

@@ -20,7 +20,7 @@
     from onnx.printer import to_text as proto2text
 except ImportError:
 
-    def proto2text(x):  # pylint: disable=unused-argument
+    def proto2text(_: Any) -> str:
         return "<print utility unavailable>"
 
 

onnxscript/values.py

@@ -63,7 +63,7 @@ def __contains__(self, opname):
             return False
 
     def __str__(self) -> str:
-        return self.domain  # type: ignore[no-any-return]
+        return self.domain
 
     def __getattr__(self, attr: str):
         try: