Skip to content

Commit 9590a8d

Browse files
authored
add opset-14, move ci pipeline to test opset-8 -> opset-14 (#1583)
* add opset-14, move ci pipeline to test opset-8 -> opset-14 Signed-off-by: Guenther Schmuelling <[email protected]> * pylint Signed-off-by: Guenther Schmuelling <[email protected]>
1 parent 98546b1 commit 9590a8d

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

README.md

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

1717
<br/>
1818

19-
| Build Type | OS | Python | Tensorflow | Onnx opset | Status |
19+
| Build Type | OS | Python | Tensorflow | ONNX opset | Status |
2020
| --- | --- | --- | --- | --- | --- |
21-
| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.5 | 7-13 | [![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) |
22-
| Unit Test - Full | Linux, MacOS, Windows | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.5 | 7-13 | [![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) | |
21+
| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6-3.9 | 1.12-1.15, 2.1-2.5 | 8-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) |
22+
| Unit Test - Full | Linux, MacOS, Windows | 3.6-3.9 | 1.12-1.15, 2.1-2.5 | 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) | |
2323
<br/>
2424

2525
## Supported Versions
@@ -28,21 +28,23 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr
2828

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

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

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

3536
### TensorFlow
3637

37-
We support ```tf-1.x graphs``` and ```tf-2```. To keep our test matrix manageable we test tf2onnx running on top of ```tf-1.12 and up```.
38+
We support ```tf-1.x graphs``` and ```tf-2```. To keep our test matrix manageable we test tf2onnx running on top of ```tf-1.12 or better```.
3839

3940
When running under tf-2.x tf2onnx will use the tensorflow V2 controlflow.
4041

4142
You can install tf2onnx on top of tf-1.x or tf-2.x.
4243

4344
### Python
4445

45-
We support Python ```3.6```, ```3.7``` and ```3.8```.
46+
We support Python ```3.6-3.9```.
47+
Note that on windows for Python > 3.7 the protobuf package doesn't use the cpp implementation and is very slow - we recommend to use Python 3.7 for that reason.
4648

4749
## Prerequisites
4850

ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
parameters:
3333
platforms: ['linux', 'windows']
3434
python_versions: ['3.8']
35-
tf_versions: ['2.5.0rc1']
35+
tf_versions: ['2.5.0']
3636
job:
3737
steps:
3838
- 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
@@ -5,7 +5,7 @@ parameters:
55
python_versions: ['3.7']
66
tf_versions: ['']
77
onnx_versions: ['']
8-
onnx_opsets: ['13', '12', '11', '10', '9', '8', '7']
8+
onnx_opsets: ['14', '13', '12', '11', '10', '9', '8']
99
onnx_backends: {onnxruntime: ['1.8.0']}
1010
job: {}
1111
run_setup: 'True'

ci_build/azure_pipelines/templates/unit_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Run unit test
22

33
parameters:
4-
onnx_opsets: ['13', '12', '11', '10', '9', '8', '7']
4+
onnx_opsets: ['14', '13', '12', '11', '10', '9', '8']
55
skip_tflite_tests: 'True'
66
skip_tf_tests: 'False'
77

ci_build/azure_pipelines/unit_test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ stages:
4040
parameters:
4141
platforms: ['linux', 'windows']
4242
python_versions: ['3.8']
43-
tf_versions: ['2.5.0rc1']
43+
tf_versions: ['2.5.0']
4444
onnx_opsets: ['']
4545
job:
4646
steps:

ci_build/azure_pipelines/unit_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ stages:
66
- template: 'templates/job_generator.yml'
77
parameters:
88
python_versions: ['3.8']
9-
tf_versions: ['2.5.0rc1']
9+
tf_versions: ['2.5.0']
1010
onnx_opsets: ['']
1111
skip_tflite_tests: 'False'
1212
skip_tf_tests: 'True'
@@ -30,7 +30,7 @@ stages:
3030
- template: 'templates/job_generator.yml'
3131
parameters:
3232
python_versions: ['3.8']
33-
tf_versions: ['2.5.0rc1']
33+
tf_versions: ['2.5.0']
3434
onnx_opsets: ['']
3535
job:
3636
steps:

tf2onnx/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
# Mapping opset to IR version.
4848
# Note: opset 7 and opset 8 came out with IR3 but we need IR4 because of PlaceholderWithDefault
4949
OPSET_TO_IR_VERSION = {
50-
1: 3, 2: 3, 3: 3, 4: 3, 5: 3, 6: 3, 7: 4, 8: 4, 9: 4, 10: 5, 11: 6, 12: 7, 13: 7
50+
1: 3, 2: 3, 3: 3, 4: 3, 5: 3, 6: 3, 7: 4, 8: 4, 9: 4, 10: 5, 11: 6, 12: 7, 13: 7, 14: 7
5151
}

0 commit comments

Comments
 (0)