From e28140d6ee3f237cfabfa7294a366d41b07727b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Dupr=C3=A9?= Date: Wed, 31 May 2023 10:08:41 +0200 Subject: [PATCH] Check onnx==1.14 (#621) * check onnx==1.14 Signed-off-by: xadupre * remove codecov Signed-off-by: xadupre * update to rc3 Signed-off-by: xiaowuhu * update xgboost to 1.7.5 Signed-off-by: xiaowuhu * update to formal version Signed-off-by: xiaowuhu * Update win32-conda-CI.yml Signed-off-by: xiaowuhu * Update win32-conda-CI.yml Signed-off-by: xiaowuhu * tune version of coremltools Signed-off-by: xiaowuhu * update version of xgb Signed-off-by: xiaowuhu * Update linux-conda-CI.yml Signed-off-by: xiaowuhu * Update linux-conda-CI.yml Signed-off-by: xiaowuhu * Update linux-conda-CI.yml Signed-off-by: xiaowuhu * update version Signed-off-by: xiaowuhu * Update linux-conda-CI.yml Signed-off-by: xiaowuhu * add ort 1.15 Signed-off-by: xiaowuhu * install ort-nightly Signed-off-by: xiaowuhu * Update win32-conda-CI.yml Signed-off-by: xiaowuhu --------- Signed-off-by: xadupre Signed-off-by: xiaowuhu Co-authored-by: xiaowuhu --- .azure-pipelines/linux-conda-CI.yml | 147 ++++++++++++++++------------ .azure-pipelines/win32-conda-CI.yml | 128 ++++++++++++++---------- requirements-dev.txt | 3 +- 3 files changed, 159 insertions(+), 119 deletions(-) diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml index 01967eee..c7de5ab8 100644 --- a/.azure-pipelines/linux-conda-CI.yml +++ b/.azure-pipelines/linux-conda-CI.yml @@ -14,75 +14,91 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - 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: + + Python310-1140-RT1150-xgb175: 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' + 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' COREML_PATH: NONE - xgboost.version: '>=1.7.3' + xgboost.version: '>=1.7.5' numpy.version: '' - Python310-1120-RT1121-xgb161: + + Python310-1140-RT1140-xgb175: 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' + 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 - xgboost.version: '==1.6.1' + xgboost.version: '>=1.7.5' 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: git+https://github.com/apple/coremltools@3.1 - xgboost.version: '>=1.6.1' - numpy.version: '' - Python39-1120-RT1110-xgb142: - 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.4.2' - 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: - 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: - python.version: '3.9' - ONNX_PATH: onnx==1.10.1 - ONNXRT_PATH: onnxruntime==1.9.0 - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - xgboost.version: '>=1.2' - numpy.version: '<=1.23.5' - Python39-190-RT180-xgb11: - python.version: '3.9' - ONNX_PATH: onnx==1.9.0 - ONNXRT_PATH: onnxruntime==1.8.0 - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - xgboost.version: '>=1.2' - numpy.version: '<=1.23.5' - Python38-181-RT170-xgb11: - python.version: '3.8' - ONNX_PATH: onnx==1.8.1 - ONNXRT_PATH: onnxruntime==1.7.0 - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - xgboost.version: '>=1.2' - numpy.version: '<=1.23.5' + # 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' maxParallel: 3 @@ -110,6 +126,11 @@ jobs: pip install "numpy$(numpy.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' + - script: | pip install flake8 python -m flake8 ./onnxmltools diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml index 50b7fe77..115d244b 100644 --- a/.azure-pipelines/win32-conda-CI.yml +++ b/.azure-pipelines/win32-conda-CI.yml @@ -15,68 +15,82 @@ jobs: strategy: matrix: - Python310-1130-RT1140: + Python310-1150-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' + 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' COREML_PATH: NONE numpy.version: '' - Python310-1130-RT1131: + Python310-1140-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.13.1 #'-i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003' + 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 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: 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: git+https://github.com/apple/coremltools@3.1 - 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: 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: git+https://github.com/apple/coremltools@3.1 - 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: 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: 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: git+https://github.com/apple/coremltools@3.1 - numpy.version: '<=1.23.5' + # 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 @@ -111,6 +125,12 @@ jobs: python -m pip install "numpy$(numpy.version)" displayName: 'Install onnxruntime' + - script: | + call activate py$(python.version) + python -m pip install coloredlogs flatbuffers packaging sympy numpy protobuf + python -m pip install $(ONNXRT_PATH) + displayName: 'Install ort-nightly' + - script: | call activate py$(python.version) python -m flake8 ./onnxmltools diff --git a/requirements-dev.txt b/requirements-dev.txt index 28e2403c..2dce6e51 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,4 @@ catboost -codecov cython dill flake8 @@ -19,4 +18,4 @@ pytest-spark scikit-learn==1.1.0 scipy==1.8.0 wheel -xgboost==1.5.2 +xgboost==1.7.5