Skip to content

Commit 16015cf

Browse files
guschmueguschmue
committed
Merge branch 'master' into r1.9
2 parents 0f28b75 + edd15d0 commit 16015cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1341
-415
lines changed

‎README.md

Lines changed: 3 additions & 3 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, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6-3.9 | 1.12-1.15, 2.1-2.6 | 8-14 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=master) |
21-
| Unit Test - Full | Linux, MacOS, Windows | 3.6-3.9 | 1.12-1.15, 2.1-2.6 | 8-14 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=master) | |
20+
| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6-3.9 | 1.12-1.15, 2.1-2.6 | 9-15 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=master) |
21+
| Unit Test - Full | Linux, MacOS, Windows | 3.6-3.9 | 1.12-1.15, 2.1-2.6 | 9-15 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=master) | |
2222
<br/>
2323

2424
## Supported Versions
@@ -27,7 +27,7 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr
2727

2828
tf2onnx will use the ONNX version installed on your system and installs the latest ONNX version if none is found.
2929

30-
We support and test ONNX opset-8 to opset-14. opset-6 and opset-7 should work but we don't test them.
30+
We support and test ONNX opset-9 to opset-15. opset-6 to opset-8 should work but we don't test them.
3131
By default we use ```opset-9``` for the resulting ONNX graph since most runtimes will support opset-9.
3232

3333
If you want the graph to be generated with a specific opset, use ```--opset``` in the command line, for example ```--opset 13```.

‎ci_build/azure_pipelines/keras2onnx_application_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job: 'Linux'
66
timeoutInMinutes: 180
77
pool:
8-
vmImage: 'Ubuntu-16.04'
8+
vmImage: 'ubuntu-latest'
99
strategy:
1010
matrix:
1111
Python36-onnx1.5:

‎ci_build/azure_pipelines/keras2onnx_unit_test.yml

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,70 +4,70 @@ jobs:
44

55
- job: 'Linux'
66
pool:
7-
vmImage: 'Ubuntu-16.04'
7+
vmImage: 'ubuntu-latest'
88
strategy:
99
matrix:
1010

1111
############ TF Keras Unit Tests ############
1212
Python36-tf1.15:
1313
python.version: '3.6'
14-
ONNX_PATH: onnx==1.5.0
14+
ONNX_PATH: onnx==1.10.2
1515
TENSORFLOW_PATH: tensorflow==1.15.0
16-
INSTALL_ORT: pip install onnxruntime==1.8.0
16+
INSTALL_ORT: pip install onnxruntime==1.9.0
1717

1818
Python37-tf2.1:
1919
python.version: '3.7'
20-
ONNX_PATH: onnx==1.6.0
20+
ONNX_PATH: onnx==1.10.2
2121
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
22-
INSTALL_ORT: pip install onnxruntime==1.8.0
22+
INSTALL_ORT: pip install onnxruntime==1.9.0
2323

2424
Python38-tf2.2:
2525
python.version: '3.8'
26-
ONNX_PATH: onnx==1.7.0
26+
ONNX_PATH: onnx==1.10.2
2727
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
28-
INSTALL_ORT: pip install onnxruntime==1.8.0
28+
INSTALL_ORT: pip install onnxruntime==1.9.0
2929

3030
Python38-tf2.3:
3131
python.version: '3.8'
32-
ONNX_PATH: onnx==1.8.0
32+
ONNX_PATH: onnx==1.10.2
3333
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
34-
INSTALL_ORT: pip install onnxruntime==1.8.0
34+
INSTALL_ORT: pip install onnxruntime==1.9.0
3535

3636
Python38-tf2.5:
3737
python.version: '3.8'
38-
ONNX_PATH: onnx==1.8.0
38+
ONNX_PATH: onnx==1.10.2
3939
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
40-
INSTALL_ORT: pip install onnxruntime==1.8.0
40+
INSTALL_ORT: pip install onnxruntime==1.9.0
4141

4242
############ Pure Keras Unit Tests ############
4343
Keras-Py36-tf1.15.0:
4444
python.version: '3.6'
45-
ONNX_PATH: onnx==1.5.0
45+
ONNX_PATH: onnx==1.10.2
4646
KERAS: keras==2.2.5
4747
TENSORFLOW_PATH: tensorflow==1.15.0
48-
INSTALL_ORT: pip install onnxruntime==1.8.0
48+
INSTALL_ORT: pip install onnxruntime==1.9.0
4949

5050
Keras-Py37-tf1.15.0:
5151
python.version: '3.7'
52-
ONNX_PATH: onnx==1.9.0
52+
ONNX_PATH: onnx==1.10.2
5353
KERAS: keras==2.4.3
5454
TENSORFLOW_PATH: tensorflow==1.15.0
55-
INSTALL_ORT: pip install onnxruntime==1.8.0
55+
INSTALL_ORT: pip install onnxruntime==1.9.0
5656

5757
# UT for keras 2.3 need tensorflow <= 2.0.0
5858
Keras-Py37-tf2.0.0:
5959
python.version: '3.7'
60-
ONNX_PATH: onnx==1.6.0
60+
ONNX_PATH: -i onnx==1.10.2
6161
KERAS: keras==2.3.1
6262
TENSORFLOW_PATH: tensorflow==2.0.0
63-
INSTALL_ORT: pip install onnxruntime==1.8.0
63+
INSTALL_ORT: pip install onnxruntime==1.9.0
6464

6565
Keras-Py38-tf2.2.0:
6666
python.version: '3.8'
67-
ONNX_PATH: onnx==1.7.0
67+
ONNX_PATH: -i onnx==1.10.2
6868
KERAS: keras==2.4.3
6969
TENSORFLOW_PATH: tensorflow==2.2.0
70-
INSTALL_ORT: pip install onnxruntime==1.8.0
70+
INSTALL_ORT: pip install onnxruntime==1.9.0
7171

7272
steps:
7373
- template: 'templates/keras2onnx_unit_test.yml'
@@ -80,63 +80,57 @@ jobs:
8080
strategy:
8181
matrix:
8282
############ TF Keras Unit Tests ############
83-
Python36-onnx1.2:
83+
Python36-tf-1.15:
8484
python.version: '3.6'
85-
ONNX_PATH: onnx==1.2.3
85+
ONNX_PATH: onnx==1.10.2
8686
TENSORFLOW_PATH: tensorflow==1.15.0
87-
INSTALL_ORT: pip install onnxruntime==1.8.0
88-
89-
Python36-onnx1.5:
90-
python.version: '3.6'
91-
ONNX_PATH: onnx==1.5.0
92-
TENSORFLOW_PATH: tensorflow==1.15.0
93-
INSTALL_ORT: pip install onnxruntime==1.8.0
87+
INSTALL_ORT: pip install onnxruntime==1.9.0
9488

9589
Python37-tf2.1:
9690
python.version: '3.7'
97-
ONNX_PATH: onnx==1.6.0
91+
ONNX_PATH: onnx==1.10.2
9892
TENSORFLOW_PATH: tensorflow-cpu==2.1.0
99-
INSTALL_ORT: pip install onnxruntime==1.8.0
93+
INSTALL_ORT: pip install onnxruntime==1.9.0
10094

10195
Python37-tf2.2:
10296
python.version: '3.7'
103-
ONNX_PATH: onnx==1.7.0
97+
ONNX_PATH: onnx==1.10.2
10498
TENSORFLOW_PATH: tensorflow-cpu==2.2.0
105-
INSTALL_ORT: pip install onnxruntime==1.8.0
99+
INSTALL_ORT: pip install onnxruntime==1.9.0
106100

107101
Python37-tf2.3:
108102
python.version: '3.7'
109-
ONNX_PATH: onnx==1.9.0
103+
ONNX_PATH: onnx==1.10.2
110104
TENSORFLOW_PATH: tensorflow-cpu==2.3.0
111-
INSTALL_ORT: pip install onnxruntime==1.8.0
105+
INSTALL_ORT: pip install onnxruntime==1.9.0
112106

113107
Python37-tf2.5:
114108
python.version: '3.7'
115-
ONNX_PATH: onnx==1.9.0
109+
ONNX_PATH: onnx==1.10.2
116110
TENSORFLOW_PATH: tensorflow-cpu==2.5.0
117-
INSTALL_ORT: pip install onnxruntime==1.8.0
111+
INSTALL_ORT: pip install onnxruntime==1.9.0
118112

119113
############ Pure Keras Unit Tests ############
120114
Keras-Py36-tf1.15.0:
121115
python.version: '3.6'
122-
ONNX_PATH: onnx==1.5.0
116+
ONNX_PATH: onnx==1.10.2
123117
KERAS: keras==2.2.5
124118
TENSORFLOW_PATH: tensorflow==1.15.0
125-
INSTALL_ORT: pip install onnxruntime==1.8.0
119+
INSTALL_ORT: pip install onnxruntime==1.9.0
126120

127121
Keras-Py37-tf2.0.0:
128122
python.version: '3.7'
129-
ONNX_PATH: onnx==1.7.0
123+
ONNX_PATH: onnx==1.10.2
130124
KERAS: keras==2.3.1
131125
TENSORFLOW_PATH: tensorflow==2.0.0
132-
INSTALL_ORT: pip install onnxruntime==1.8.0
126+
INSTALL_ORT: pip install onnxruntime==1.9.0
133127

134128
Keras-Py37-tf2.2.0:
135129
python.version: '3.7'
136-
ONNX_PATH: onnx==1.9.0
130+
ONNX_PATH: onnx==1.10.2
137131
KERAS: keras==2.4.3
138132
TENSORFLOW_PATH: tensorflow==2.2.0
139-
INSTALL_ORT: pip install onnxruntime==1.8.0
133+
INSTALL_ORT: pip install onnxruntime==1.9.0
140134

141135
steps:
142136
- template: 'templates/keras2onnx_unit_test.yml'

‎ci_build/azure_pipelines/onnxruntime_nightly_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ stages:
8080
parameters:
8181
platforms: ['linux']
8282
python_versions: ['3.9']
83-
tf_versions: ['2.6.0']
83+
tf_versions: ['2.6.2']
8484
onnx_opsets: ['']
8585
onnx_backends: {onnxruntime: ['nightly']}
8686
job:

‎ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
parameters:
4242
platforms: ['linux', 'windows']
4343
python_versions: ['3.9']
44-
tf_versions: ['2.6.0']
44+
tf_versions: ['2.6.2']
4545
job:
4646
steps:
4747
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
jobs:
44
- template: 'templates/job_generator.yml'
55
parameters:
6-
python_versions: ['3.7']
7-
tf_versions: ['2.4.1']
6+
# 2.6, tflite/tfjs
7+
python_versions: ['3.8']
8+
tf_versions: ['2.6.2']
89
skip_tflite_tests: 'False'
910
skip_tfjs_tests: 'False'
1011
skip_tf_tests: 'True'
@@ -14,8 +15,18 @@ jobs:
1415

1516
- template: 'templates/job_generator.yml'
1617
parameters:
18+
# 2.6, tf
1719
python_versions: ['3.7']
18-
tf_versions: ['1.15.5','2.6.0']
20+
tf_versions: ['1.15.5','2.6.2']
21+
job:
22+
steps:
23+
- template: 'pretrained_model_test.yml'
24+
25+
- template: 'templates/job_generator.yml'
26+
parameters:
27+
# 2.7, tf
28+
python_versions: ['3.9']
29+
tf_versions: ['2.7.0']
1930
job:
2031
steps:
2132
- template: 'pretrained_model_test.yml'

‎ci_build/azure_pipelines/templates/combine_test_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ stages:
1111
CI_ARTIFACT_NAME: '${{ parameters.artifact_name }}'
1212

1313
pool:
14-
vmImage: 'ubuntu-16.04'
14+
vmImage: 'ubuntu-latest'
1515

1616
steps:
1717
- task: DownloadBuildArtifacts@0

‎ci_build/azure_pipelines/templates/job_generator.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ parameters:
55
python_versions: ['3.7']
66
tf_versions: ['']
77
onnx_versions: ['']
8-
onnx_opsets: ['14', '13', '12', '11', '10', '9', '8']
9-
onnx_backends: {onnxruntime: ['1.8.0']}
8+
onnx_opsets: ['15', '14', '13', '12', '11', '10', '9']
9+
onnx_backends: {onnxruntime: ['1.9.0']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'
@@ -17,6 +17,7 @@ parameters:
1717

1818
jobs:
1919
- job: ${{ parameters.job.name }}
20+
timeoutInMinutes: 100
2021
pool:
2122
vmImage: $(CI_VM_IMAGE)
2223

@@ -32,7 +33,7 @@ jobs:
3233
${{ each onnx_opset in parameters.onnx_opsets }}:
3334
${{ format('{0} python{1}{2}{3} tf{4} onnx{5} {6}{7}{8}', platform, python_version, replace(replace(parameters.skip_tflite_tests,'True', ''), 'False', ' tflite'), replace(replace(parameters.skip_tfjs_tests,'True', ''), 'False', ' tfjs'), tf_version, onnx_version, replace(format('opset{0} ', onnx_opset), 'opset ', ''), onnx_backend.key, onnx_backend_version) }}:
3435
${{ if eq(platform, 'linux') }}:
35-
CI_VM_IMAGE: 'ubuntu-16.04'
36+
CI_VM_IMAGE: 'ubuntu-latest'
3637
${{ if eq(platform, 'windows') }}:
3738
CI_VM_IMAGE: 'vs2017-win2016'
3839
${{ if eq(platform, 'mac') }}:

‎ci_build/azure_pipelines/templates/setup.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
2929
if [[ $CI_TF_VERSION == 2.* ]] ;
3030
then
31-
pip install onnxruntime-extensions
31+
pip install onnxruntime-extensions==0.3.1
3232
if [[ $CI_TF_VERSION == 2.3* ]] ;
3333
then
3434
pip install tensorflow-text==${CI_TF_VERSION}
@@ -43,8 +43,11 @@ steps:
4343
fi
4444
if [[ $CI_TF_VERSION == 2.6* ]] ;
4545
then
46-
# FIXME: make it >= 2.6 after offical tensorflow-text was released
47-
pip install tensorflow-text==2.6.0rc0
46+
pip install tensorflow-text>=2.6
47+
fi
48+
if [[ $CI_TF_VERSION == 2.7* ]] ;
49+
then
50+
pip install tensorflow-text>=2.6
4851
fi
4952
fi
5053

‎ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job: 'Linux'
66
timeoutInMinutes: 180
77
pool:
8-
vmImage: 'Ubuntu-16.04'
8+
vmImage: 'ubuntu-latest'
99
strategy:
1010
matrix:
1111
Python36-onnx1.5:

0 commit comments

Comments
 (0)