From 2a5e60cb67bf5a4743763ae3f107ff2486bc3b88 Mon Sep 17 00:00:00 2001 From: Wenbing Li <10278425+wenbingl@users.noreply.github.com> Date: Tue, 19 May 2020 21:24:12 -0700 Subject: [PATCH 1/2] fixed the xgboost version (#395) --- .azure-pipelines/linux-CI-nightly.yml | 7 +++++-- .azure-pipelines/linux-conda-CI.yml | 10 +++++++++- .azure-pipelines/win32-CI-nightly.yml | 7 +++++-- .azure-pipelines/win32-conda-CI.yml | 12 +++++++++++- requirements-dev.txt | 2 +- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/linux-CI-nightly.yml b/.azure-pipelines/linux-CI-nightly.yml index 739c1784..8d385425 100644 --- 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 index 9248023f..700947ce 100644 --- 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 index 524b196b..dd8b76d1 100644 --- 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 index 08e90b59..81889916 100644 --- 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 index a8b53aa8..f6fe11df 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,4 +14,4 @@ scikit-learn scipy svm wheel -xgboost +xgboost<=1.0.2 From 0d808eec5011e38fa25732cbfa445cc39d15fcbe Mon Sep 17 00:00:00 2001 From: Wenbing Li <10278425+wenbingl@users.noreply.github.com> Date: Tue, 19 May 2020 21:24:12 -0700 Subject: [PATCH 2/2] fixed the xgboost version (#395) --- .azure-pipelines/linux-CI-nightly.yml | 2 +- .azure-pipelines/linux-conda-CI.yml | 5 +++++ .azure-pipelines/win32-CI-nightly.yml | 2 +- .azure-pipelines/win32-conda-CI.yml | 7 +++++++ requirements-dev.txt | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/linux-CI-nightly.yml b/.azure-pipelines/linux-CI-nightly.yml index 739c1784..e580e3f1 100644 --- 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 diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml index 9248023f..06094828 100644 --- 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: diff --git a/.azure-pipelines/win32-CI-nightly.yml b/.azure-pipelines/win32-CI-nightly.yml index 524b196b..fafce296 100644 --- 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 diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml index 08e90b59..2dbac7df 100644 --- 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: diff --git a/requirements-dev.txt b/requirements-dev.txt index a8b53aa8..f6fe11df 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,4 +14,4 @@ scikit-learn scipy svm wheel -xgboost +xgboost<=1.0.2