Improves einsum decomposition by using gemm and removing a transpose

_doc/sphinxdoc/source/api/onnxrt.rst

@@ -122,13 +122,13 @@ The following functions reduce the number of ONNX operators in a graph
 while keeping the same results. The optimized graph
 is left unchanged.
 
-.. autosignature:: mlprodict.onnxrt.optim.onnx_optimisation.onnx_remove_node
+.. autosignature:: mlprodict.onnx_tools.optim.onnx_optimisation.onnx_remove_node
 
-.. autosignature:: mlprodict.onnxrt.optim.onnx_optimisation_identity.onnx_remove_node_identity
+.. autosignature:: mlprodict.onnx_tools.optim.onnx_optimisation_identity.onnx_remove_node_identity
 
-.. autosignature:: mlprodict.onnxrt.optim.onnx_optimisation_redundant.onnx_remove_node_redundant
+.. autosignature:: mlprodict.onnx_tools.optim.onnx_optimisation_redundant.onnx_remove_node_redundant
 
-.. autosignature:: mlprodict.onnxrt.optim.onnx_remove_unused.onnx_remove_node_unused
+.. autosignature:: mlprodict.onnx_tools.optim.onnx_remove_unused.onnx_remove_node_unused
 
 Shapes
 ++++++

_doc/sphinxdoc/source/api/tools.rst

@@ -23,9 +23,9 @@ Functions to help understand models.
 
 .. autosignature:: mlprodict.onnxrt.model_checker.onnx_shaker
 
-.. autosignature:: mlprodict.onnxrt.optimisation._main_onnx_optim.onnx_optimisations
+.. autosignature:: mlprodict.onnx_tools.optimisation._main_onnx_optim.onnx_optimisations
 
-.. autosignature:: mlprodict.onnxrt.optim.onnx_statistics
+.. autosignature:: mlprodict.onnx_tools.optim.onnx_statistics
 
 .. autosignature:: mlprodict.tools.onnx_manipulations.select_model_inputs_outputs
 

_unittests/ut_documentation/test_run_notebooks_einsum_decomposition.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""
+@brief      test log(time=30s)
+"""
+import os
+import unittest
+from onnxruntime import __version__ as ort_version
+from sklearn.exceptions import ConvergenceWarning
+try:
+    from sklearn.utils._testing import ignore_warnings
+except ImportError:
+    from sklearn.utils.testing import ignore_warnings
+from pyquickhelper.loghelper import fLOG
+from pyquickhelper.ipythonhelper import test_notebook_execution_coverage
+from pyquickhelper.pycode import (
+    add_missing_development_version, ExtTestCase)
+from skl2onnx import __version__ as skl2onnx_version
+import mlprodict
+
+
+class TestNotebookOnnxDecomposition(ExtTestCase):
+
+    def setUp(self):
+        add_missing_development_version(["jyquickhelper"], __file__, hide=True)
+
+    @ignore_warnings(category=(UserWarning, ConvergenceWarning, RuntimeWarning))
+    def test_notebook_numpy_onnx(self):
+        fLOG(
+            __file__,
+            self._testMethodName,
+            OutputPrint=__name__ == "__main__")
+
+        self.assertNotEmpty(mlprodict is not None)
+        folder = os.path.join(os.path.dirname(__file__),
+                              "..", "..", "_doc", "notebooks")
+        test_notebook_execution_coverage(__file__, "einsum_decomposition", folder,
+                                         this_module_name="mlprodict", fLOG=fLOG)
+
+
+if __name__ == "__main__":
+    unittest.main()

_unittests/ut_onnx_grammar/test_onnx_grammar_bug.py → _unittests/ut_onnx_tools/test_onnx_grammar_bug.py

@@ -6,7 +6,7 @@
 import inspect
 from textwrap import dedent
 from pyquickhelper.pycode import ExtTestCase
-from mlprodict.onnx_grammar import CodeNodeVisitor
+from mlprodict.onnx_tools.onnx_grammar import CodeNodeVisitor
 
 
 class TestOnnxGrammarBug(ExtTestCase):

_unittests/ut_onnx_grammar/test_onnx_grammar_specific.py → _unittests/ut_onnx_tools/test_onnx_grammar_specific.py

@@ -7,10 +7,11 @@
 from sklearn.gaussian_process.kernels import ExpSineSquared, DotProduct, RationalQuadratic
 from skl2onnx import __version__ as skl2onnx_version
 from skl2onnx.algebra.onnx_ops import OnnxIdentity  # pylint: disable=E0611
-from mlprodict.onnx_grammar import translate_fct2onnx
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnx_grammar.onnx_translation import get_default_context, get_default_context_cpl
-from mlprodict.onnx_grammar.onnx_translation import (
+from mlprodict.onnx_tools.onnx_grammar import translate_fct2onnx
+from mlprodict.onnx_tools.onnx_grammar.onnx_translation import (
+    get_default_context, get_default_context_cpl)
+from mlprodict.onnx_tools.onnx_grammar.onnx_translation import (
     py_make_float_array, py_pow, squareform_pdist, py_mul, py_opp)
 from mlprodict.tools import get_opset_number_from_onnx
 

_unittests/ut_onnx_grammar/test_onnx_grammar_translate.py → _unittests/ut_onnx_tools/test_onnx_grammar_translate.py

@@ -7,8 +7,9 @@
 from textwrap import dedent
 import numpy
 from pyquickhelper.pycode import ExtTestCase
-from mlprodict.onnx_grammar import CodeNodeVisitor, translate_fct2onnx
-from mlprodict.onnx_grammar.onnx_translation import py_mul
+from mlprodict.onnx_tools.onnx_grammar import (
+    CodeNodeVisitor, translate_fct2onnx)
+from mlprodict.onnx_tools.onnx_grammar.onnx_translation import py_mul
 from mlprodict.onnxrt import OnnxInference
 from mlprodict.tools import get_opset_number_from_onnx
 

_unittests/ut_onnxrt/test_sklearn_helper.py → _unittests/ut_onnx_tools/test_sklearn_helper.py

@@ -21,9 +21,9 @@
 from skl2onnx.algebra.onnx_ops import (  # pylint: disable=E0611
     OnnxIdentity, OnnxAdd)
 from skl2onnx.common.data_types import FloatTensorType
-from mlprodict.onnxrt.optim.sklearn_helper import (
+from mlprodict.onnx_tools.optim.sklearn_helper import (
     enumerate_pipeline_models, inspect_sklearn_model, set_n_jobs)
-from mlprodict.onnxrt.optim.onnx_helper import onnx_statistics
+from mlprodict.onnx_tools.optim.onnx_helper import onnx_statistics
 from mlprodict.onnx_conv import to_onnx
 from mlprodict.tools import get_opset_number_from_onnx
 

_unittests/ut_onnxrt/test_onnx_helper.py

@@ -9,7 +9,7 @@
 from sklearn.datasets import load_iris
 from sklearn.cluster import KMeans
 from mlprodict.onnx_conv import to_onnx
-from mlprodict.onnxrt.optim.onnx_helper import change_input_first_dimension
+from mlprodict.onnx_tools.optim.onnx_helper import change_input_first_dimension
 from mlprodict.tools.onnx2py_helper import (
     to_bytes, from_bytes, numpy_max, numpy_min, _type_to_string,
     _numpy_array)

_unittests/ut_onnxrt/test_onnxrt_simple_gaussian_process.py

@@ -11,7 +11,7 @@
 from skl2onnx import __version__ as skl2onnx_version
 from mlprodict.onnx_conv import to_onnx
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnxrt.optim import onnx_optimisations
+from mlprodict.onnx_tools.optim import onnx_optimisations
 
 
 class TestOnnxrtSimpleGaussianProcess(ExtTestCase):

_unittests/ut_onnxrt/test_onnxrt_switch_types.py

@@ -16,7 +16,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxAdd  # pylint: disable=E0611
 from mlprodict.onnx_conv import to_onnx
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnxrt.optim.sklearn_helper import (
+from mlprodict.onnx_tools.optim.sklearn_helper import (
     enumerate_fitted_arrays, pairwise_array_distances)
 from mlprodict.tools import get_opset_number_from_onnx
 

_unittests/ut_onnxrt/test_optim_onnx_identity.py

@@ -13,9 +13,9 @@
 from skl2onnx.common.data_types import FloatTensorType
 from skl2onnx.algebra.complex_functions import onnx_cdist
 from mlprodict.onnx_conv import to_onnx
-from mlprodict.onnxrt.optim.onnx_helper import onnx_statistics
+from mlprodict.onnx_tools.optim.onnx_helper import onnx_statistics
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnxrt.optim import onnx_remove_node_identity
+from mlprodict.onnx_tools.optim import onnx_remove_node_identity
 from mlprodict.tools import get_opset_number_from_onnx
 
 

_unittests/ut_onnxrt/test_optim_onnx_redundant.py

@@ -8,9 +8,9 @@
     OnnxAdd, OnnxMul, OnnxSub, OnnxIdentity
 )
 from skl2onnx.common.data_types import FloatTensorType
-from mlprodict.onnxrt.optim.onnx_helper import onnx_statistics
+from mlprodict.onnx_tools.optim.onnx_helper import onnx_statistics
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnxrt.optim import (
+from mlprodict.onnx_tools.optim import (
     onnx_remove_node_redundant, onnx_remove_node, onnx_optimisations)
 from mlprodict.tools import get_opset_number_from_onnx
 

_unittests/ut_onnxrt/test_optim_onnx_unused.py

@@ -6,9 +6,9 @@
 from pyquickhelper.pycode import ExtTestCase
 from skl2onnx.algebra.onnx_ops import (  # pylint: disable=E0611
     OnnxAdd, OnnxMul, OnnxSub)
-from mlprodict.onnxrt.optim.onnx_helper import onnx_statistics
+from mlprodict.onnx_tools.optim.onnx_helper import onnx_statistics
 from mlprodict.onnxrt import OnnxInference
-from mlprodict.onnxrt.optim import onnx_remove_node_unused
+from mlprodict.onnx_tools.optim import onnx_remove_node_unused
 from mlprodict.tools.onnx_manipulations import (
     select_model_inputs_outputs)
 from mlprodict.tools import get_opset_number_from_onnx