update CI to verify onnx 1.12.0 (#564)

* update CI to verify onnx 1.12 rc.

Signed-off-by: xiaowuhu <[email protected]>

verify onnx 1.12 rc on python 3.9.

* Update test_LightGbmTreeEnsembleConverters.py

Signed-off-by: xiaowuhu <[email protected]>

change StrictVersion to LooseVersion.

* Update test_LightGbmTreeEnsembleConverters.py

Signed-off-by: xiaowuhu <[email protected]>

fix typo.

* Update test_LightGbmTreeEnsembleConverters.py

Signed-off-by: xiaowuhu <[email protected]>

fix typo.

* Update tests_helper.py

Signed-off-by: xiaowuhu <[email protected]>

fix typo.

* Update test_LightGbmTreeEnsembleConverters.py

Signed-off-by: xiaowuhu <[email protected]>

change string condition to bool condition.

* Update test_LightGbmTreeEnsembleConverters.py

Signed-off-by: xiaowuhu <[email protected]>

* change strict to loose

Signed-off-by: xiaowuhu <[email protected]>

* Update test_SVMConverters.py

Signed-off-by: xiaowuhu <[email protected]>

* verify onnx 1.12.0

Signed-off-by: xiaowuhu <[email protected]>

Verify onnx 1.12.0 release version

* change versioning API

Signed-off-by: xiaowuhu <[email protected]>

change StrictVersion to packaging.version, because StrictVersion will be deprecated.

Author: xiaowuhu

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

@@ -14,6 +14,13 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
+
+      Python39-1120-RT1110:
+        python.version: '3.9'
+        ONNX_PATH: 'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
+        ONNXRT_PATH: onnxruntime==1.11.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
+        COREML_PATH: git+https://github.com/apple/[email protected]
+
       Python39-1110-RT1110:
         python.version: '3.9'
         ONNX_PATH: onnx==1.11.0  # '-i https://test.pypi.org/simple/ onnx==1.9.101'

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

@@ -15,6 +15,12 @@ jobs:
   strategy:
     matrix:
 
+      Python39-1120-RT1110:
+        python.version: '3.9'
+        ONNX_PATH: 'onnx==1.12.0' # '-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
+        ONNXRT_PATH: onnxruntime==1.11.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
+        COREML_PATH: git+https://github.com/apple/[email protected]
+
       Python39-1110-RT1110:
         python.version: '3.9'
         ONNX_PATH: onnx==1.11.0  # '-i https://test.pypi.org/simple/ onnx==1.9.101'

onnxmltools/convert/main.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import warnings
-from distutils.version import StrictVersion
+import packaging.version as pv
 import onnx
 from .common import utils
 
@@ -34,7 +34,7 @@ def convert_keras(model, name=None,
     if targeted_onnx is not None:
         warnings.warn("targeted_onnx is deprecated and unused. Use target_opset.", DeprecationWarning)
     import tensorflow as tf
-    if StrictVersion(tf.__version__) < StrictVersion('2.0'):
+    if pv.Version(tf.__version__) < pv.Version('2.0'):
         # Former converter for tensorflow<2.0.
         from keras2onnx import convert_keras as convert
         return convert(model, name, doc_string, target_opset, channel_first_inputs)

onnxmltools/utils/tests_helper.py

@@ -4,6 +4,7 @@
 import os
 import warnings
 import numpy
+import packaging.version as pv
 from onnx.defs import onnx_opset_version
 from onnxconverter_common.onnx_ex import DEFAULT_OPSET_NUMBER
 from ..convert.common.data_types import FloatTensorType
@@ -40,7 +41,7 @@ def dump_data_and_model(data, model, onnx=None, basename="model", folder=None,
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :param verbose: prints more information when it fails
     :return: the created files
 
@@ -243,7 +244,7 @@ def dump_one_class_classification(model, suffix="", folder=None, allow_failure=N
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :return: output of :func:`dump_data_and_model`
 
     Every created filename will follow the pattern:
@@ -269,7 +270,7 @@ def dump_binary_classification(model, suffix="", folder=None, allow_failure=None
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :param verbose: prints more information when it fails
     :return: output of :func:`dump_data_and_model`
 
@@ -296,7 +297,7 @@ def dump_multiple_classification(model, suffix="", folder=None, allow_failure=No
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :return: output of :func:`dump_data_and_model`
 
     Every created filename will follow the pattern:
@@ -322,7 +323,7 @@ def dump_multiple_regression(model, suffix="", folder=None, allow_failure=None):
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :return: output of :func:`dump_data_and_model`
 
     Every created filename will follow the pattern:
@@ -349,7 +350,7 @@ def dump_single_regression(model, suffix="", folder=None, allow_failure=None):
     :param allow_failure: None to raise an exception if comparison fails
         for the backends, otherwise a string which is then evaluated to check
         whether or not the test can fail, example:
-        ``"StrictVersion(onnx.__version__) < StrictVersion('1.3.0')"``
+        ``"pv.Version(onnx.__version__) < pv.Version('1.3.0')"``
     :return: output of :func:`dump_data_and_model`
 
     Every created filename will follow the pattern:

onnxmltools/utils/utils_backend.py

@@ -7,7 +7,7 @@
 import sys
 import glob
 import pickle
-from distutils.version import StrictVersion
+import packaging.version as pv
 import numpy
 from numpy.testing import assert_array_almost_equal, assert_array_equal
 
@@ -29,7 +29,7 @@ class OnnxRuntimeAssertionError(AssertionError):
 def evaluate_condition(backend, condition):
     """
     Evaluates a condition such as
-    ``StrictVersion(onnxruntime.__version__) <= StrictVersion('0.1.3')``
+    ``pv.Version(onnxruntime.__version__) <= pv.Version('0.1.3')``
     """
     if backend == "onnxruntime":
         import onnxruntime

tests/catboost/test_CatBoost_converter.py

@@ -5,7 +5,7 @@
 """
 import unittest
 import warnings
-from distutils.version import StrictVersion
+import packaging.version as pv
 import numpy
 try:
     import sklearn
@@ -39,7 +39,7 @@ def test_catboost_regressor(self):
     def test_catboost_bin_classifier(self):
         import onnxruntime
 
-        if StrictVersion('.'.join(onnxruntime.__version__.split('.')[:2])) >= StrictVersion('1.3.0'):
+        if pv.Version('.'.join(onnxruntime.__version__.split('.')[:2])) >= pv.Version('1.3.0'):
             X, y = make_classification(n_samples=100, n_features=4, random_state=0)
             catboost_model = catboost.CatBoostClassifier(task_type='CPU', loss_function='CrossEntropy',
                                                          n_estimators=10, verbose=0)

tests/coreml/test_cml_AllNeuralNetworkConverters.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import unittest
-from distutils.version import StrictVersion
+import packaging.version as pv
 import numpy
 try:
     from sklearn.impute import SimpleImputer as Imputer
@@ -480,7 +480,7 @@ def test_image_input_type_converter(self):
             dims = [(d.dim_param or d.dim_value) for d in model_onnx.graph.input[0].type.tensor_type.shape.dim]
             self.assertEqual(dims, ['None', 1 if onnx_colorspace == 'Gray8' else 3, 15, 25])
 
-            if StrictVersion(onnx.__version__) >= StrictVersion('1.2.1'):
+            if pv.Version(onnx.__version__) >= pv.Version('1.2.1'):
                 metadata = {prop.key: prop.value for prop in model_onnx.metadata_props}
                 self.assertEqual(metadata, { 'Image.BitmapPixelFormat': onnx_colorspace })
                 self.assertEqual(model_onnx.graph.input[0].type.denotation, 'IMAGE')

tests/coreml/test_cml_DictVectorizerConverter.py

@@ -4,7 +4,7 @@
 Tests CoreML DictVectorizer converter.
 """
 import sys
-from distutils.version import StrictVersion
+import packaging.version as pv
 import unittest
 import onnx
 import sklearn
@@ -30,7 +30,7 @@
 class TestCoreMLDictVectorizerConverter(unittest.TestCase):
 
     @unittest.skipIf(
-        StrictVersion(coremltools.__version__) > StrictVersion("3.1"),
+        pv.Version(coremltools.__version__) > pv.Version("3.1"),
         reason="untested")
     def test_dict_vectorizer(self):
         model = DictVectorizer()
@@ -48,7 +48,7 @@ def test_dict_vectorizer(self):
         model_onnx = convert(model_coreml.get_spec(), target_opset=TARGET_OPSET)
         self.assertTrue(model_onnx is not None)
         dump_data_and_model(data, model, model_onnx, basename="CmlDictVectorizer-OneOff-SkipDim1",
-                            allow_failure="StrictVersion(onnx.__version__) < StrictVersion('1.3.0')")
+                            allow_failure="pv.Version(onnx.__version__) < pv.Version('1.3.0')")
 
 
 if __name__ == "__main__":

tests/coreml/test_cml_GLMClassifierConverter.py

@@ -4,7 +4,7 @@
 Tests CoreML GLMClassifier converter.
 """
 import unittest
-from distutils.version import StrictVersion
+import packaging.version as pv
 import numpy
 from sklearn.datasets import load_iris
 from sklearn.linear_model import LogisticRegression
@@ -38,7 +38,7 @@ def validate_zipmap(self, model):
         self.assertTrue('classProbability' in node.output)
 
     @unittest.skipIf(
-        StrictVersion(coremltools.__version__) > StrictVersion("3.1"),
+        pv.Version(coremltools.__version__) > pv.Version("3.1"),
         reason="untested")
     def test_glm_classifier(self):
         iris = load_iris()
@@ -54,7 +54,7 @@ def test_glm_classifier(self):
         self.assertTrue(lr_onnx is not None)
         self.validate_zipmap(lr_onnx)
         dump_data_and_model(X.astype(numpy.float32), lr, lr_onnx, basename="CmlbinLogitisticRegression",
-                            allow_failure="StrictVersion(onnx.__version__) < StrictVersion('1.3.0')")
+                            allow_failure="pv.Version(onnx.__version__) < pv.Version('1.3.0')")
 
         # Ensure there is a probability output
         svm = LinearSVC()

tests/coreml/test_cml_GLMRegressorConverter.py

@@ -4,7 +4,7 @@
 Tests CoreML GLMRegressor converter.
 """
 import unittest
-from distutils.version import StrictVersion
+import packaging.version as pv
 import numpy
 try:
     from sklearn.impute import SimpleImputer as Imputer
@@ -30,7 +30,7 @@
 class TestCoreMLGLMRegressorConverter(unittest.TestCase):
 
     @unittest.skipIf(
-        StrictVersion(coremltools.__version__) > StrictVersion("3.1"),
+        pv.Version(coremltools.__version__) > pv.Version("3.1"),
         reason="untested")
     def test_glm_regressor(self):
         X, y = make_regression(n_features=4, random_state=0)