Skip to content

Commit 434b4a7

Browse files
fatcat-zfatcat-z
authored
Upgrade CI jobs. (#2076)
* Upgrade CI pipelines to support latest TF and ONNX runtime. Signed-off-by: Jay Zhang <[email protected]> * Upgrade CI pipelines to support latest TF and ONNX runtime. Signed-off-by: Jay Zhang <[email protected]>
1 parent 2c1db54 commit 434b4a7

12 files changed

+101
-173
lines changed

‎ci_build/azure_pipelines/keras2onnx_application_tests.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
INSTALL_NUMPY: pip install numpy==1.19.0
3333
NIGHTLY_BUILD_TEST: python run_all_v2.py
3434

35-
Python37-onnx1.11-tf2.8:
36-
python.version: '3.7'
37-
ONNX_PATH: onnx==1.11.0
35+
Python39-onnx1.12-tf2.8:
36+
python.version: '3.9'
37+
ONNX_PATH: onnx==1.12.0
3838
INSTALL_KERAS:
3939
UNINSTALL_KERAS:
4040
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
41-
INSTALL_ORT: pip install onnxruntime==1.11.0
41+
INSTALL_ORT: pip install onnxruntime==1.12.0
4242
INSTALL_KERAS_RESNET: pip install keras-resnet
4343
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
4444
INSTALL_NUMPY:
@@ -50,7 +50,7 @@ jobs:
5050
INSTALL_KERAS:
5151
UNINSTALL_KERAS:
5252
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
53-
INSTALL_ORT: pip install onnxruntime==1.12.0
53+
INSTALL_ORT: pip install onnxruntime==1.13.1
5454
INSTALL_KERAS_RESNET: pip install keras-resnet
5555
INSTALL_TRANSFORMERS: pip install transformers==4.12.0
5656
INSTALL_NUMPY:
@@ -67,37 +67,37 @@ jobs:
6767
vmImage: 'windows-2019'
6868
strategy:
6969
matrix:
70-
Python37-onnx1.9:
70+
Python37-onnx1.11-tf1.15:
7171
python.version: '3.7'
72-
ONNX_PATH: onnx==1.9.0
72+
ONNX_PATH: onnx==1.11.0
7373
INSTALL_KERAS: pip install keras==2.3.1
7474
UNINSTALL_KERAS:
7575
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
76-
INSTALL_ORT: pip install onnxruntime==1.9.0
76+
INSTALL_ORT: pip install onnxruntime==1.11.0
7777
INSTALL_KERAS_RESNET: pip install keras-resnet
7878
INSTALL_TRANSFORMERS:
7979
INSTALL_NUMPY: pip install numpy==1.19.0
8080
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
8181

82-
Python37-onnx1.11-tf1.15:
82+
Python37-onnx1.11-tf2.5:
8383
python.version: '3.7'
8484
ONNX_PATH: onnx==1.11.0
85-
INSTALL_KERAS: pip install keras==2.3.1
86-
UNINSTALL_KERAS:
87-
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
85+
INSTALL_KERAS:
86+
UNINSTALL_KERAS: pip uninstall keras -y
87+
INSTALL_TENSORFLOW: pip install tensorflow==2.5.0
8888
INSTALL_ORT: pip install onnxruntime==1.11.0
8989
INSTALL_KERAS_RESNET: pip install keras-resnet
90-
INSTALL_TRANSFORMERS:
90+
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
9191
INSTALL_NUMPY: pip install numpy==1.19.0
92-
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
92+
NIGHTLY_BUILD_TEST: python run_all_v2.py
9393

94-
Python38-onnx1.11-tf2.8:
95-
python.version: '3.8'
96-
ONNX_PATH: onnx==1.11.0
94+
Python39-onnx1.12-tf2.8:
95+
python.version: '3.9'
96+
ONNX_PATH: onnx==1.12.0
9797
INSTALL_KERAS:
9898
UNINSTALL_KERAS:
9999
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
100-
INSTALL_ORT: pip install onnxruntime==1.11.0
100+
INSTALL_ORT: pip install onnxruntime==1.12.0
101101
INSTALL_KERAS_RESNET: pip install keras-resnet
102102
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
103103
INSTALL_NUMPY:
@@ -109,7 +109,7 @@ jobs:
109109
INSTALL_KERAS:
110110
UNINSTALL_KERAS:
111111
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
112-
INSTALL_ORT: pip install onnxruntime==1.12.0
112+
INSTALL_ORT: pip install onnxruntime==1.13.1
113113
INSTALL_KERAS_RESNET: pip install keras-resnet
114114
INSTALL_TRANSFORMERS: pip install transformers==4.12.0
115115
INSTALL_NUMPY:

‎ci_build/azure_pipelines/keras2onnx_unit_test.yml

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,25 @@ jobs:
77
vmImage: 'ubuntu-latest'
88
strategy:
99
matrix:
10-
1110
############ TF Keras Unit Tests ############
12-
Python37-tf1.15:
13-
python.version: '3.7'
14-
ONNX_PATH: onnx==1.10.2
15-
TENSORFLOW_PATH: tensorflow==1.15.0
16-
INSTALL_ORT: pip install onnxruntime==1.9.0
17-
INSTALL_NUMPY: pip install numpy==1.19.0
18-
1911
Python38-tf2.5:
2012
python.version: '3.8'
2113
ONNX_PATH: onnx==1.11.0
22-
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
14+
TENSORFLOW_PATH: tensorflow==2.5.0
2315
INSTALL_ORT: pip install onnxruntime==1.11.0
2416
INSTALL_NUMPY: pip install numpy==1.19.0
2517

26-
Python39-tf2.8:
27-
python.version: '3.9'
28-
ONNX_PATH: onnx==1.11.0
29-
TENSORFLOW_PATH: tensorflow-cpu==2.8.0
30-
INSTALL_ORT: pip install onnxruntime==1.11.0
18+
Python37-tf2.8:
19+
python.version: '3.7'
20+
ONNX_PATH: onnx==1.12.0
21+
TENSORFLOW_PATH: tensorflow==2.8.0
22+
INSTALL_ORT: pip install onnxruntime==1.12.0
3123
INSTALL_NUMPY:
3224

33-
Python310-tf2.9:
25+
Python39-tf2.9:
3426
python.version: '3.9'
3527
ONNX_PATH: onnx==1.12.0
36-
TENSORFLOW_PATH: tensorflow-cpu==2.9.0
28+
TENSORFLOW_PATH: tensorflow==2.9.0
3729
INSTALL_ORT: pip install onnxruntime==1.12.0
3830
INSTALL_NUMPY:
3931

@@ -46,15 +38,6 @@ jobs:
4638
INSTALL_ORT: pip install onnxruntime==1.11.0
4739
INSTALL_NUMPY: pip install numpy==1.19.0
4840

49-
# UT for keras 2.3 need tensorflow <= 2.0.0
50-
Keras-Py37-tf2.0.0:
51-
python.version: '3.7'
52-
ONNX_PATH: -i onnx==1.11.0
53-
KERAS: keras==2.3.1
54-
TENSORFLOW_PATH: tensorflow==2.0.0
55-
INSTALL_ORT: pip install onnxruntime==1.11.0
56-
INSTALL_NUMPY: pip install numpy==1.19.0
57-
5841
Keras-Py38-tf2.2.0:
5942
python.version: '3.8'
6043
ONNX_PATH: -i onnx==1.11.0
@@ -63,14 +46,6 @@ jobs:
6346
INSTALL_ORT: pip install onnxruntime==1.11.0
6447
INSTALL_NUMPY: pip install numpy==1.19.0
6548

66-
Keras-Py310-tf2.9.0:
67-
python.version: '3.10'
68-
ONNX_PATH: -i onnx==1.12.0
69-
KERAS: keras==2.9.0
70-
TENSORFLOW_PATH: tensorflow==2.9.0
71-
INSTALL_ORT: pip install onnxruntime==1.12.0
72-
INSTALL_NUMPY: pip install numpy==1.23.0
73-
7449
steps:
7550
- template: 'templates/keras2onnx_unit_test.yml'
7651
parameters:
@@ -82,66 +57,44 @@ jobs:
8257
strategy:
8358
matrix:
8459
############ TF Keras Unit Tests ############
85-
Python37-tf-1.15:
86-
python.version: '3.7'
87-
ONNX_PATH: onnx==1.10.2
88-
TENSORFLOW_PATH: tensorflow==1.15.0
89-
INSTALL_ORT: pip install onnxruntime==1.9.0
90-
INSTALL_NUMPY: pip install numpy==1.19.0
91-
92-
Python37-tf2.5:
93-
python.version: '3.7'
60+
Python38-tf2.5:
61+
python.version: '3.8'
9462
ONNX_PATH: onnx==1.11.0
95-
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
63+
TENSORFLOW_PATH: tensorflow==2.5.0
9664
INSTALL_ORT: pip install onnxruntime==1.11.0
9765
INSTALL_NUMPY: pip install numpy==1.19.0
9866

99-
Python38-tf2.8:
100-
python.version: '3.8'
101-
ONNX_PATH: onnx==1.11.0
102-
TENSORFLOW_PATH: tensorflow-cpu==2.8.0
103-
INSTALL_ORT: pip install onnxruntime==1.11.0
67+
Python37-tf2.8:
68+
python.version: '3.7'
69+
ONNX_PATH: onnx==1.12.0
70+
TENSORFLOW_PATH: tensorflow==2.8.0
71+
INSTALL_ORT: pip install onnxruntime==1.12.0
10472
INSTALL_NUMPY:
10573

106-
Python310-tf2.9:
107-
python.version: '3.10'
74+
Python39-tf2.9:
75+
python.version: '3.9'
10876
ONNX_PATH: onnx==1.12.0
109-
TENSORFLOW_PATH: tensorflow-cpu==2.9.0
77+
TENSORFLOW_PATH: tensorflow==2.9.0
11078
INSTALL_ORT: pip install onnxruntime==1.12.0
11179
INSTALL_NUMPY:
11280

11381
############ Pure Keras Unit Tests ############
11482
Keras-Py37-tf1.15.0:
115-
python.version: '3.7'
116-
ONNX_PATH: onnx==1.10.2
117-
KERAS: keras==2.2.5
118-
TENSORFLOW_PATH: tensorflow==1.15.0
119-
INSTALL_ORT: pip install onnxruntime==1.9.0
120-
121-
Keras-Py37-tf2.0.0:
12283
python.version: '3.7'
12384
ONNX_PATH: onnx==1.11.0
124-
KERAS: keras==2.3.1
125-
TENSORFLOW_PATH: tensorflow==2.0.0
85+
KERAS: keras==2.4.3
86+
TENSORFLOW_PATH: tensorflow==1.15.0
12687
INSTALL_ORT: pip install onnxruntime==1.11.0
12788
INSTALL_NUMPY: pip install numpy==1.19.0
12889

129-
Keras-Py37-tf2.2.0:
130-
python.version: '3.7'
131-
ONNX_PATH: onnx==1.11.0
90+
Keras-Py38-tf2.2.0:
91+
python.version: '3.8'
92+
ONNX_PATH: -i onnx==1.11.0
13293
KERAS: keras==2.4.3
13394
TENSORFLOW_PATH: tensorflow==2.2.0
13495
INSTALL_ORT: pip install onnxruntime==1.11.0
13596
INSTALL_NUMPY: pip install numpy==1.19.0
13697

137-
Keras-Py310-tf2.9.0:
138-
python.version: '3.10'
139-
ONNX_PATH: onnx==1.12.0
140-
KERAS: keras==2.9.0
141-
TENSORFLOW_PATH: tensorflow==2.9.0
142-
INSTALL_ORT: pip install onnxruntime==1.12.0
143-
INSTALL_NUMPY:
144-
14598
steps:
14699
- template: 'templates/keras2onnx_unit_test.yml'
147100
parameters:

‎ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
parameters:
5151
platforms: ['linux', 'windows']
5252
python_versions: ['3.10']
53-
tf_versions: ['2.9.1']
53+
tf_versions: ['2.10.0']
5454
job:
5555
steps:
5656
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
jobs:
44
- template: 'templates/job_generator.yml'
55
parameters:
6-
# 2.6, tflite/tfjs
76
python_versions: ['3.8']
8-
tf_versions: ['2.6.2']
7+
tf_versions: ['2.9.0']
98
skip_tflite_tests: 'False'
109
skip_tfjs_tests: 'False'
1110
skip_tf_tests: 'True'
@@ -15,18 +14,16 @@ jobs:
1514

1615
- template: 'templates/job_generator.yml'
1716
parameters:
18-
# 2.8, tf
1917
python_versions: ['3.7']
20-
tf_versions: ['1.15.5','2.8.0']
18+
tf_versions: ['1.15.5','2.2.0']
2119
job:
2220
steps:
2321
- template: 'pretrained_model_test.yml'
2422

2523
- template: 'templates/job_generator.yml'
2624
parameters:
27-
# 2.10, tf
28-
python_versions: ['3.10']
29-
tf_versions: ['2.9.1']
25+
python_versions: ['3.9']
26+
tf_versions: ['2.10.0']
3027
job:
3128
steps:
3229
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/templates/job_generator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
tf_versions: ['']
77
onnx_versions: ['']
88
onnx_opsets: ['17', '16', '15', '14', '13']
9-
onnx_backends: {onnxruntime: ['1.12.0']}
9+
onnx_backends: {onnxruntime: ['1.13.1']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'

‎ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
pip install "protobuf<4.21.0"
2424
pip install h5py==2.9.0
2525
pip install parameterized
26+
pip install coloredlogs flatbuffers
2627
$(INSTALL_TENSORFLOW)
2728
$(INSTALL_KERAS)
2829
pip install git+https://github.com/microsoft/onnxconverter-common
@@ -86,6 +87,7 @@ steps:
8687
pip install "protobuf<4.21.0"
8788
pip install h5py==2.9.0
8889
pip install parameterized
90+
pip install coloredlogs flatbuffers
8991
%INSTALL_TENSORFLOW%
9092
%INSTALL_KERAS%
9193
pip install git+https://github.com/microsoft/onnxconverter-common

‎ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
pip install "protobuf<4.21.0"
2424
pip install h5py==2.9.0
2525
pip install parameterized
26+
pip install coloredlogs flatbuffers
2627
pip install $(TENSORFLOW_PATH)
2728
if [[ ! -z $KERAS ]];
2829
then
@@ -76,6 +77,7 @@ steps:
7677
pip install "protobuf<4.21.0"
7778
pip install h5py==2.9.0
7879
pip install parameterized
80+
pip install coloredlogs flatbuffers
7981
pip install %TENSORFLOW_PATH%
8082
IF NOT "%KERAS%"=="" (pip install %KERAS%)
8183
pip install git+https://github.com/microsoft/onnxconverter-common

‎ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
vmImage: 'ubuntu-latest'
99
strategy:
1010
matrix:
11-
Python37-onnx1.10:
11+
Python37-tf-1.15:
1212
python.version: '3.7'
1313
ONNX_PATH: onnx==1.11.0
14-
INSTALL_KERAS: pip install keras==2.2.4
14+
INSTALL_KERAS: pip install keras==2.3.1
1515
UNINSTALL_KERAS:
1616
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
1717
INSTALL_ORT: pip install onnxruntime==1.11.0
@@ -20,8 +20,20 @@ jobs:
2020
INSTALL_NUMPY: pip install numpy==1.19.0
2121
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
2222

23-
Python310-tf2.x:
24-
python.version: '3.10'
23+
Python38-tf2-latest:
24+
python.version: '3.8'
25+
ONNX_PATH: onnx==1.12.0
26+
INSTALL_KERAS:
27+
UNINSTALL_KERAS:
28+
INSTALL_TENSORFLOW: pip install tensorflow==2.10.0
29+
INSTALL_ORT: pip install onnxruntime==1.13.1
30+
INSTALL_KERAS_RESNET: pip install keras-resnet
31+
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
32+
INSTALL_NUMPY:
33+
NIGHTLY_BUILD_TEST: python run_all_v2.py
34+
35+
Python38-tf-2.x:
36+
python.version: '3.8'
2537
ONNX_PATH: onnx==1.12.0
2638
INSTALL_KERAS:
2739
UNINSTALL_KERAS:

0 commit comments

Comments
 (0)