Skip to content

Commit 8e43a17

Browse files
fatcat-zfatcat-z
authored
Upgrade some keras jobs to use ort 1.11.0. (#1896)
* Upgrade some keras CI jobs to use ort 1.11.0. Signed-off-by: Jay Zhang <[email protected]>
1 parent 6003d4c commit 8e43a17

File tree

6 files changed

+88
-54
lines changed

6 files changed

+88
-54
lines changed

‎ci_build/azure_pipelines/keras2onnx_application_tests.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
INSTALL_ORT: pip install onnxruntime==1.8.0
2929
INSTALL_KERAS_RESNET: pip install keras-resnet
3030
INSTALL_TRANSFORMERS:
31+
INSTALL_NUMPY:
3132
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
3233

3334
Python37-onnx1.9:
@@ -36,20 +37,22 @@ jobs:
3637
INSTALL_KERAS: pip install keras==2.3.1
3738
UNINSTALL_KERAS:
3839
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
39-
INSTALL_ORT: pip install onnxruntime==1.8.0
40+
INSTALL_ORT: pip install onnxruntime==1.9.0
4041
INSTALL_KERAS_RESNET: pip install keras-resnet
4142
INSTALL_TRANSFORMERS:
43+
INSTALL_NUMPY: pip install numpy==1.19.0
4244
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
4345

44-
Python38-tf2:
45-
python.version: '3.8'
46-
ONNX_PATH: onnx==1.9.0
46+
Python37-tf2.x:
47+
python.version: '3.7.3'
48+
ONNX_PATH: onnx==1.11.0
4749
INSTALL_KERAS:
4850
UNINSTALL_KERAS: pip uninstall keras -y
4951
INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
50-
INSTALL_ORT: pip install onnxruntime==1.8.0
52+
INSTALL_ORT: pip install onnxruntime==1.11.0
5153
INSTALL_KERAS_RESNET: pip install keras-resnet
5254
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
55+
INSTALL_NUMPY: pip install numpy==1.19.0
5356
NIGHTLY_BUILD_TEST: python run_all_v2.py
5457

5558
steps:
@@ -80,20 +83,34 @@ jobs:
8083
INSTALL_KERAS: pip install keras==2.3.1
8184
UNINSTALL_KERAS:
8285
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
83-
INSTALL_ORT: pip install onnxruntime==1.8.0
86+
INSTALL_ORT: pip install onnxruntime==1.9.0
8487
INSTALL_KERAS_RESNET: pip install keras-resnet
8588
INSTALL_TRANSFORMERS:
89+
INSTALL_NUMPY: pip install numpy==1.19.0
8690
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
8791

8892
Python37-onnx1.9:
89-
python.version: '3.7'
93+
python.version: '3.7.3'
9094
ONNX_PATH: onnx==1.9.0
9195
INSTALL_KERAS: pip install keras==2.3.1
9296
UNINSTALL_KERAS:
9397
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
94-
INSTALL_ORT: pip install onnxruntime==1.8.0
98+
INSTALL_ORT: pip install onnxruntime==1.9.0
9599
INSTALL_KERAS_RESNET: pip install keras-resnet
96100
INSTALL_TRANSFORMERS:
101+
INSTALL_NUMPY: pip install numpy==1.19.0
102+
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
103+
104+
Python38-tf2.x:
105+
python.version: '3.8'
106+
ONNX_PATH: onnx==1.11.0
107+
INSTALL_KERAS:
108+
UNINSTALL_KERAS: pip uninstall keras -y
109+
INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
110+
INSTALL_ORT: pip install onnxruntime==1.11.0
111+
INSTALL_KERAS_RESNET: pip install keras-resnet
112+
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
113+
INSTALL_NUMPY: pip install numpy==1.19.0
97114
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
98115

99116
steps:

‎ci_build/azure_pipelines/keras2onnx_unit_test.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,31 @@ jobs:
1414
ONNX_PATH: onnx==1.10.2
1515
TENSORFLOW_PATH: tensorflow==1.15.0
1616
INSTALL_ORT: pip install onnxruntime==1.9.0
17+
INSTALL_NUMPY: pip install numpy==1.19.0
1718

1819
Python37-tf2.1:
1920
python.version: '3.7'
20-
ONNX_PATH: onnx==1.10.2
21+
ONNX_PATH: onnx==1.11.0
2122
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
22-
INSTALL_ORT: pip install onnxruntime==1.9.0
23+
INSTALL_ORT: pip install onnxruntime==1.11.0
2324

2425
Python38-tf2.2:
2526
python.version: '3.8'
26-
ONNX_PATH: onnx==1.10.2
27+
ONNX_PATH: onnx==1.11.0
2728
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
28-
INSTALL_ORT: pip install onnxruntime==1.9.0
29+
INSTALL_ORT: pip install onnxruntime==1.11.0
2930

3031
Python38-tf2.3:
3132
python.version: '3.8'
32-
ONNX_PATH: onnx==1.10.2
33+
ONNX_PATH: onnx==1.11.0
3334
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
34-
INSTALL_ORT: pip install onnxruntime==1.9.0
35+
INSTALL_ORT: pip install onnxruntime==1.11.0
3536

3637
Python38-tf2.5:
3738
python.version: '3.8'
38-
ONNX_PATH: onnx==1.10.2
39+
ONNX_PATH: onnx==1.11.0
3940
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
40-
INSTALL_ORT: pip install onnxruntime==1.9.0
41+
INSTALL_ORT: pip install onnxruntime==1.11.0
4142

4243
############ Pure Keras Unit Tests ############
4344
Keras-Py36-tf1.15.0:
@@ -49,25 +50,27 @@ jobs:
4950

5051
Keras-Py37-tf1.15.0:
5152
python.version: '3.7'
52-
ONNX_PATH: onnx==1.10.2
53+
ONNX_PATH: onnx==1.11.0
5354
KERAS: keras==2.4.3
5455
TENSORFLOW_PATH: tensorflow==1.15.0
55-
INSTALL_ORT: pip install onnxruntime==1.9.0
56+
INSTALL_ORT: pip install onnxruntime==1.11.0
57+
INSTALL_NUMPY: pip install numpy==1.19.0
5658

5759
# UT for keras 2.3 need tensorflow <= 2.0.0
5860
Keras-Py37-tf2.0.0:
5961
python.version: '3.7'
60-
ONNX_PATH: -i onnx==1.10.2
62+
ONNX_PATH: -i onnx==1.11.0
6163
KERAS: keras==2.3.1
6264
TENSORFLOW_PATH: tensorflow==2.0.0
63-
INSTALL_ORT: pip install onnxruntime==1.9.0
65+
INSTALL_ORT: pip install onnxruntime==1.11.0
66+
INSTALL_NUMPY: pip install numpy==1.19.0
6467

6568
Keras-Py38-tf2.2.0:
6669
python.version: '3.8'
67-
ONNX_PATH: -i onnx==1.10.2
70+
ONNX_PATH: -i onnx==1.11.0
6871
KERAS: keras==2.4.3
6972
TENSORFLOW_PATH: tensorflow==2.2.0
70-
INSTALL_ORT: pip install onnxruntime==1.9.0
73+
INSTALL_ORT: pip install onnxruntime==1.11.0
7174

7275
steps:
7376
- template: 'templates/keras2onnx_unit_test.yml'
@@ -88,27 +91,27 @@ jobs:
8891

8992
Python37-tf2.1:
9093
python.version: '3.7'
91-
ONNX_PATH: onnx==1.10.2
94+
ONNX_PATH: onnx==1.11.0
9295
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
93-
INSTALL_ORT: pip install onnxruntime==1.9.0
96+
INSTALL_ORT: pip install onnxruntime==1.11.0
9497

9598
Python37-tf2.2:
9699
python.version: '3.7'
97-
ONNX_PATH: onnx==1.10.2
100+
ONNX_PATH: onnx==1.11.0
98101
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
99-
INSTALL_ORT: pip install onnxruntime==1.9.0
102+
INSTALL_ORT: pip install onnxruntime==1.11.0
100103

101104
Python37-tf2.3:
102105
python.version: '3.7'
103-
ONNX_PATH: onnx==1.10.2
106+
ONNX_PATH: onnx==1.11.0
104107
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
105-
INSTALL_ORT: pip install onnxruntime==1.9.0
108+
INSTALL_ORT: pip install onnxruntime==1.11.0
106109

107110
Python37-tf2.5:
108111
python.version: '3.7'
109-
ONNX_PATH: onnx==1.10.2
112+
ONNX_PATH: onnx==1.11.0
110113
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
111-
INSTALL_ORT: pip install onnxruntime==1.9.0
114+
INSTALL_ORT: pip install onnxruntime==1.11.0
112115

113116
############ Pure Keras Unit Tests ############
114117
Keras-Py36-tf1.15.0:
@@ -120,17 +123,18 @@ jobs:
120123

121124
Keras-Py37-tf2.0.0:
122125
python.version: '3.7'
123-
ONNX_PATH: onnx==1.10.2
126+
ONNX_PATH: onnx==1.11.0
124127
KERAS: keras==2.3.1
125128
TENSORFLOW_PATH: tensorflow==2.0.0
126-
INSTALL_ORT: pip install onnxruntime==1.9.0
129+
INSTALL_ORT: pip install onnxruntime==1.11.0
130+
INSTALL_NUMPY: pip install numpy==1.19.0
127131

128132
Keras-Py37-tf2.2.0:
129133
python.version: '3.7'
130-
ONNX_PATH: onnx==1.10.2
134+
ONNX_PATH: onnx==1.11.0
131135
KERAS: keras==2.4.3
132136
TENSORFLOW_PATH: tensorflow==2.2.0
133-
INSTALL_ORT: pip install onnxruntime==1.9.0
137+
INSTALL_ORT: pip install onnxruntime==1.11.0
134138

135139
steps:
136140
- template: 'templates/keras2onnx_unit_test.yml'

‎ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ steps:
4444
$(INSTALL_TRANSFORMERS)
4545
pip install keras-self-attention
4646
pip install pytest pytest-cov pytest-runner
47-
pip install numpy==1.19
47+
$(INSTALL_NUMPY)
48+
49+
pip freeze --all
4850
displayName: 'Install dependencies'
4951
5052
- script: |
@@ -100,7 +102,8 @@ steps:
100102
%INSTALL_TRANSFORMERS%
101103
pip install keras-self-attention
102104
pip install pytest pytest-cov pytest-runner
103-
pip install numpy==1.19
105+
%INSTALL_NUMPY%
106+
104107
pip freeze --all
105108
displayName: 'Install dependencies'
106109

‎ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ steps:
3131
pip install -r requirements-dev.txt
3232
pip install pytest pytest-cov pytest-runner
3333
$(INSTALL_ORT)
34-
pip install numpy==1.19
34+
$(INSTALL_NUMPY)
35+
3536
pip freeze --all
3637
displayName: 'Install dependencies'
3738
@@ -78,7 +79,9 @@ steps:
7879
pip install git+https://github.com/microsoft/onnxconverter-common
7980
pip install pytest pytest-cov pytest-runner
8081
%INSTALL_ORT%
81-
pip install numpy==1.19
82+
%INSTALL_NUMPY%
83+
84+
pip freeze --all
8285
displayName: 'Install dependencies'
8386
8487
- script: |

‎ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,26 @@ jobs:
1010
matrix:
1111
Python36-onnx1.5:
1212
python.version: '3.6'
13-
ONNX_PATH: onnx==1.5.0
13+
ONNX_PATH: onnx==1.10.2
1414
INSTALL_KERAS: pip install keras==2.2.4
1515
UNINSTALL_KERAS:
1616
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
17-
INSTALL_ORT: pip install onnxruntime==1.8.0
17+
INSTALL_ORT: pip install onnxruntime==1.9.0
1818
INSTALL_KERAS_RESNET: pip install keras-resnet
1919
INSTALL_TRANSFORMERS:
20+
INSTALL_NUMPY: pip install numpy==1.19.0
2021
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
2122

2223
Python38-tf2:
2324
python.version: '3.8'
24-
ONNX_PATH: onnx==1.9.0
25+
ONNX_PATH: onnx==1.11.0
2526
INSTALL_KERAS:
2627
UNINSTALL_KERAS: pip uninstall keras -y
27-
INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
28-
INSTALL_ORT: pip install onnxruntime==1.8.0
28+
INSTALL_TENSORFLOW: pip install tensorflow==2.5.0
29+
INSTALL_ORT: pip install onnxruntime==1.11.0
2930
INSTALL_KERAS_RESNET: pip install keras-resnet
3031
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
32+
INSTALL_NUMPY: pip install numpy==1.19.0
3133
NIGHTLY_BUILD_TEST: python run_all_v2.py
3234

3335
steps:

‎ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,28 @@ jobs:
1717

1818
Python38-tf2.5:
1919
python.version: '3.8'
20-
ONNX_PATH: onnx==1.10.2
20+
ONNX_PATH: onnx==1.11.0
2121
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
22-
INSTALL_ORT: pip install onnxruntime==1.9.0
22+
INSTALL_ORT: pip install onnxruntime==1.11.0
23+
INSTALL_NUMPY: pip install numpy==1.19.0
2324

2425
############ Pure Keras Unit Tests ############
2526
Keras-Py37-tf1.15.0:
2627
python.version: '3.7'
27-
ONNX_PATH: onnx==1.10.2
28+
ONNX_PATH: onnx==1.11.0
2829
KERAS: keras==2.4.3
2930
TENSORFLOW_PATH: tensorflow==1.15.0
30-
INSTALL_ORT: pip install onnxruntime==1.9.0
31+
INSTALL_ORT: pip install onnxruntime==1.11.0
32+
INSTALL_NUMPY: pip install numpy==1.19.0
3133

3234
# UT for keras 2.3 need tensorflow <= 2.0.0
3335
Keras-Py37-tf2.0.0:
3436
python.version: '3.7'
35-
ONNX_PATH: onnx==1.10.2
37+
ONNX_PATH: onnx==1.11.0
3638
KERAS: keras==2.3.1
3739
TENSORFLOW_PATH: tensorflow==2.0.0
38-
INSTALL_ORT: pip install onnxruntime==1.9.0
40+
INSTALL_ORT: pip install onnxruntime==1.11.0
41+
INSTALL_NUMPY: pip install numpy==1.19.0
3942

4043
steps:
4144
- template: 'templates/keras2onnx_unit_test.yml'
@@ -54,19 +57,21 @@ jobs:
5457
TENSORFLOW_PATH: tensorflow==1.15.0
5558
INSTALL_ORT: pip install onnxruntime==1.9.0
5659

57-
Python37-tf2.8:
60+
Python37-tf2.3:
5861
python.version: '3.7'
59-
ONNX_PATH: onnx==1.10.2
62+
ONNX_PATH: onnx==1.11.0
6063
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
61-
INSTALL_ORT: pip install onnxruntime==1.9.0
64+
INSTALL_ORT: pip install onnxruntime==1.11.0
65+
INSTALL_NUMPY: pip install numpy==1.19.0
6266

6367
############ Pure Keras Unit Tests ############
6468
Keras-Py37-tf2.2.0:
6569
python.version: '3.7'
66-
ONNX_PATH: onnx==1.10.2
70+
ONNX_PATH: onnx==1.11.0
6771
KERAS: keras==2.4.3
6872
TENSORFLOW_PATH: tensorflow==2.2.0
69-
INSTALL_ORT: pip install onnxruntime==1.9.0
73+
INSTALL_ORT: pip install onnxruntime==1.11.0
74+
INSTALL_NUMPY: pip install numpy==1.19.0
7075

7176
steps:
7277
- template: 'templates/keras2onnx_unit_test.yml'

0 commit comments

Comments
 (0)