Skip to content

Commit

Permalink
Check onnx==1.14 (onnx#621)
Browse files Browse the repository at this point in the history 
* check onnx==1.14

Signed-off-by: xadupre <xadupre@microsoft.com>

* remove codecov

Signed-off-by: xadupre <xadupre@microsoft.com>

* update to rc3

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* update xgboost to 1.7.5

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* update to formal version

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update win32-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update win32-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* tune version of coremltools

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* update version of xgb

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update linux-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update linux-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update linux-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* update version

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update linux-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* add ort 1.15

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* install ort-nightly

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

* Update win32-conda-CI.yml

Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>

---------

Signed-off-by: xadupre <xadupre@microsoft.com>
Signed-off-by: xiaowuhu <xiaowuhu@microsoft.com>
Co-authored-by: xiaowuhu <xiaowuhu@microsoft.com>
  • Loading branch information
@xadupre @xiaowuhu
xadupre and xiaowuhu authored May 31, 2023
1 parent debfbe0 commit e28140d
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 119 deletions.
147 changes: 84 additions & 63 deletions .azure-pipelines/linux-conda-CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
128 changes: 74 additions & 54 deletions .azure-pipelines/win32-conda-CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions requirements-dev.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
catboost
codecov
cython
dill
flake8
Expand All @@ -19,4 +18,4 @@ pytest-spark
scikit-learn==1.1.0
scipy==1.8.0
wheel
xgboost==1.5.2
xgboost==1.7.5

0 comments on commit e28140d

Please sign in to comment.