Skip to content

Commit 911d78a

Browse files
authored
Merge pull request #792 from onnx/gs/trim-ci
trim ci pipeline to tf-1.12 or better and replace python 3.5 with 3.8
2 parents bb95759 + a829c51 commit 911d78a

File tree

7 files changed

+33
-28
lines changed

7 files changed

+33
-28
lines changed

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,26 @@ tf2onnx - Convert TensorFlow models to ONNX.
33

44
| Build Type | OS | Python | Tensorflow | Onnx opset | Status |
55
| --- | --- | --- | --- | --- | --- |
6-
| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.5, 3.6 | 1.5-1.14 | 7-11 | [![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) |
7-
| Unit Test - Full | Linux, MacOS, Windows | 3.5, 3.6, 3.7 | 1.5-1.14 | 7-11 | [![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) | |
6+
| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6, 3.7 | 1.12-1.14 | 7-11 | [![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) |
7+
| Unit Test - Full | Linux, MacOS, Windows | 3.6, 3.7, 3.8 | 1.12-1.14 | 7-11 | [![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) | |
88

9-
<a name="build_status_footnote">\*</a> Only test on python3.6, TF1.14.
9+
<a name="build_status_footnote">\*</a> Only test on python3.7, TF1.14.
1010

11-
# Supported ONNX version
11+
# Supported Versions
12+
## ONNX
1213
tensorflow-onnx will use the ONNX version installed on your system and installs the latest ONNX version if none is found.
1314

1415
We support opset 6 to 11. By default we use opset 8 for the resulting ONNX graph since most runtimes will support opset 8.
1516
Support for future opsets add added as they are released.
1617

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

20+
## Tensorflow
21+
We support all ```tf-1.x graphs```. To keep our test matrix manageable we stopped testing tf2onnx running on top of versions older than ```tf-1.12```. tf2onnx-1.5.4 was the last version that was tested all the way back to tf-1.4.
22+
23+
## Python
24+
We support Python ```3.6```, ```3.7``` and ```3.8```. tf2onnx-1.5.4 was the last release that supports Python 3.5.
25+
1926
# Status
2027
We support many TensorFlow models. Support for Fully Connected, Convolutional and dynamic LSTM networks is mature.
2128
A list of models that we use for testing can be found [here](tests/run_pretrained_models.yaml).
@@ -51,9 +58,6 @@ For pytorch/caffe2, follow the instructions here:
5158

5259
We tested with pytorch/caffe2 and onnxruntime and unit tests are passing for those.
5360

54-
## Supported Tensorflow and Python Versions
55-
We are testing with tensorflow 1.5-1.14 and anaconda **3.5,3.6,3.7**.
56-
5761
# Installation
5862
## From pypi
5963
```pip install -U tf2onnx```

ci_build/azure_pipelines/onnxruntime_nightly_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ stages:
66
- template: 'templates/job_generator.yml'
77
parameters:
88
platforms: ['linux', 'windows']
9-
python_versions: ['3.6', '3.5']
10-
tf_versions: ['1.13.1','1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5']
9+
python_versions: ['3.7', '3.6']
10+
tf_versions: ['1.13.1','1.12.3']
1111
onnx_opsets: ['']
1212
onnx_backends: {onnxruntime: ['nightly']}
1313
job:
@@ -18,8 +18,8 @@ stages:
1818
- template: 'templates/job_generator.yml'
1919
parameters:
2020
platforms: ['linux', 'windows']
21-
python_versions: ['3.7', '3.6', '3.5']
22-
tf_versions: ['1.14']
21+
python_versions: ['3.8', '3.7', '3.6']
22+
tf_versions: ['1.14.0']
2323
onnx_opsets: ['']
2424
onnx_backends: {onnxruntime: ['nightly']}
2525
job:

ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ jobs:
44
- template: 'templates/job_generator.yml'
55
parameters:
66
platforms: ['linux', 'windows']
7-
python_versions: ['3.6', '3.5']
8-
tf_versions: ['1.13.1', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5']
7+
python_versions: ['3.6']
8+
tf_versions: ['1.13.1', '1.12.3']
99
job:
1010
steps:
1111
- template: 'pretrained_model_test.yml'
1212

1313
- template: 'templates/job_generator.yml'
1414
parameters:
1515
platforms: ['linux', 'windows']
16-
python_versions: ['3.7', '3.6', '3.5']
17-
tf_versions: ['1.14']
16+
python_versions: ['3.7', '3.6']
17+
tf_versions: ['1.14.0']
1818
job:
1919
steps:
2020
- template: 'pretrained_model_test.yml'

ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
jobs:
44
- template: 'templates/job_generator.yml'
55
parameters:
6-
python_versions: ['3.7', '3.5']
7-
tf_versions: ['1.14']
6+
python_versions: ['3.7', '3.6']
7+
tf_versions: ['1.14.0']
88
job:
99
steps:
1010
- template: 'pretrained_model_test.yml'
1111

1212
- template: 'templates/job_generator.yml'
1313
parameters:
1414
platforms: ['windows']
15-
tf_versions: ['1.14']
15+
tf_versions: ['1.14.0']
1616
job:
1717
steps:
1818
- template: 'pretrained_model_test.yml'

ci_build/azure_pipelines/templates/job_generator.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
parameters:
44
platforms: ['linux']
5-
python_versions: ['3.6']
5+
python_versions: ['3.7']
66
tf_versions: ['']
77
onnx_versions: ['']
88
onnx_opsets: ['11', '10', '9', '8', '7']
9-
onnx_backends: {onnxruntime: ['1.0.0']}
9+
onnx_backends: {onnxruntime: ['1.1.0']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'

ci_build/azure_pipelines/unit_test-matrix.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ stages:
66
- template: 'templates/job_generator.yml'
77
parameters:
88
platforms: ['linux', 'windows']
9-
python_versions: ['3.6', '3.5']
10-
tf_versions: ['1.13.1', '1.11', '1.10', '1.9', '1.7', '1.5']
9+
python_versions: [3.6']
10+
tf_versions: ['1.13.1', '1.12.3']
1111
onnx_opsets: ['']
1212
job:
1313
steps:
@@ -17,8 +17,8 @@ stages:
1717
- template: 'templates/job_generator.yml'
1818
parameters:
1919
platforms: ['linux', 'windows']
20-
python_versions: ['3.7', '3.6', '3.5']
21-
tf_versions: ['1.14']
20+
python_versions: ['3.7', '3.6']
21+
tf_versions: ['1.14.0']
2222
onnx_opsets: ['']
2323
job:
2424
steps:

ci_build/azure_pipelines/unit_test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ stages:
55
jobs:
66
- template: 'templates/job_generator.yml'
77
parameters:
8-
python_versions: ['3.7', '3.6', '3.5']
9-
tf_versions: ['1.14']
8+
python_versions: ['3.7', '3.6']
9+
tf_versions: ['1.14.0']
1010
onnx_opsets: ['']
1111
job:
1212
steps:
@@ -15,7 +15,8 @@ stages:
1515

1616
- template: 'templates/job_generator.yml'
1717
parameters:
18-
tf_versions: ['1.14', '1.12', '1.11', '1.10', '1.9', '1.7']
18+
python_versions: [3.6']
19+
tf_versions: ['1.12.3']
1920
onnx_opsets: ['']
2021
job:
2122
steps:
@@ -25,7 +26,7 @@ stages:
2526
- template: 'templates/job_generator.yml'
2627
parameters:
2728
platforms: ['windows']
28-
tf_versions: ['1.14']
29+
tf_versions: ['1.14.0']
2930
onnx_opsets: ['']
3031
job:
3132
steps:

0 commit comments

Comments
 (0)