Refactoring and fixes minor bugs in light API (#62)

* fix minour bugs in light API

* refactoring

* complete refactoring

* fix unit test file

* fix wrong import

* improve shape handling

* move files

* fix documentation

* doc

Author: xadupre

_doc/api/index.rst

@@ -9,6 +9,7 @@ API
     array_api
     graph_api
     light_api
+    translate_api
     npx_core_api
     npx_functions
     npx_jit_eager

_doc/api/light_api.rst

@@ -11,17 +11,10 @@ start
 
 .. autofunction:: onnx_array_api.light_api.start
 
-translate
-+++++++++
-
-.. autofunction:: onnx_array_api.light_api.translate
-
-make_helper
-+++++++++++
+g
++
 
-.. autofunction:: onnx_array_api.light_api.make_helper.make_node_extended
-
-.. autofunction:: onnx_array_api.light_api.make_helper.make_ref_attribute
+.. autofunction:: onnx_array_api.light_api.g
 
 Classes for the Light API
 =========================
@@ -69,39 +62,6 @@ Vars
     :members:
     :inherited-members:
 
-Classes for the Translater
-==========================
-
-BaseEmitter
-+++++++++++
-
-.. autoclass:: onnx_array_api.light_api.base_emitter.BaseEmitter
-    :members:
-
-EventType
-+++++++++
-
-.. autoclass:: onnx_array_api.light_api.base_emitter.EventType
-    :members:
-
-InnerEmitter
-++++++++++++
-
-.. autoclass:: onnx_array_api.light_api.inner_emitter.InnerEmitter
-    :members:
-
-LightEmitter
-++++++++++++
-
-.. autoclass:: onnx_array_api.light_api.light_emitter.LightEmitter
-    :members:
-
-Translater
-++++++++++
-
-.. autoclass:: onnx_array_api.light_api.translate.Translater
-    :members:
-
 Available operators
 ===================
 

_doc/api/translate_api.rst

@@ -0,0 +1,52 @@
+============================
+onnx_array_api.translate_api
+============================
+
+
+Main API
+========
+
+translate
++++++++++
+
+.. autofunction:: onnx_array_api.translate_api.translate
+
+make_helper
++++++++++++
+
+.. autofunction:: onnx_array_api.translate_api.make_helper.make_node_extended
+
+.. autofunction:: onnx_array_api.translate_api.make_helper.make_ref_attribute
+
+Classes for the Translater
+==========================
+
+BaseEmitter
++++++++++++
+
+.. autoclass:: onnx_array_api.translate_api.base_emitter.BaseEmitter
+    :members:
+
+EventType
++++++++++
+
+.. autoclass:: onnx_array_api.translate_api.base_emitter.EventType
+    :members:
+
+InnerEmitter
+++++++++++++
+
+.. autoclass:: onnx_array_api.translate_api.inner_emitter.InnerEmitter
+    :members:
+
+LightEmitter
+++++++++++++
+
+.. autoclass:: onnx_array_api.translate_api.light_emitter.LightEmitter
+    :members:
+
+Translater
+++++++++++
+
+.. autoclass:: onnx_array_api.translate_api.translate.Translater
+    :members:

_unittests/ut_light_api/test_backend_export.py

@@ -22,8 +22,8 @@
 from onnx.numpy_helper import from_array, to_array
 from onnx.backend.base import Device, DeviceType
 from onnx_array_api.reference import ExtendedReferenceEvaluator
-from onnx_array_api.light_api.make_helper import make_node_extended
-from onnx_array_api.light_api import translate
+from onnx_array_api.translate_api.make_helper import make_node_extended
+from onnx_array_api.translate_api import translate
 from onnx_array_api.plotting.text_plot import onnx_simple_text_plot
 
 verbosity = 10 if "-v" in sys.argv or "--verbose" in sys.argv else 0

_unittests/ut_light_api/test_light_api.py

@@ -211,7 +211,7 @@ def test_neg(self):
         self.assertIsInstance(v, Var)
         self.assertEqual(["X"], v.parent.input_names)
         s = str(v)
-        self.assertEqual("X:FLOAT", s)
+        self.assertEqual("X:FLOAT:[]", s)
         onx = start().vin("X").Neg().rename("Y").vout().to_onnx()
         self.assertIsInstance(onx, ModelProto)
         ref = ReferenceEvaluator(onx)
@@ -510,7 +510,23 @@ def ah(self):
         expected = (a > 0).astype(int).astype(np.float32).reshape((-1, 1))
         self.assertEqualArray(expected, got)
 
+    def test_input_shape(self):
+        kernel = (np.arange(9) + 1).reshape(3, 3).astype(np.float32)
+        model = (
+            start()
+            .vin("X", shape=[None, None])
+            .cst(kernel[np.newaxis, np.newaxis, ...])
+            .rename("W")
+            .bring("X", "W")
+            .Conv(pads=[1, 1, 1, 1])
+            .rename("Y")
+            .vout(shape=[])
+            .to_onnx()
+        )
+        i = str(model.graph.input[0]).replace("\n", "").replace(" ", "")
+        self.assertNotIn("shape{}", i)
+
 
 if __name__ == "__main__":
-    TestLightApi().test_domain()
+    TestLightApi().test_add()
     unittest.main(verbosity=2)

_unittests/ut_light_api/_data/custom_ops_type_inference_fails_0.onnx renamed to _unittests/ut_translate_api/_data/custom_ops_type_inference_fails_0.onnx

@@ -5,8 +5,9 @@
 from onnx.defs import onnx_opset_version
 from onnx.reference import ReferenceEvaluator
 from onnx_array_api.ext_test_case import ExtTestCase
-from onnx_array_api.light_api import start, translate, g
-from onnx_array_api.light_api.base_emitter import EventType
+from onnx_array_api.light_api import start, g
+from onnx_array_api.translate_api import translate
+from onnx_array_api.translate_api.base_emitter import EventType
 
 OPSET_API = min(19, onnx_opset_version() - 1)
 

_unittests/ut_light_api/_data/stft_inlined_batch_1.onnx renamed to _unittests/ut_translate_api/_data/stft_inlined_batch_1.onnx

@@ -15,7 +15,8 @@
 )
 from onnx.checker import check_model
 from onnx_array_api.ext_test_case import ExtTestCase
-from onnx_array_api.light_api import start, translate
+from onnx_array_api.light_api import start
+from onnx_array_api.translate_api import translate
 
 OPSET_API = min(19, onnx_opset_version() - 1)
 
@@ -335,7 +336,7 @@ def _run(cls, code):
         import onnx
         import onnx.helper
         import onnx.numpy_helper
-        import onnx_array_api.light_api.make_helper
+        import onnx_array_api.translate_api.make_helper
         import onnx.reference.custom_element_types
 
         def from_array_extended(tensor, name=None):
@@ -362,7 +363,7 @@ def from_array_extended(tensor, name=None):
         globs = onnx.__dict__.copy()
         globs.update(onnx.helper.__dict__)
         globs.update(onnx.numpy_helper.__dict__)
-        globs.update(onnx_array_api.light_api.make_helper.__dict__)
+        globs.update(onnx_array_api.translate_api.make_helper.__dict__)
         globs.update(onnx.reference.custom_element_types.__dict__)
         globs["from_array_extended"] = from_array_extended
         locs = {}

_unittests/ut_light_api/test_translate.py renamed to _unittests/ut_translate_api/test_translate.py

@@ -56,7 +56,7 @@ def get_parser_translate() -> ArgumentParser:
 
 
 def _cmd_translate(argv: List[Any]):
-    from .light_api import translate
+    from .translate_api import translate
 
     parser = get_parser_translate()
     args = parser.parse_args(argv[1:])