Update requirements and CI (#944)

* Update CI Signed-off-by: xadupre <xadupre@microsoft.com> * disable unit test for old opsets Signed-off-by: xadupre <xadupre@microsoft.com> * fix syntax Signed-off-by: xadupre <xadupre@microsoft.com> * version Signed-off-by: xadupre <xadupre@microsoft.com> * opset Signed-off-by: xadupre <xadupre@microsoft.com> * fix scipy version Signed-off-by: xadupre <xadupre@microsoft.com> * lint Signed-off-by: xadupre <xadupre@microsoft.com> Signed-off-by: xadupre <xadupre@microsoft.com>
onnx · Nov 26, 2022 · 3c9e0c1 · 3c9e0c1
1 parent 1c58b52
commit 3c9e0c1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 39 deletions.
diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml
@@ -14,6 +14,18 @@ jobs:
   strategy:
     matrix:
 
+      Py310-Onnx120-Rt131-Skl11:
+        do.bench: '0'
+        python.version: '3.10'
+        numpy.version: '>=1.21.0'
+        scipy.version: '>=1.7.0'
+        onnx.version: 'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
+        onnx.target_opset: ''
+        onnxrt.version: 'onnxruntime==1.13.1' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
+        sklearn.version: '>=1.1.3'
+        lgbm.version: ''
+        onnxcc.version: '>=1.8.1'  # git
+        run.example: '1'
       Py310-Onnx120-Rt1201-Skl11:
         do.bench: '0'
         python.version: '3.10'
@@ -22,10 +34,10 @@ jobs:
         onnx.version: 'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
         onnx.target_opset: ''
         onnxrt.version: 'onnxruntime==1.12.1' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
-        sklearn.version: '>=1.1.2'
+        sklearn.version: '>=1.1.3'
         lgbm.version: ''
         onnxcc.version: '>=1.8.1'  # git
-        run.example: '1'
+        run.example: '0'
       Py39-Onnx120-Rt1111-Skl11:
         do.bench: '0'
         python.version: '3.9'
@@ -74,18 +86,6 @@ jobs:
         lgbm.version: ''
         onnxcc.version: '>=1.8.1'  # git
         run.example: '0'
-      Py39-Onnx1102-Rt110-Skl10:
-        do.bench: '0'
-        python.version: '3.9'
-        numpy.version: '>=1.21.0'
-        scipy.version: '>=1.7.0'
-        onnx.version: 'onnx==1.10.2'  # 'test'
-        onnx.target_opset: ''
-        onnxrt.version: 'onnxruntime==1.10.0'  # '-i https://test.pypi.org/simple/ ort-nightly'
-        sklearn.version: '==1.0.2'
-        lgbm.version: ''
-        onnxcc.version: '>=1.8.1'  # git
-        run.example: '0'
       Py39-Onnx1101-Rt190-Skl10:
         do.bench: '0'
         python.version: '3.9'
@@ -110,27 +110,27 @@ jobs:
         lgbm.version: ''
         onnxcc.version: '>=1.8.1'  # git
         run.example: '0'
-      Py39-Onnx1101-Rt181-Skl0242:
+      Py39-Onnx190-Rt180-Skl0242:
         do.bench: '0'
         python.version: '3.9'
         numpy.version: '<1.21.0'
         scipy.version: ''
-        onnx.version: 'onnx==1.10.1'  # 'test'
+        onnx.version: 'onnx==1.9.0'
         onnx.target_opset: ''
-        onnxrt.version: 'onnxruntime==1.8.1'  # '-i https://test.pypi.org/simple/ ort-nightly'
-        sklearn.version: '>=0.24.2'
-        lgbm.version: '==3.2.0'
+        onnxrt.version: 'onnxruntime>=1.8.1'  # '-i https://test.pypi.org/simple/ ort-nightly'
+        sklearn.version: '==0.24.2'
+        lgbm.version: ''
         onnxcc.version: '>=1.8.1'  # git
         run.example: '0'
-      Py39-Onnx190-Rt180-Skl0242:
+      Py39-Onnx190-Rt180-Skl0232:
         do.bench: '0'
         python.version: '3.9'
         numpy.version: '<1.21.0'
         scipy.version: ''
         onnx.version: 'onnx==1.9.0'
         onnx.target_opset: ''
         onnxrt.version: 'onnxruntime>=1.8.1'  # '-i https://test.pypi.org/simple/ ort-nightly'
-        sklearn.version: '>=0.24.2'
+        sklearn.version: '==0.23.2'
         lgbm.version: ''
         onnxcc.version: '>=1.8.1'  # git
         run.example: '0'

diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml
@@ -13,6 +13,15 @@ jobs:
     vmImage: 'windows-latest'
   strategy:
     matrix:
+      Py310-Onnx120-Rt131-Skl11:
+        python.version: '3.10'
+        onnx.version:  'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
+        onnx.target_opset: ''
+        numpy.version: 'numpy>=1.22.3'
+        scipy.version: 'scipy'
+        onnxrt.version: 'onnxruntime==1.13.1' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
+        onnxcc.version: 'onnxconverter-common>=1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
+        sklearn.version: '>=1.1'
       Py310-Onnx120-Rt120-Skl11:
         python.version: '3.10'
         onnx.version:  'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
@@ -57,7 +66,7 @@ jobs:
         scipy.version: 'scipy'
         onnxrt.version: 'onnxruntime==1.10.0'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common>=1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '>=1.0'
+        sklearn.version: '==1.0.2'
       Py39-Onnx1102-Rt1100-Skl10:
         python.version: '3.9'
         onnx.version: 'onnx==1.10.2'  # -i https://test.pypi.org/simple/ onnx'
@@ -66,7 +75,7 @@ jobs:
         scipy.version: 'scipy'
         onnxrt.version: 'onnxruntime==1.10.0'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common>=1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '>=1.0'
+        sklearn.version: '==1.0.2'
       Py39-Onnx1101-Rt190-Skl10:
         python.version: '3.9'
         onnx.version: 'onnx==1.10.1'  # -i https://test.pypi.org/simple/ onnx'
@@ -75,7 +84,7 @@ jobs:
         scipy.version: 'scipy'
         onnxrt.version: 'onnxruntime==1.9.0'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common>=1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '>=1.0'
+        sklearn.version: '==1.0.2'
       Py39-Onnx1101-Rt190-Skl0242:
         python.version: '3.9'
         onnx.version: 'onnx==1.10.1'  # -i https://test.pypi.org/simple/ onnx'
@@ -90,37 +99,28 @@ jobs:
         onnx.version: 'onnx==1.10.1'  # -i https://test.pypi.org/simple/ onnx'
         onnx.target_opset: ''
         numpy.version: 'numpy>=1.18.1'
-        scipy.version: 'scipy'
+        scipy.version: 'scipy<1.9'
         onnxrt.version: 'onnxruntime==1.8.1'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common==1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '>=0.24.2'
+        sklearn.version: '==0.24.2'
       Py39-Onnx190-Rt180-Skl0242:
-        python.version: '3.9'
-        onnx.version: 'onnx==1.9.0'  # '-i https://test.pypi.org/simple/ onnx'
-        onnx.target_opset: ''
-        numpy.version: 'numpy>=1.18.1'
-        scipy.version: 'scipy'
-        onnxrt.version: 'onnxruntime==1.8.0'  # -i https://test.pypi.org/simple/ ort-nightly'
-        onnxcc.version: 'onnxconverter-common==1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '>=0.24.2'
-      Py39-Onnx190-Rt170-Skl0242:
         python.version: '3.9'
         onnx.version: 'onnx==1.9.0'  # '-i https://test.pypi.org/simple/ onnx'
         onnx.target_opset: ''
         numpy.version: 'numpy>=1.18.1'
         scipy.version: 'scipy<1.9'
-        onnxrt.version: 'onnxruntime==1.7.0'  # -i https://test.pypi.org/simple/ ort-nightly'
+        onnxrt.version: 'onnxruntime==1.8.0'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common==1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
         sklearn.version: '==0.24.2'
-      Py38-Onnx181-Rt170-Skl0241:
+      Py38-Onnx181-Rt170-Skl0232:
         python.version: '3.8'
         onnx.version: 'onnx==1.8.1'  # '-i https://test.pypi.org/simple/ onnx'
         onnx.target_opset: ''
         numpy.version: 'numpy>=1.18.1'
         scipy.version: 'scipy<1.9'
         onnxrt.version: 'onnxruntime==1.7.0'  # -i https://test.pypi.org/simple/ ort-nightly'
         onnxcc.version: 'onnxconverter-common==1.8.1'  # git+https://github.com/microsoft/onnxconverter-common.git
-        sklearn.version: '==0.24.1'
+        sklearn.version: '==0.23.2'
 
 
     maxParallel: 3

diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@ numpy>=1.15
 scipy>=1.0
 protobuf
 onnx>=1.2.1
-scikit-learn>=0.19, <=1.1.1
+scikit-learn>=0.19, <1.2
 onnxconverter-common>=1.7.0
diff --git a/tests/test_sklearn_scaler_converter.py b/tests/test_sklearn_scaler_converter.py
@@ -326,6 +326,7 @@ def test_min_max_scaler_double(self):
             model, model_onnx, basename="SklearnMinMaxScalerDouble")
 
     @ignore_warnings(category=DeprecationWarning)
+    @unittest.skipIf(TARGET_OPSET < 15, reason="old signature for clip")
     @unittest.skipIf(pv.Version(ort_version) < pv.Version("1.9.0"),
                      reason="Operator clip not fully implemented")
     def test_min_max_scaler_clip(self):
@@ -347,6 +348,7 @@ def test_min_max_scaler_clip(self):
             model, model_onnx, basename="SklearnMinMaxScalerClip")
 
     @ignore_warnings(category=DeprecationWarning)
+    @unittest.skipIf(TARGET_OPSET < 15, reason="old signature for clip")
     @unittest.skipIf(pv.Version(ort_version) < pv.Version("1.9.0"),
                      reason="Operator clip not fully implemented")
     def test_min_max_scaler_double_clip(self):