Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Update CI pipeline for opset 13 #671

Merged
merged 9 commits into from
Dec 19, 2020
Merged

Update CI pipeline for opset 13 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a67505d
Test for opset 13
jiafatom Dec 18, 2020
2f2a7b4
Test for opset 13
jiafatom Dec 18, 2020
83281f8
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
a146d49
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
ea5ae54
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
cc50db2
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
c06ea1a
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
772409d
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
d3bb8f9
Merge branch 'opset_13_test' of https://github.com/jiafatom/keras-onn…
jiafatom Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .azure-pipelines/linux-CI-keras-applications-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
vmImage: 'Ubuntu-16.04'
strategy:
matrix:
# No python 2.x since tf2onnx does not support it
Python35:
python.version: '3.5'
ONNX_PATH: onnx==1.2.3
Expand All @@ -39,7 +38,7 @@ jobs:

Python37:
python.version: '3.7.3'
ONNX_PATH: onnx==1.6.0
ONNX_PATH: onnx==1.8.0
INSTALL_KERAS: pip install keras==2.3.1
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
Expand All @@ -61,7 +60,7 @@ jobs:

Python38-tf2:
python.version: '3.8'
ONNX_PATH: onnx==1.7.0
ONNX_PATH: onnx==1.8.0
INSTALL_KERAS:
UNINSTALL_KERAS: pip uninstall keras -y
INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
Expand Down
9 changes: 4 additions & 5 deletions .azure-pipelines/linux-conda-CI-tf-keras.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ jobs:
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
INSTALL_ORT:

# switch to python 3.8 after ort supports it.
Python37-tf2.3:
python.version: '3.7'
ONNX_PATH: onnx==1.7.0
Python38-tf2.3:
python.version: '3.8'
ONNX_PATH: onnx==1.8.0
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
INSTALL_ORT: pip install onnxruntime==1.4.0
INSTALL_ORT: pip install onnxruntime==1.6.0

maxParallel: 3

Expand Down
7 changes: 7 additions & 0 deletions .azure-pipelines/linux-conda-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ jobs:
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.1.1

Python37-tf1150:
python.version: '3.7'
ONNX_PATH: onnx==1.8.0
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.6.0

# UT for keras 2.3 need tensorflow <= 2.0.0
Python37-tf200:
python.version: '3.7'
Expand Down
6 changes: 3 additions & 3 deletions .azure-pipelines/win32-CI-keras-applications-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

Python37:
python.version: '3.7'
ONNX_PATH: onnx==1.6.0
ONNX_PATH: onnx==1.8.0
INSTALL_KERAS: pip install keras==2.3.1
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==1.14.0
Expand All @@ -61,11 +61,11 @@ jobs:

Python38-tf2:
python.version: '3.8'
ONNX_PATH: onnx==1.7.0
ONNX_PATH: onnx==1.8.0
INSTALL_KERAS:
UNINSTALL_KERAS: pip uninstall keras -y
INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
INSTALL_ORT: pip install onnxruntime==1.3.0
INSTALL_ORT: pip install onnxruntime==1.6.0
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
NIGHTLY_BUILD_TEST: python run_all_v2.py
Expand Down
9 changes: 4 additions & 5 deletions .azure-pipelines/win32-conda-CI-tf-keras.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ jobs:
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
INSTALL_ORT:

# switch to python 3.8 after ort supports it.
Python37-tf2.3:
python.version: '3.7'
ONNX_PATH: onnx==1.7.0
Python38-tf2.3:
python.version: '3.8'
ONNX_PATH: onnx==1.8.0
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
INSTALL_ORT: pip install onnxruntime==1.4.0
INSTALL_ORT: pip install onnxruntime==1.6.0

maxParallel: 3

Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/win32-conda-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

Python38-tf220:
python.version: '3.8'
ONNX_PATH: onnx==1.7.0
ONNX_PATH: onnx==1.8.0
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==2.2.0
INSTALL_ORT:
Expand Down
2 changes: 1 addition & 1 deletion keras2onnx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
keras2onnx
This package converts keras models into ONNX for use with any inference engine supporting ONNX
"""
__version__ = "1.7.1"
__version__ = "1.8.0"
__author__ = "Microsoft Corporation"
__producer__ = "keras2onnx"

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ numpy
protobuf
requests
onnx
onnxconverter-common>=1.7.0
onnxconverter-common>=1.8.0
fire