Skip to content

Commit

Permalink
[Test ONNX 1.10.2] Verify whether 1.10.2 from TestPyPI solve the cras…
Browse files Browse the repository at this point in the history 
…h issue by Shape-15 (#1753)

* try onnx 1.10.2

Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>

* force install onnx==1.10.2

Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>

* missing setup.py

Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>

* use 1.10.2 from PyPI

Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>

* missing 1.10.2

Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>

Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com>
  • Loading branch information
@jcwchen @guschmue
jcwchen and guschmue committed Nov 15, 2021
1 parent 5dfd36f commit edd15d0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
34 changes: 17 additions & 17 deletions ci_build/azure_pipelines/keras2onnx_unit_test.yml
View file
Expand Up @@ -11,60 +11,60 @@ jobs:
############ TF Keras Unit Tests ############
Python36-tf1.15:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.1:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python38-tf2.2:
python.version: '3.8'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python38-tf2.3:
python.version: '3.8'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python38-tf2.5:
python.version: '3.8'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
INSTALL_ORT: pip install onnxruntime==1.9.0

############ Pure Keras Unit Tests ############
Keras-Py36-tf1.15.0:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.2.5
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Keras-Py37-tf1.15.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

# UT for keras 2.3 need tensorflow <= 2.0.0
Keras-Py37-tf2.0.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: -i onnx==1.10.2
KERAS: keras==2.3.1
TENSORFLOW_PATH: tensorflow==2.0.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Keras-Py38-tf2.2.0:
python.version: '3.8'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: -i onnx==1.10.2
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==2.2.0
INSTALL_ORT: pip install onnxruntime==1.9.0
Expand All @@ -82,52 +82,52 @@ jobs:
############ TF Keras Unit Tests ############
Python36-tf-1.15:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.1:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.2:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.3:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.5:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
INSTALL_ORT: pip install onnxruntime==1.9.0

############ Pure Keras Unit Tests ############
Keras-Py36-tf1.15.0:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.2.5
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Keras-Py37-tf2.0.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.3.1
TENSORFLOW_PATH: tensorflow==2.0.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Keras-Py37-tf2.2.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==2.2.0
INSTALL_ORT: pip install onnxruntime==1.9.0
Expand Down
14 changes: 7 additions & 7 deletions ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml
View file
Expand Up @@ -11,28 +11,28 @@ jobs:
############ TF Keras Unit Tests ############
Python36-tf1.15:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python38-tf2.5:
python.version: '3.8'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
INSTALL_ORT: pip install onnxruntime==1.9.0

############ Pure Keras Unit Tests ############
Keras-Py37-tf1.15.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

# UT for keras 2.3 need tensorflow <= 2.0.0
Keras-Py37-tf2.0.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.3.1
TENSORFLOW_PATH: tensorflow==2.0.0
INSTALL_ORT: pip install onnxruntime==1.9.0
Expand All @@ -50,20 +50,20 @@ jobs:
############ TF Keras Unit Tests ############
Python36-tf-1.15:
python.version: '3.6'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow==1.15.0
INSTALL_ORT: pip install onnxruntime==1.9.0

Python37-tf2.3:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
INSTALL_ORT: pip install onnxruntime==1.9.0

############ Pure Keras Unit Tests ############
Keras-Py37-tf2.2.0:
python.version: '3.7'
ONNX_PATH: onnx==1.10.1
ONNX_PATH: onnx==1.10.2
KERAS: keras==2.4.3
TENSORFLOW_PATH: tensorflow==2.2.0
INSTALL_ORT: pip install onnxruntime==1.9.0
Expand Down
4 changes: 2 additions & 2 deletions tests/run_pretrained_models.yaml
View file
Expand Up @@ -337,7 +337,7 @@ ssd_mobilenet_v3_large_coco:
opset_constraints:
"onnx":
"min": 10
"max": 14 # FIXME, temorary until onnx-1.10.2 is out
"max": 15
input_get: get_beach
inputs:
"normalized_input_image_tensor:0": [1, 320, 320, 3]
Expand Down Expand Up @@ -432,7 +432,7 @@ faster_rcnn_inception_v2_coco:
opset_constraints:
"onnx":
"min": 11
"max": 14 # FIXME: temporary until onnx-1.10.2 is out
"max": 15
input_get: get_beach
inputs:
"image_tensor:0": [1, 224, 224, 3]
Expand Down

0 comments on commit edd15d0

Please sign in to comment.