fixed the xgboost version (onnx#395)

jiafatom · May 21, 2020 · 2a5e60c · 2a5e60c
1 parent 9460481
commit 2a5e60c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/.azure-pipelines/linux-CI-nightly.yml b/.azure-pipelines/linux-CI-nightly.yml
@@ -15,7 +15,7 @@ jobs:
     matrix:
       Python36-nightly:
         python.version: '3.6'
-        ONNX_PATH: onnx==1.6.0
+        ONNX_PATH: onnx==1.7.0
         ORT_PATH: -i https://test.pypi.org/simple/ ort-nightly
     maxParallel: 3
 
@@ -38,7 +38,10 @@ jobs:
       python -m pip install $(ONNX_PATH)
       python -m pip install tensorflow-cpu==1.15.0
       python -m pip install tf2onnx
-      python -m pip install git+https://github.com/microsoft/onnxconverter-common
+      git clone -b op17 https://github.com/jiafatom/onnxconverter-common.git
+      cd onnxconverter-common
+      pip install -e .
+      cd ..
       python -m pip install git+https://github.com/onnx/keras-onnx
       python -m pip install -r requirements.txt
       python -m pip install -r requirements-dev.txt

diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml
@@ -33,6 +33,11 @@ jobs:
         ONNX_PATH: onnx==1.6.0
         ONNXRT_PATH: onnxruntime==1.1.1
         xgboost.version: '>=1.0'
+      Python37-170-RT130:
+        python.version: '3.7'
+        ONNX_PATH: onnx==1.7.0
+        ONNXRT_PATH: onnxruntime==1.3.0
+        xgboost.version: '>=1.0'
     maxParallel: 3
 
   steps:
@@ -54,7 +59,10 @@ jobs:
       pip install $(ONNX_PATH)
       python -m pip install tensorflow-cpu==1.15.0
       python -m pip install tf2onnx
-      python -m pip install git+https://github.com/microsoft/onnxconverter-common
+      git clone -b op17 https://github.com/jiafatom/onnxconverter-common.git
+      cd onnxconverter-common
+      pip install -e .
+      cd ..
       python -m pip install git+https://github.com/onnx/keras-onnx
       pip install -r requirements.txt
       pip install -r requirements-dev.txt

diff --git a/.azure-pipelines/win32-CI-nightly.yml b/.azure-pipelines/win32-CI-nightly.yml
@@ -15,7 +15,7 @@ jobs:
     matrix:
       Python36-nightly:
         python.version: '3.6'
-        ONNX_PATH: onnx==1.6.0
+        ONNX_PATH: onnx==1.7.0
         ONNXRT_PATH: -i https://test.pypi.org/simple/ ort-nightly
         COREML_PATH: git+https://github.com/apple/coremltools@3.1
     maxParallel: 3
@@ -39,7 +39,10 @@ jobs:
       pip install %COREML_PATH% %ONNX_PATH%
       python -m pip install tensorflow-cpu==1.15.0
       python -m pip install tf2onnx
-      python -m pip install git+https://github.com/microsoft/onnxconverter-common
+      git clone -b op17 https://github.com/jiafatom/onnxconverter-common.git
+      cd onnxconverter-common
+      pip install -e .
+      cd ..
       python -m pip install git+https://github.com/onnx/keras-onnx
       echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
       pip install -r requirements.txt

diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml
@@ -41,6 +41,13 @@ jobs:
         COREML_PATH: git+https://github.com/apple/coremltools@3.1
         sklearn.version: ''
 
+      Python37-170-RT130:
+        python.version: '3.7'
+        ONNX_PATH: onnx==1.7.0
+        ONNXRT_PATH: onnxruntime==1.3.0
+        COREML_PATH: git+https://github.com/apple/coremltools@3.1
+        sklearn.version: ''
+
     maxParallel: 3
 
   steps:
@@ -62,7 +69,10 @@ jobs:
       python -m pip install %COREML_PATH% %ONNX_PATH%
       python -m pip install tensorflow-cpu==1.15.0
       python -m pip install tf2onnx
-      python -m pip install git+https://github.com/microsoft/onnxconverter-common
+      git clone -b op17 https://github.com/jiafatom/onnxconverter-common.git
+      cd onnxconverter-common
+      pip install -e .
+      cd ..
       python -m pip install git+https://github.com/onnx/keras-onnx
       echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
       python -m pip install -r requirements.txt

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -14,4 +14,4 @@ scikit-learn
 scipy
 svm
 wheel
-xgboost
+xgboost<=1.0.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ scikit-learn @@
     scipy
     svm
     wheel
-    xgboost
+    xgboost<=1.0.2