ci

Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
xadupre · Jul 28, 2023 · cbf1497 · cbf1497
1 parent b78e78a
commit cbf1497
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 139 deletions.
diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml
@@ -15,90 +15,46 @@ jobs:
   strategy:
     matrix:
 
-      Python310-1140-RT1150-xgb175:
+      Python311-1140-RT1151-xgb175:
+        python.version: '3.11'
+        ONNX_PATH: 'onnx==1.14.0' #'-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
+        ONNXRT_PATH: 'onnxruntime==1.15.1'
+        COREML_PATH: NONE
+        lightgbm.version: '>=4.0'
+        xgboost.version: '>=1.7.5'
+        numpy.version: ''
+        scipy.version: ''
+
+      Python310-1140-RT1151-xgb175:
         python.version: '3.10'
         ONNX_PATH: 'onnx==1.14.0' #'-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
-        ONNXRT_PATH: '-i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ ort_nightly==1.15.0.dev20230502003'
+        ONNXRT_PATH: 'onnxruntime==1.15.1'
         COREML_PATH: NONE
+        lightgbm.version: '<4.0'
         xgboost.version: '>=1.7.5'
         numpy.version: ''
+        scipy.version: ''
 
       Python310-1140-RT1140-xgb175:
         python.version: '3.10'
         ONNX_PATH: 'onnx==1.14.0' #'-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
         ONNXRT_PATH: onnxruntime==1.14.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
         COREML_PATH: NONE
+        lightgbm.version: '<4.0'
         xgboost.version: '>=1.7.5'
         numpy.version: ''
-      # Python310-1130-RT1140-xgb173:
-      #   python.version: '3.10'
-      #   ONNX_PATH: 'onnx==1.13.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
-      #   ONNXRT_PATH: onnxruntime==1.14.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: NONE
-      #   xgboost.version: '>=1.7.3'
-      #   numpy.version: ''
-      # Python310-1130-RT1131-xgb173:
-      #   python.version: '3.10'
-      #   ONNX_PATH: 'onnx==1.13.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
-      #   ONNXRT_PATH: onnxruntime==1.13.1 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: NONE
-      #   xgboost.version: '>=1.7.3'
-      #   numpy.version: ''
-      # Python310-1120-RT1121-xgb161:
-      #   python.version: '3.10'
-      #   ONNX_PATH: 'onnx==1.12.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
-      #   ONNXRT_PATH: onnxruntime==1.12.1 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: NONE
-      #   xgboost.version: '==1.6.1'
-      #   numpy.version: ''
-      # Python39-1120-RT1110-xgb161:
-      #   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: coremltools==6.3 # git+https://github.com/apple/coremltools@3.1
-      #   xgboost.version: '>=1.6.1'
-      #   numpy.version: ''
-      # Python39-1120-RT1110-xgb160:
-      #   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/coremltools@3.1
-      #   xgboost.version: '==1.6.0'
-      #   numpy.version: ''
-      # Python39-1110-RT1110:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.11.0  # '-i https://test.pypi.org/simple/ onnx==1.9.101'
-      #   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/coremltools@3.1
-      #   numpy.version: ''
-      # Python39-1110-RT1100-xgb120:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.11.0  # '-i https://test.pypi.org/simple/ onnx==1.9.101'
-      #   ONNXRT_PATH: onnxruntime==1.10.0
-      #   COREML_PATH: git+https://github.com/apple/coremltools@3.1
-      #   xgboost.version: '>=1.2'
-      #   numpy.version: ''
-      # Python39-1101-RT190-xgb120:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.10.1
-      #   ONNXRT_PATH: onnxruntime==1.9.0
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   xgboost.version: '>=1.2'
-      #   numpy.version: '<=1.23.5'
-      # Python39-190-RT180-xgb120:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.9.0
-      #   ONNXRT_PATH: onnxruntime==1.8.0
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   xgboost.version: '>=1.2'
-      #   numpy.version: '<=1.23.5'
-      # Python38-181-RT170-xgb120:
-      #   python.version: '3.8'
-      #   ONNX_PATH: onnx==1.8.1
-      #   ONNXRT_PATH: onnxruntime==1.7.0
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   xgboost.version: '>=1.2'
-      #   numpy.version: '<=1.23.5'
+        scipy.version: ''
+
+      Python39-1140-RT1151-xgb175-scipy180:
+        python.version: '3.9'
+        ONNX_PATH: 'onnx==1.14.0' #'-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
+        ONNXRT_PATH: 'onnxruntime==1.15.1'
+        COREML_PATH: NONE
+        lightgbm.version: '>=4.0'
+        xgboost.version: '>=1.7.5'
+        numpy.version: ''
+        scipy.version: '==1.8.0'
+
 
     maxParallel: 3
 
@@ -120,16 +76,23 @@ jobs:
 
   - script: |
       python -m pip install --upgrade pip
-      pip install xgboost$(xgboost.version)
+      pip install "xgboost$(xgboost.version)"
+      pip install "lightgbm$(lightgbm.version)"
       pip install $(ONNX_PATH)
       pip install $(ONNXRT_PATH)
       pip install "numpy$(numpy.version)"
+      pip install "scipy$(scipy.version)"
     displayName: 'Install xgboost, onnxruntime'
 
   - script: |
       python -m pip install coloredlogs flatbuffers packaging sympy numpy protobuf
       python -m pip install $(ONNXRT_PATH)
-    displayName: 'Install ort-nightly'
+    displayName: 'Install onnxruntime'
+
+  - script: |
+      pip install flake8
+      python -m flake8 ./onnxmltools
+    displayName: 'run flake8 check'
 
   - script: |
       pip install -e .
@@ -141,7 +104,6 @@ jobs:
       python -c "import onnxconverter_common;print('cc:',onnxconverter_common.__version__)"
       python -c "import onnx;print('onnx:',onnx.__version__)"
       python -c "import onnxruntime;print('ort:',onnxruntime.__version__)"
-      python -c "import catboost;print('catboost:',catboost.__version__)"
       python -c "import xgboost;print('xgboost:',xgboost.__version__)"
       python -c "import lightgbm;print('lightgbm:',lightgbm.__version__)"
     displayName: 'version'

diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml
@@ -15,10 +15,17 @@ jobs:
   strategy:
     matrix:
 
-      Python310-1150-RT1140:
+      Python311-1140-RT1151:
+        python.version: '3.11'
+        ONNX_PATH: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
+        ONNXRT_PATH: 'onnxruntime==1.15.1'
+        COREML_PATH: NONE
+        numpy.version: ''
+
+      Python310-1140-RT1151:
         python.version: '3.10'
         ONNX_PATH: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
-        ONNXRT_PATH: '-i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ ort_nightly==1.15.0.dev20230502003'
+        ONNXRT_PATH: 'onnxruntime==1.15.1'
         COREML_PATH: NONE
         numpy.version: ''
 
@@ -29,69 +36,6 @@ jobs:
         COREML_PATH: NONE
         numpy.version: ''
 
-      # Python310-1130-RT1140:
-      #   python.version: '3.10'
-      #   ONNX_PATH: 'onnx==1.13.0' # '-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
-      #   ONNXRT_PATH: onnxruntime==1.14.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: NONE
-      #   numpy.version: ''
-
-      # Python310-1130-RT1131:
-      #   python.version: '3.10'
-      #   ONNX_PATH: 'onnx==1.13.0' # '-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
-      #   ONNXRT_PATH: onnxruntime==1.13.1 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: NONE
-      #   numpy.version: ''
-
-      # 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: coremltools==6.3 # git+https://github.com/apple/coremltools@3.1
-      #   numpy.version: ''
-
-      # Python39-1110-RT1110:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.11.0  # '-i https://test.pypi.org/simple/ onnx==1.9.101'
-      #   ONNXRT_PATH: onnxruntime==1.11.0 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003'
-      #   COREML_PATH: coremltools==6.2  # 6.0 doesn't work
-      #   numpy.version: ''
-
-      # Python39-1110-RT190:
-      #   python.version: '3.9'
-      #   ONNX_PATH: 'onnx==1.11.0'  # '-i https://test.pypi.org/simple/ onnx==1.9.101'
-      #   ONNXRT_PATH: onnxruntime==1.10.0
-      #   COREML_PATH: coremltools==5.2 # git+https://github.com/apple/coremltools@3.1
-      #   numpy.version: ''
-
-      # Python39-1102-RT190:
-      #   python.version: '3.9'
-      #   ONNX_PATH: 'onnx==1.10.2'  # '-i https://test.pypi.org/simple/ onnx==1.9.101'
-      #   ONNXRT_PATH: onnxruntime==1.9.0
-      #   COREML_PATH: coremltools==5.2 # 5.0 doesn't work
-      #   numpy.version: '<=1.23.5'
-
-      # Python39-190-RT181:
-      #   python.version: '3.9'
-      #   ONNX_PATH: 'onnx==1.9.0'
-      #   ONNXRT_PATH: onnxruntime==1.8.1
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   numpy.version: '<=1.23.5'
-
-      # Python39-190-RT180:
-      #   python.version: '3.9'
-      #   ONNX_PATH: onnx==1.9.0
-      #   ONNXRT_PATH: onnxruntime==1.8.0
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   numpy.version: '<=1.23.5'
-
-      # Python38-181-RT170:
-      #   python.version: '3.8'
-      #   ONNX_PATH: onnx==1.8.1
-      #   ONNXRT_PATH: onnxruntime==1.7.0
-      #   COREML_PATH: coremltools==4.0 # git+https://github.com/apple/coremltools@3.1
-      #   numpy.version: '<=1.23.5'
-
     maxParallel: 3
 
   steps:
@@ -131,6 +75,11 @@ jobs:
       python -m pip install $(ONNXRT_PATH)
     displayName: 'Install ort-nightly'
 
+  - script: |
+      call activate py$(python.version)
+      python -m flake8 ./onnxmltools
+    displayName: 'run flake8 check'
+
   - script: |
       call activate py$(python.version)
       python -m pip install -e .