Skip to content

Commit 13bab8a

Browse files
fatcat-zfatcat-z
authored
Complete changes to support latest tensorflow. (#2292)
Signed-off-by: Jay Zhang <jiz@microsoft.com>
1 parent 6a2d99e commit 13bab8a

13 files changed

+138
-139
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr
1717

1818
| Build Type | OS | Python | TensorFlow | ONNX opset | Status |
1919
| --- | --- | --- | --- | --- | --- |
20-
| Unit Test - Basic | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
21-
| Unit Test - Full | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
20+
| Unit Test - Basic | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
21+
| Unit Test - Full | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
2222
<br/>
2323

2424
## Supported Versions

‎ci_build/azure_pipelines/keras2onnx_application_tests.yml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ jobs:
88
vmImage: 'ubuntu-latest'
99
strategy:
1010
matrix:
11-
Python37-tf-1.15:
12-
python.version: '3.7' # Max version that supports tf 1.15
13-
ONNX_PATH: onnx==1.14.1 # Max version that supports python 3.7
14-
INSTALL_KERAS: pip install keras==2.3.1
11+
Python310-tf2-2.13:
12+
python.version: '3.10'
13+
ONNX_PATH: onnx==1.15.0
14+
INSTALL_KERAS:
1515
UNINSTALL_KERAS:
16-
INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
17-
INSTALL_ORT: pip install onnxruntime==1.14.1 # Max version that supports python 3.7
16+
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
17+
INSTALL_ORT: pip install onnxruntime==1.15.0
1818
INSTALL_KERAS_RESNET: pip install keras-resnet
19-
INSTALL_TRANSFORMERS:
19+
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
2020
INSTALL_NUMPY: pip install numpy==1.19.0
21-
INSTALL_LEGACY: pip install h5py==2.9.0
22-
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
21+
NIGHTLY_BUILD_TEST: python run_all_v2.py
2322

2423
Python39-tf2-2.12:
2524
python.version: '3.9'
@@ -45,8 +44,8 @@ jobs:
4544
INSTALL_NUMPY:
4645
NIGHTLY_BUILD_TEST: python run_all_v2.py
4746

48-
Python38-tf2-2.10:
49-
python.version: '3.8'
47+
Python39-tf2-2.10:
48+
python.version: '3.9'
5049
ONNX_PATH: onnx==1.15.0
5150
INSTALL_KERAS:
5251
UNINSTALL_KERAS:
@@ -57,18 +56,6 @@ jobs:
5756
INSTALL_NUMPY:
5857
NIGHTLY_BUILD_TEST: python run_all_v2.py
5958

60-
Python310-tf2-oldest:
61-
python.version: '3.10'
62-
ONNX_PATH: onnx==1.15.0
63-
INSTALL_KERAS:
64-
UNINSTALL_KERAS:
65-
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
66-
INSTALL_ORT: pip install onnxruntime==1.15.0
67-
INSTALL_KERAS_RESNET: pip install keras-resnet
68-
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
69-
INSTALL_NUMPY:
70-
NIGHTLY_BUILD_TEST: python run_all_v2.py
71-
7259
steps:
7360
- template: 'templates/keras2onnx_application_tests.yml'
7461
parameters:
@@ -93,32 +80,32 @@ jobs:
9380
INSTALL_LEGACY: pip install h5py==2.9.0
9481
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
9582

96-
Python310-tf2-2.13:
83+
Python310-tf2-2.15:
9784
python.version: '3.10'
9885
ONNX_PATH: onnx==1.15.0
9986
INSTALL_KERAS:
10087
UNINSTALL_KERAS:
101-
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
88+
INSTALL_TENSORFLOW: pip install tensorflow==2.15.0
10289
INSTALL_ORT: pip install onnxruntime==1.15.0
10390
INSTALL_KERAS_RESNET: pip install keras-resnet
10491
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
10592
INSTALL_NUMPY:
10693
NIGHTLY_BUILD_TEST: python run_all_v2.py
10794

108-
Python39-tf2-2.12:
109-
python.version: '3.9'
95+
Python310-tf2-2.14:
96+
python.version: '3.10'
11097
ONNX_PATH: onnx==1.15.0
11198
INSTALL_KERAS:
11299
UNINSTALL_KERAS:
113-
INSTALL_TENSORFLOW: pip install tensorflow==2.12.0
114-
INSTALL_ORT: pip install onnxruntime==1.15.1
100+
INSTALL_TENSORFLOW: pip install tensorflow==2.14.0
101+
INSTALL_ORT: pip install onnxruntime==1.15.0
115102
INSTALL_KERAS_RESNET: pip install keras-resnet
116-
INSTALL_TRANSFORMERS: pip install transformers==3.4.0
117-
INSTALL_NUMPY: pip install numpy==1.19.0
103+
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
104+
INSTALL_NUMPY:
118105
NIGHTLY_BUILD_TEST: python run_all_v2.py
119106

120-
Python310-tf2-2.11:
121-
python.version: '3.10'
107+
Python39-tf2-2.11:
108+
python.version: '3.9'
122109
ONNX_PATH: onnx==1.15.0
123110
INSTALL_KERAS:
124111
UNINSTALL_KERAS:
@@ -141,6 +128,18 @@ jobs:
141128
INSTALL_NUMPY:
142129
NIGHTLY_BUILD_TEST: python run_all_v2.py
143130

131+
Python38-tf2-2.9:
132+
python.version: '3.8'
133+
ONNX_PATH: onnx==1.15.0
134+
INSTALL_KERAS:
135+
UNINSTALL_KERAS:
136+
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
137+
INSTALL_ORT: pip install onnxruntime==1.15.1
138+
INSTALL_KERAS_RESNET: pip install keras-resnet
139+
INSTALL_TRANSFORMERS: pip install transformers==4.12.0
140+
INSTALL_NUMPY:
141+
NIGHTLY_BUILD_TEST: python run_all_v2.py
142+
144143
steps:
145144
- template: 'templates/keras2onnx_application_tests.yml'
146145
parameters:

‎ci_build/azure_pipelines/keras2onnx_unit_test.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
INSTALL_ORT: pip install onnxruntime==1.15.0
1616
INSTALL_NUMPY:
1717

18-
Python38-tf2-2.12:
19-
python.version: '3.8'
18+
Python39-tf2-2.12:
19+
python.version: '3.9'
2020
ONNX_PATH: onnx==1.15.0
2121
TENSORFLOW_PATH: tensorflow==2.12.0
2222
INSTALL_ORT: pip install onnxruntime==1.15.0
@@ -29,20 +29,13 @@ jobs:
2929
INSTALL_ORT: pip install onnxruntime==1.15.0
3030
INSTALL_NUMPY:
3131

32-
Python310-tf2-2.10:
33-
python.version: '3.10'
32+
Python38-tf2-2.10:
33+
python.version: '3.8'
3434
ONNX_PATH: onnx==1.15.0
3535
TENSORFLOW_PATH: tensorflow==2.10.0
3636
INSTALL_ORT: pip install onnxruntime==1.15.0
3737
INSTALL_NUMPY:
3838

39-
Python310-tf2-oldest:
40-
python.version: '3.10'
41-
ONNX_PATH: onnx==1.15.0
42-
TENSORFLOW_PATH: tensorflow==2.9.0
43-
INSTALL_ORT: pip install onnxruntime==1.15.0
44-
INSTALL_NUMPY:
45-
4639
############ Pure Keras Unit Tests ############
4740
Keras-Py37-tf1.15.0:
4841
python.version: '3.7' # Max version that supports tf 1.15
@@ -63,9 +56,16 @@ jobs:
6356
strategy:
6457
matrix:
6558
############ TF Keras Unit Tests ############
66-
Python310-tf2-2.13:
59+
Python310-tf2-2.14:
6760
python.version: '3.10'
6861
ONNX_PATH: onnx==1.15.0
62+
TENSORFLOW_PATH: tensorflow==2.14.0
63+
INSTALL_ORT: pip install onnxruntime==1.15.0
64+
INSTALL_NUMPY:
65+
66+
Python39-tf2-2.13:
67+
python.version: '3.9'
68+
ONNX_PATH: onnx==1.15.0
6969
TENSORFLOW_PATH: tensorflow==2.13.0
7070
INSTALL_ORT: pip install onnxruntime==1.15.0
7171
INSTALL_NUMPY:
@@ -84,20 +84,13 @@ jobs:
8484
INSTALL_ORT: pip install onnxruntime==1.15.0
8585
INSTALL_NUMPY:
8686

87-
Python310-tf2-2.10:
88-
python.version: '3.10'
87+
Python38-tf2-2.10:
88+
python.version: '3.8'
8989
ONNX_PATH: onnx==1.15.0
9090
TENSORFLOW_PATH: tensorflow==2.10.0
9191
INSTALL_ORT: pip install onnxruntime==1.15.0
9292
INSTALL_NUMPY:
9393

94-
Python310-tf2-oldest:
95-
python.version: '3.10'
96-
ONNX_PATH: onnx==1.15.0
97-
TENSORFLOW_PATH: tensorflow==2.9.0
98-
INSTALL_ORT: pip install onnxruntime==1.15.0
99-
INSTALL_NUMPY:
100-
10194
############ Pure Keras Unit Tests ############
10295
Keras-Py37-tf1.15.0:
10396
python.version: '3.7' # Max version that supports tf 1.15

‎ci_build/azure_pipelines/onnxruntime_nightly_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ stages:
1919
parameters:
2020
platforms: ['linux', 'windows']
2121
python_versions: ['3.8']
22-
tf_versions: ['2.9.0', '2.10.0', '2.13.0']
22+
tf_versions: ['2.9.0', '2.10.0', '2.15.0']
2323
onnx_backends: {onnxruntime: ['nightly']}
2424
job:
2525
steps:
@@ -30,7 +30,7 @@ stages:
3030
parameters:
3131
platforms: ['linux', 'windows']
3232
python_versions: ['3.9']
33-
tf_versions: ['2.12.0']
33+
tf_versions: ['2.11.0', '2.12.0']
3434
onnx_backends: {onnxruntime: ['nightly']}
3535
job:
3636
steps:
@@ -41,7 +41,7 @@ stages:
4141
parameters:
4242
platforms: ['linux', 'windows']
4343
python_versions: ['3.10']
44-
tf_versions: ['2.9.0', '2.13.0']
44+
tf_versions: ['2.9.0', '2.15.0']
4545
onnx_backends: {onnxruntime: ['nightly']}
4646
job:
4747
steps:

‎ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@ jobs:
88
python_versions: ['3.7'] # Max version that supports tf 1.15
99
tf_versions: ['1.15.5']
1010
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
11-
onnx_opsets: ['18', '17', '16', '15']
11+
onnx_opsets: ['18', '17', '16', '15', '14']
1212
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
1313
job:
1414
steps:
1515
- template: 'pretrained_model_test.yml'
1616

1717
- template: 'templates/job_generator.yml'
1818
parameters:
19-
platforms: ['windows']
20-
python_versions: ['3.8']
21-
tf_versions: ['2.9.0']
22-
onnx_opsets: ['18', '17', '16', '15']
19+
platforms: ['linux']
20+
python_versions: ['3.7'] # Max version that supports tf 1.15
21+
tf_versions: ['1.15.5']
22+
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
23+
onnx_opsets: ['18', '17', '16', '14']
24+
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
2325
job:
2426
steps:
2527
- template: 'pretrained_model_test.yml'
@@ -28,27 +30,15 @@ jobs:
2830
parameters:
2931
platforms: ['windows']
3032
python_versions: ['3.9']
31-
tf_versions: ['2.13.0']
32-
onnx_opsets: ['18', '17', '16', '15']
33-
job:
34-
steps:
35-
- template: 'pretrained_model_test.yml'
36-
37-
- template: 'templates/job_generator.yml'
38-
parameters:
39-
platforms: ['linux', 'windows']
40-
python_versions: ['3.7'] # Max version that supports tf 1.15
41-
tf_versions: ['1.15.5']
42-
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
43-
onnx_opsets: ['18', '17', '16', '14']
44-
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
33+
tf_versions: ['2.9.0', '2.15.0']
34+
onnx_opsets: ['18', '17', '16', '15', '14']
4535
job:
4636
steps:
4737
- template: 'pretrained_model_test.yml'
4838

4939
- template: 'templates/job_generator.yml'
5040
parameters:
51-
platforms: ['linux', 'windows']
41+
platforms: ['linux']
5242
python_versions: ['3.8']
5343
tf_versions: ['2.9.0']
5444
onnx_opsets: ['17', '16', '14']
@@ -58,9 +48,9 @@ jobs:
5848

5949
- template: 'templates/job_generator.yml'
6050
parameters:
61-
platforms: ['linux', 'windows']
62-
python_versions: ['3.9']
63-
tf_versions: ['2.13.0']
51+
platforms: ['linux']
52+
python_versions: ['3.10']
53+
tf_versions: ['2.15.0']
6454
onnx_opsets: ['17', '16', '14']
6555
job:
6656
steps:
@@ -69,7 +59,7 @@ jobs:
6959
- template: 'templates/job_generator.yml'
7060
parameters:
7161
platforms: ['linux', 'windows']
72-
python_versions: ['3.10']
62+
python_versions: ['3.8']
7363
tf_versions: ['2.10.0']
7464
job:
7565
steps:
@@ -86,10 +76,9 @@ jobs:
8676

8777
- template: 'templates/job_generator.yml'
8878
parameters:
89-
platforms: ['linux']
79+
platforms: ['linux', 'windows']
9080
python_versions: ['3.10']
91-
tf_versions: ['2.9.0', '2.13.0']
92-
onnx_opsets: ['17', '16', '14']
81+
tf_versions: ['2.14.0']
9382
job:
9483
steps:
9584
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
parameters:
2828
platforms: ['linux']
2929
python_versions: ['3.9']
30-
tf_versions: ['2.13.0']
30+
tf_versions: ['2.15.0']
3131
onnx_opsets: ['18', '15']
3232
job:
3333
steps:
@@ -37,7 +37,7 @@ jobs:
3737
parameters:
3838
platforms: ['linux']
3939
python_versions: ['3.10']
40-
tf_versions: ['2.9.0', '2.13.0']
40+
tf_versions: ['2.9.0', '2.15.0']
4141
onnx_opsets: ['18', '15']
4242
job:
4343
steps:

‎ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
INSTALL_TRANSFORMERS:
2020
INSTALL_NUMPY: pip install numpy==1.19.0
2121
INSTALL_LEGACY: pip install h5py==2.9.0
22-
NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
22+
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
2323

2424
Python38-tf2-oldest:
2525
python.version: '3.8'
@@ -33,36 +33,36 @@ jobs:
3333
INSTALL_NUMPY:
3434
NIGHTLY_BUILD_TEST: python run_all_v2.py
3535

36-
Python38-tf2-latest:
36+
Python310-tf2-latest:
3737
python.version: '3.8'
3838
ONNX_PATH: onnx==1.15.0
3939
INSTALL_KERAS:
4040
UNINSTALL_KERAS:
41-
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
41+
INSTALL_TENSORFLOW: pip install tensorflow==2.15.0
4242
INSTALL_ORT: pip install onnxruntime==1.16.3
4343
INSTALL_KERAS_RESNET: pip install keras-resnet
4444
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
4545
INSTALL_NUMPY:
4646
NIGHTLY_BUILD_TEST: python run_all_v2.py
4747

48-
Python310-tf2-oldest:
49-
python.version: '3.10'
48+
Python38-tf2-oldest-plus-1:
49+
python.version: '3.8'
5050
ONNX_PATH: onnx==1.15.0
5151
INSTALL_KERAS:
5252
UNINSTALL_KERAS:
53-
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
53+
INSTALL_TENSORFLOW: pip install tensorflow==2.10.0
5454
INSTALL_ORT: pip install onnxruntime==1.16.3
5555
INSTALL_KERAS_RESNET: pip install keras-resnet
5656
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
5757
INSTALL_NUMPY:
5858
NIGHTLY_BUILD_TEST: python run_all_v2.py
5959

60-
Python310-tf2-latest:
61-
python.version: '3.10'
60+
Python39-tf2-latest-minus-1:
61+
python.version: '3.9'
6262
ONNX_PATH: onnx==1.15.0
6363
INSTALL_KERAS:
6464
UNINSTALL_KERAS:
65-
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
65+
INSTALL_TENSORFLOW: pip install tensorflow==2.14.0
6666
INSTALL_ORT: pip install onnxruntime==1.16.3
6767
INSTALL_KERAS_RESNET: pip install keras-resnet
6868
INSTALL_TRANSFORMERS: pip install transformers==4.2.0

0 commit comments

Comments
 (0)