Fixes #185, add operator LessOrEqual

_unittests/ut_testing/test_LONG_sklearn_example.py

@@ -1,5 +1,5 @@
 """
-@brief      test log(time=41s)
+@brief      test log(time=61s)
 """
 import unittest
 import os

_unittests/ut_testing/test_experimental.py

@@ -24,8 +24,7 @@ def ort_path(self, x, pads):
         op = helper.make_node('Pad', ['X', 'P'], ['Y'])
         graph = helper.make_graph([op], 'graph', [X, P], [Y])
         model = helper.make_model(graph, producer_name='model')
-        op_set = model.opset_import.add()
-        op_set.domain = ''
+        op_set = model.opset_import[0]  # pylint: disable=E1101
         op_set.version = get_opset_number_from_onnx()
         sess = InferenceSession(model.SerializeToString())
         return numpy.squeeze(sess.run(['Y'], {'X': x, 'P': npads}))

appveyor.yml

@@ -5,9 +5,6 @@ environment:
     - PYTHON: "C:\\Python38-x64"
       PYTHON_VERSION: "3.8.x"
       PYTHON_ARCH: "64"
-    - PYTHON: "C:\\Python37-x64"
-      PYTHON_VERSION: "3.7.x"
-      PYTHON_ARCH: "64"
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 

mlprodict/onnxrt/ops_cpu/_op_list.py

@@ -41,15 +41,14 @@
 from .op_gather_elements import GatherElements
 from .op_gemm import Gemm
 from .op_global_average_pool import GlobalAveragePool
-from .op_greater import Greater
-from .op_greater_or_equal import GreaterOrEqual
+from .op_greater import Greater, GreaterOrEqual
 from .op_floor import Floor
 from .op_identity import Identity
 from .op_if import If
 from .op_imputer import Imputer
 from .op_isnan import IsNaN
 from .op_label_encoder import LabelEncoder
-from .op_less import Less
+from .op_less import Less, LessOrEqual
 from .op_linear_classifier import LinearClassifier
 from .op_linear_regressor import LinearRegressor
 from .op_log import Log

mlprodict/onnxrt/ops_cpu/op_greater.py

@@ -18,3 +18,15 @@ def _run(self, a, b):  # pylint: disable=W0221
 
     def to_python(self, inputs):
         return self._to_python_numpy(inputs, self.__class__.__name__.lower())
+
+
+class GreaterOrEqual(OpRunBinary):
+
+    def __init__(self, onnx_node, desc=None, **options):
+        OpRunBinary.__init__(self, onnx_node, desc=desc, **options)
+
+    def _run(self, a, b):  # pylint: disable=W0221
+        return (numpy.greater_equal(a, b), )
+
+    def to_python(self, inputs):
+        return self._to_python_numpy(inputs, "greater_equal")

mlprodict/onnxrt/ops_cpu/op_less.py

@@ -18,3 +18,15 @@ def _run(self, a, b):  # pylint: disable=W0221
 
     def to_python(self, inputs):
         return self._to_python_numpy(inputs, self.__class__.__name__.lower())
+
+
+class LessOrEqual(OpRunBinary):
+
+    def __init__(self, onnx_node, desc=None, **options):
+        OpRunBinary.__init__(self, onnx_node, desc=desc, **options)
+
+    def _run(self, a, b):  # pylint: disable=W0221
+        return (numpy.less_equal(a, b), )
+
+    def to_python(self, inputs):
+        return self._to_python_numpy(inputs, "less_equal")