include onnxutils tests in CI, add a unit test on DataTypes, update optimizer (#283)

* add a unit test on DataTypes

* update CI with onnxutils pytest (for onnxconverter-common)

* list() instead of list.copy() for python 2.7 compatibility in optimizer

Author: xadupre

.azure-pipelines/linux-conda-CI.yml

@@ -55,7 +55,13 @@ jobs:
       python -c "import onnxconverter_common"
       test '$(python.version)' != '2.7' && python -c "import onnxruntime"
       pytest tests --doctest-modules --junitxml=junit/test-results.xml
-    displayName: 'pytest'
+    displayName: 'pytest - onnxmltools'
+
+  - script: |
+      export PYTHONPATH=$PYTHONPATH:libsvm/python
+      python -c "import onnxconverter_common"
+      pytest onnxutils/tests --doctest-modules --junitxml=junit/test-results-onnxutils.xml
+    displayName: 'pytest - onnxutils'
 
   - task: PublishTestResults@2
     inputs:

.azure-pipelines/win32-conda-CI.yml

@@ -67,7 +67,13 @@ jobs:
       set PYTHONPATH=libsvm\python;%PYTHONPATH%
       pip install -e .
       pytest tests --doctest-modules --junitxml=junit/test-results.xml
-    displayName: 'pytest'
+    displayName: 'pytest - onnxmltools'
+
+  - script: |
+      call activate py$(python.version)
+      set PYTHONPATH=libsvm\python;%PYTHONPATH%
+      pytest onnxutils/tests --doctest-modules --junitxml=junit/test-results-onnxutils.xml
+    displayName: 'pytest - onnxutils'
 
   - task: PublishTestResults@2
     inputs:

onnxutils/onnxconverter_common/data_types.py

@@ -8,6 +8,7 @@
 import onnx
 from onnx import onnx_pb as onnx_proto
 
+
 class DataType(object):
     def __init__(self, shape=None, doc_string=''):
         self.shape = shape

onnxutils/onnxconverter_common/optimizer.py

@@ -381,7 +381,8 @@ class FanOutSolution(Solution):
     number = 0
     def apply(self, node_list):
         cur_perm = Solution.get_perm(self.begin_n.origin)
-        successor_list = self.end_p.successor.copy()
+        # make a copy of self.end_p.successor
+        successor_list = list(self.end_p.successor)
 
         for suc in successor_list:
             nnode = LinkedNode(
@@ -413,7 +414,8 @@ def apply(self, node_list):
                 perm=self.perm,
                 name='TransposeFanIn' + str(FanInSolution.number)))
         FanInSolution.number = FanInSolution.number + 1
-        precedence_list = self.begin.precedence.copy()
+        # make a copy of self.begin.precedence
+        precedence_list = list(self.begin.precedence)
         node_list = Solution.add_siso_node(node_list, self.begin, self.begin_n, list(self.begin.output.values())[0], nnode)
         for branch in precedence_list:
             node_list = Solution.delete_node_1ton(node_list, branch.precedence[0], branch, self.begin)

onnxutils/tests/test_onnx.py

@@ -0,0 +1,20 @@
+import unittest
+from onnxconverter_common.data_types import FloatTensorType
+
+
+class TestTypes(unittest.TestCase):
+
+    def test_to_onnx_type(self):
+        dt = FloatTensorType((1, 5))
+        assert str(dt) == 'FloatTensorType(shape=(1, 5))'
+        onx = dt.to_onnx_type()
+        assert "dim_value: 5" in str(onx)
+        tt = onx.tensor_type
+        assert "dim_value: 5" in str(tt)
+        assert tt.elem_type == 1
+        o = onx.sequence_type
+        assert str(o) == ""
+        
+
+if __name__ == '__main__':
+    unittest.main()