fix unit tests

sdpython · Sep 15, 2019 · 3f43363 · 3f43363
1 parent 3562402
commit 3f43363
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/_unittests/ut_onnxrt/test_onnxrt_validate_type.py b/_unittests/ut_onnxrt/test_onnxrt_validate_type.py
@@ -5,6 +5,7 @@
 from logging import getLogger
 import pprint
 import numpy
+import onnx
 from pyquickhelper.loghelper import fLOG
 from pyquickhelper.pycode import get_temp_folder, ExtTestCase, unittest_require_at_least
 from sklearn.exceptions import ConvergenceWarning
@@ -99,6 +100,7 @@ def test_validate_sklearn_operators_float64(self):
         self.dtype_test_validate_sklearn_operators(numpy.float64)
 
     @unittest_require_at_least(skl2onnx, '1.5.9999')
+    @unittest_require_at_least(onnx, '1.5.29')
     def test_validate_sklearn_operators_float64_gpr(self):
         self.dtype_test_validate_sklearn_operators(
             numpy.float64, {'GaussianProcessRegressor'})

diff --git a/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process.py b/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process.py
@@ -5,6 +5,7 @@
 from logging import getLogger
 import numpy
 from pandas import DataFrame
+import onnx
 from pyquickhelper.loghelper import fLOG
 from pyquickhelper.pycode import ExtTestCase, skipif_circleci, unittest_require_at_least
 from sklearn.exceptions import ConvergenceWarning
@@ -150,6 +151,7 @@ def myprint(*args, **kwargs):
         self.assertGreater(len(buffer), 1 if debug else 0)
 
     @unittest_require_at_least(skl2onnx, '1.5.9999')
+    @unittest_require_at_least(onnx, '1.5.29')
     @ignore_warnings(category=(UserWarning, ConvergenceWarning, RuntimeWarning))
     @skipif_circleci("to investigate, shape of predictions are different")
     def test_rt_GaussianProcessRegressor_debug_std(self):

diff --git a/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process_optim.py b/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process_optim.py
@@ -4,8 +4,9 @@
 import unittest
 from logging import getLogger
 from pandas import DataFrame
+import onnx
 from pyquickhelper.loghelper import fLOG
-from pyquickhelper.pycode import ExtTestCase
+from pyquickhelper.pycode import ExtTestCase, unittest_require_at_least
 from sklearn.exceptions import ConvergenceWarning
 from sklearn.utils.testing import ignore_warnings
 from skl2onnx import __version__ as skl2onnx_version
@@ -14,6 +15,7 @@
 
 class TestRtValidateGaussianProcessOptim(ExtTestCase):
 
+    @unittest_require_at_least(onnx, '1.5.29')
     @ignore_warnings(category=(UserWarning, ConvergenceWarning, RuntimeWarning))
     def test_rt_GaussianProcessRegressor_python_optim(self):
         fLOG(__file__, self._testMethodName, OutputPrint=__name__ == "__main__")

diff --git a/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process_ort2.py b/_unittests/ut_onnxrt/test_rt_valid_model_gaussian_process_ort2.py
@@ -3,6 +3,7 @@
 """
 import unittest
 from logging import getLogger
+import onnx
 from pyquickhelper.loghelper import fLOG
 from pyquickhelper.pycode import ExtTestCase, skipif_circleci, unittest_require_at_least
 from pyquickhelper.texthelper.version_helper import compare_module_version
@@ -20,6 +21,7 @@
 class TestRtValidateGaussianProcessOrt2(ExtTestCase):
 
     @unittest_require_at_least(skl2onnx, '1.5.9999')
+    @unittest_require_at_least(onnx, '1.5.29')
     @ignore_warnings(category=(UserWarning, ConvergenceWarning, RuntimeWarning))
     @skipif_circleci("to investigate, shape of predictions are different")
     @unittest.skipIf(compare_module_version(ort_version, threshold) <= 0,