Skip to content

Commit 898c069

Browse files
fatcat-zfatcat-z
authored
Upgrade ort to 1.16.3 in CI. (#2283)
* Upgrade ort to 1.16.3 in CI. * Update CI tests and the way of install tensorflow-text. * Change tf version coverage to [2.9.0 ... 2.14.0]. Signed-off-by: Jay Zhang <[email protected]> --------- Signed-off-by: Jay Zhang <[email protected]> Signed-off-by: Jay Zhang <[email protected]>
1 parent f36a3fb commit 898c069

13 files changed

+143
-85
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.8-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.8-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.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) | |
2222
<br/>
2323

2424
## Supported Versions

‎ci_build/azure_pipelines/keras2onnx_application_tests.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
ONNX_PATH: onnx==1.15.0
6363
INSTALL_KERAS:
6464
UNINSTALL_KERAS:
65-
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
65+
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
6666
INSTALL_ORT: pip install onnxruntime==1.15.0
6767
INSTALL_KERAS_RESNET: pip install keras-resnet
6868
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
@@ -93,6 +93,18 @@ jobs:
9393
INSTALL_LEGACY: pip install h5py==2.9.0
9494
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
9595

96+
Python310-tf2-2.13:
97+
python.version: '3.10'
98+
ONNX_PATH: onnx==1.15.0
99+
INSTALL_KERAS:
100+
UNINSTALL_KERAS:
101+
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
102+
INSTALL_ORT: pip install onnxruntime==1.15.0
103+
INSTALL_KERAS_RESNET: pip install keras-resnet
104+
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
105+
INSTALL_NUMPY:
106+
NIGHTLY_BUILD_TEST: python run_all_v2.py
107+
96108
Python39-tf2-2.12:
97109
python.version: '3.9'
98110
ONNX_PATH: onnx==1.15.0
@@ -129,18 +141,6 @@ jobs:
129141
INSTALL_NUMPY:
130142
NIGHTLY_BUILD_TEST: python run_all_v2.py
131143

132-
Python310-tf2-oldest:
133-
python.version: '3.10'
134-
ONNX_PATH: onnx==1.15.0
135-
INSTALL_KERAS:
136-
UNINSTALL_KERAS:
137-
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
138-
INSTALL_ORT: pip install onnxruntime==1.15.0
139-
INSTALL_KERAS_RESNET: pip install keras-resnet
140-
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
141-
INSTALL_NUMPY:
142-
NIGHTLY_BUILD_TEST: python run_all_v2.py
143-
144144
steps:
145145
- template: 'templates/keras2onnx_application_tests.yml'
146146
parameters:

‎ci_build/azure_pipelines/keras2onnx_unit_test.yml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,10 @@ jobs:
3636
INSTALL_ORT: pip install onnxruntime==1.15.0
3737
INSTALL_NUMPY:
3838

39-
Python38-tf2-2.9:
40-
python.version: '3.8'
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
Python310-tf2-oldest:
4740
python.version: '3.10'
4841
ONNX_PATH: onnx==1.15.0
49-
TENSORFLOW_PATH: tensorflow==2.8.0
42+
TENSORFLOW_PATH: tensorflow==2.9.0
5043
INSTALL_ORT: pip install onnxruntime==1.15.0
5144
INSTALL_NUMPY:
5245

@@ -98,17 +91,10 @@ jobs:
9891
INSTALL_ORT: pip install onnxruntime==1.15.0
9992
INSTALL_NUMPY:
10093

101-
Python38-tf2-2.9:
102-
python.version: '3.8'
103-
ONNX_PATH: onnx==1.15.0
104-
TENSORFLOW_PATH: tensorflow==2.9.0
105-
INSTALL_ORT: pip install onnxruntime==1.15.0
106-
INSTALL_NUMPY:
107-
10894
Python310-tf2-oldest:
10995
python.version: '3.10'
11096
ONNX_PATH: onnx==1.15.0
111-
TENSORFLOW_PATH: tensorflow==2.8.0
97+
TENSORFLOW_PATH: tensorflow==2.9.0
11298
INSTALL_ORT: pip install onnxruntime==1.15.0
11399
INSTALL_NUMPY:
114100

‎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.8.0', '2.9.0', '2.13.0']
22+
tf_versions: ['2.9.0', '2.10.0', '2.13.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.10.0', '2.12.0']
33+
tf_versions: ['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.8.0', '2.13.0']
44+
tf_versions: ['2.9.0', '2.13.0']
4545
onnx_backends: {onnxruntime: ['nightly']}
4646
job:
4747
steps:

‎ci_build/azure_pipelines/pretrained_model_test-matrix.yml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ jobs:
1818
parameters:
1919
platforms: ['windows']
2020
python_versions: ['3.8']
21-
tf_versions: ['2.8.0', '2.13.0']
21+
tf_versions: ['2.9.0']
22+
onnx_opsets: ['18', '17', '16', '15']
23+
job:
24+
steps:
25+
- template: 'pretrained_model_test.yml'
26+
27+
- template: 'templates/job_generator.yml'
28+
parameters:
29+
platforms: ['windows']
30+
python_versions: ['3.9']
31+
tf_versions: ['2.13.0']
2232
onnx_opsets: ['18', '17', '16', '15']
2333
job:
2434
steps:
@@ -30,7 +40,7 @@ jobs:
3040
python_versions: ['3.7'] # Max version that supports tf 1.15
3141
tf_versions: ['1.15.5']
3242
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
33-
onnx_opsets: ['14']
43+
onnx_opsets: ['18', '17', '16', '14']
3444
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
3545
job:
3646
steps:
@@ -40,7 +50,17 @@ jobs:
4050
parameters:
4151
platforms: ['linux', 'windows']
4252
python_versions: ['3.8']
43-
tf_versions: ['2.8.0', '2.13.0']
53+
tf_versions: ['2.9.0']
54+
onnx_opsets: ['17', '16', '14']
55+
job:
56+
steps:
57+
- template: 'pretrained_model_test.yml'
58+
59+
- template: 'templates/job_generator.yml'
60+
parameters:
61+
platforms: ['linux', 'windows']
62+
python_versions: ['3.9']
63+
tf_versions: ['2.13.0']
4464
onnx_opsets: ['17', '16', '14']
4565
job:
4666
steps:
@@ -50,7 +70,7 @@ jobs:
5070
parameters:
5171
platforms: ['linux', 'windows']
5272
python_versions: ['3.10']
53-
tf_versions: ['2.8.0']
73+
tf_versions: ['2.10.0']
5474
job:
5575
steps:
5676
- template: 'pretrained_model_test.yml'
@@ -59,7 +79,7 @@ jobs:
5979
parameters:
6080
platforms: ['linux', 'windows']
6181
python_versions: ['3.9']
62-
tf_versions: ['2.10.0', '2.11.0', '2.12.0']
82+
tf_versions: ['2.11.0', '2.12.0']
6383
job:
6484
steps:
6585
- template: 'pretrained_model_test.yml'
@@ -69,6 +89,7 @@ jobs:
6989
platforms: ['linux']
7090
python_versions: ['3.10']
7191
tf_versions: ['2.9.0', '2.13.0']
92+
onnx_opsets: ['17', '16', '14']
7293
job:
7394
steps:
7495
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/pretrained_model_test.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
python_versions: ['3.7'] # Max version that supports tf 1.15
88
tf_versions: ['1.15.5']
99
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
10-
onnx_opsets: ['18', '17', '16', '15']
10+
onnx_opsets: ['15']
1111
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
1212
job:
1313
steps:
@@ -17,7 +17,7 @@ jobs:
1717
parameters:
1818
platforms: ['linux']
1919
python_versions: ['3.8']
20-
tf_versions: ['2.8.0', '2.13.0']
20+
tf_versions: ['2.9.0']
2121
onnx_opsets: ['18', '15']
2222
job:
2323
steps:
@@ -26,9 +26,19 @@ jobs:
2626
- template: 'templates/job_generator.yml'
2727
parameters:
2828
platforms: ['linux']
29-
python_versions: ['3.10']
29+
python_versions: ['3.9']
3030
tf_versions: ['2.13.0']
3131
onnx_opsets: ['18', '15']
32+
job:
33+
steps:
34+
- template: 'pretrained_model_test.yml'
35+
36+
- template: 'templates/job_generator.yml'
37+
parameters:
38+
platforms: ['linux']
39+
python_versions: ['3.10']
40+
tf_versions: ['2.9.0', '2.13.0']
41+
onnx_opsets: ['18', '15']
3242
job:
3343
steps:
3444
- 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: ['1.15.0']
88
onnx_opsets: ['18', '17', '16', '15', '14']
9-
onnx_backends: {onnxruntime: ['1.15.1']}
9+
onnx_backends: {onnxruntime: ['1.16.3']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'

‎ci_build/azure_pipelines/templates/setup.yml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ steps:
55
set -ex
66
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
77
pip install $(CI_PIP_ONNX_NAME)
8-
9-
# TF < 2.7 reuires numpy <= 1.19, but onnxruntime >= 1.11 requires numpy >= 1.21
10-
if [[ $CI_TF_VERSION < 2.7 ]] && [[ $CI_ONNX_BACKEND == "onnxruntime" ]] ;
11-
then
12-
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy --no-deps -U
13-
else
14-
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy==1.23.4
15-
fi
8+
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy
169
1710
if [[ $CI_SKIP_TFJS_TESTS == "False" ]] ;
1811
then
@@ -24,11 +17,6 @@ steps:
2417
then
2518
pip install onnxruntime-extensions
2619
pip install "tensorflow-text<=$(CI_TF_VERSION)"
27-
28-
if [[ $CI_TF_VERSION < 2.8 ]] ;
29-
then
30-
pip install wrapt==1.14.1
31-
fi
3220
fi
3321
3422
if [[ $CI_ONNXRUNTIME_NIGHTLY == "true" ]] ;

‎ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,44 @@ jobs:
2626
ONNX_PATH: onnx==1.15.0
2727
INSTALL_KERAS:
2828
UNINSTALL_KERAS:
29-
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
30-
INSTALL_ORT: pip install onnxruntime==1.15.0
29+
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
30+
INSTALL_ORT: pip install onnxruntime==1.16.3
3131
INSTALL_KERAS_RESNET: pip install keras-resnet
3232
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
3333
INSTALL_NUMPY:
3434
NIGHTLY_BUILD_TEST: python run_all_v2.py
3535

36-
Python38-tf2-2.13:
36+
Python38-tf2-latest:
3737
python.version: '3.8'
3838
ONNX_PATH: onnx==1.15.0
3939
INSTALL_KERAS:
4040
UNINSTALL_KERAS:
4141
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
42-
INSTALL_ORT: pip install onnxruntime==1.15.0
42+
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-
Python38-tf2-oldest-onnx-15:
49-
python.version: '3.8'
48+
Python310-tf2-oldest:
49+
python.version: '3.10'
5050
ONNX_PATH: onnx==1.15.0
5151
INSTALL_KERAS:
5252
UNINSTALL_KERAS:
53-
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
54-
INSTALL_ORT: pip install onnxruntime==1.15.0
53+
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
54+
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-
Python38-tf2-2.13-onnx-15:
61-
python.version: '3.8'
60+
Python310-tf2-latest:
61+
python.version: '3.10'
6262
ONNX_PATH: onnx==1.15.0
6363
INSTALL_KERAS:
6464
UNINSTALL_KERAS:
6565
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
66-
INSTALL_ORT: pip install onnxruntime==1.15.0
66+
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
6969
INSTALL_NUMPY:

‎ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,29 @@ jobs:
1919
Python38-tf2-oldest:
2020
python.version: '3.8'
2121
ONNX_PATH: onnx==1.15.0
22-
TENSORFLOW_PATH: tensorflow==2.8.0
23-
INSTALL_ORT: pip install onnxruntime==1.15.0
22+
TENSORFLOW_PATH: tensorflow==2.9.0
23+
INSTALL_ORT: pip install onnxruntime==1.16.3
2424
INSTALL_NUMPY:
2525

26-
Python38-tf2-2.13:
26+
Python38-tf2-latest:
2727
python.version: '3.8'
2828
ONNX_PATH: onnx==1.15.0
2929
TENSORFLOW_PATH: tensorflow==2.13.0
30-
INSTALL_ORT: pip install onnxruntime==1.15.0
30+
INSTALL_ORT: pip install onnxruntime==1.16.3
31+
INSTALL_NUMPY:
32+
33+
Python310-tf2-oldest:
34+
python.version: '3.10'
35+
ONNX_PATH: onnx==1.15.0
36+
TENSORFLOW_PATH: tensorflow==2.9.0
37+
INSTALL_ORT: pip install onnxruntime==1.16.3
38+
INSTALL_NUMPY:
39+
40+
Python310-tf2-latest:
41+
python.version: '3.10'
42+
ONNX_PATH: onnx==1.15.0
43+
TENSORFLOW_PATH: tensorflow==2.13.0
44+
INSTALL_ORT: pip install onnxruntime==1.16.3
3145
INSTALL_NUMPY:
3246

3347
############ Pure Keras Unit Tests ############
@@ -61,15 +75,15 @@ jobs:
6175
Python38-tf2-oldest:
6276
python.version: '3.8'
6377
ONNX_PATH: onnx==1.15.0
64-
TENSORFLOW_PATH: tensorflow==2.8.0
65-
INSTALL_ORT: pip install onnxruntime==1.15.0
78+
TENSORFLOW_PATH: tensorflow==2.9.0
79+
INSTALL_ORT: pip install onnxruntime==1.16.3
6680
INSTALL_NUMPY:
6781

68-
Python38-tf2-2.13:
82+
Python38-tf2-latest:
6983
python.version: '3.8'
7084
ONNX_PATH: onnx==1.15.0
7185
TENSORFLOW_PATH: tensorflow==2.13.0
72-
INSTALL_ORT: pip install onnxruntime==1.15.0
86+
INSTALL_ORT: pip install onnxruntime==1.16.3
7387
INSTALL_NUMPY:
7488

7589
############ Pure Keras Unit Tests ############

0 commit comments

Comments
 (0)