Skip to content

Commit 80f85b1

Browse files
committed
Merge branch 'master' into r1.5
2 parents 6e8f348 + 342270f commit 80f85b1

Some content is hidden

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

42 files changed

+1609
-289
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Bug/Performance issue
3+
about: Use this template for reporting a bug or a performance issue.
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**Urgency**
11+
If there are particular important use cases blocked by this or strict project-related timelines, please share more information and dates. If there are no hard deadlines, please specify none.
12+
13+
**System information**
14+
- OS Platform and Distribution (e.g., Linux Ubuntu 16.04):
15+
- Tensorflow Version:
16+
- Python version:
17+
18+
**To Reproduce**
19+
Describe steps/code to reproduce the behavior:
20+
21+
**Expected behavior**
22+
A clear and concise description of what you expected to happen.
23+
24+
**Screenshots**
25+
If applicable, add screenshots to help explain your problem.
26+
27+
**Additional context**
28+
Add any other context about the problem here. If the issue is about a particular model, please share the model details as well to facilitate debugging.

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ 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-10 | [![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-10 | [![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.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) | |
88

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

1111
# Supported ONNX version
1212
tensorflow-onnx will use the ONNX version installed on your system and installs the latest ONNX version if none is found.
1313

14-
We support opset 6 to 10. By default we use opset 7 for the resulting ONNX graph since most runtimes will support opset 7. Support for future opsets add added as they are released.
14+
We support opset 6 to 11. By default we use opset 8 for the resulting ONNX graph since most runtimes will support opset 8.
15+
Support for future opsets add added as they are released.
1516

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

1819
# Status
1920
We support many TensorFlow models. Support for Fully Connected, Convolutional and dynamic LSTM networks is mature.

ci_build/azure_pipelines/onnxruntime_nightly_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ stages:
55
jobs:
66
- template: 'templates/job_generator.yml'
77
parameters:
8-
platforms: ['linux', 'windows', 'mac']
8+
platforms: ['linux', 'windows']
99
python_versions: ['3.6', '3.5']
1010
tf_versions: ['1.13.1','1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5']
1111
onnx_opsets: ['']
@@ -17,7 +17,7 @@ stages:
1717

1818
- template: 'templates/job_generator.yml'
1919
parameters:
20-
platforms: ['linux', 'windows', 'mac']
20+
platforms: ['linux', 'windows']
2121
python_versions: ['3.7', '3.6', '3.5']
2222
tf_versions: ['1.14']
2323
onnx_opsets: ['']

ci_build/azure_pipelines/pretrained_model_test-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
jobs:
44
- template: 'templates/job_generator.yml'
55
parameters:
6-
platforms: ['linux', 'windows', 'mac']
6+
platforms: ['linux', 'windows']
77
python_versions: ['3.6', '3.5']
88
tf_versions: ['1.13.1', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5']
99
job:
@@ -12,7 +12,7 @@ jobs:
1212

1313
- template: 'templates/job_generator.yml'
1414
parameters:
15-
platforms: ['linux', 'windows', 'mac']
15+
platforms: ['linux', 'windows']
1616
python_versions: ['3.7', '3.6', '3.5']
1717
tf_versions: ['1.14']
1818
job:

ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 4 additions & 4 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.6', '3.5']
7-
tf_versions: ['1.14.0']
6+
python_versions: ['3.7', '3.5']
7+
tf_versions: ['1.14']
88
job:
99
steps:
1010
- template: 'pretrained_model_test.yml'
1111

1212
- template: 'templates/job_generator.yml'
1313
parameters:
14-
platforms: ['windows', 'mac']
15-
tf_versions: ['1.14.0']
14+
platforms: ['windows']
15+
tf_versions: ['1.14']
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
@@ -5,8 +5,8 @@ parameters:
55
python_versions: ['3.6']
66
tf_versions: ['']
77
onnx_versions: ['']
8-
onnx_opsets: ['10', '9', '8', '7']
9-
onnx_backends: {onnxruntime: ['0.4.0']}
8+
onnx_opsets: ['11', '10', '9', '8', '7']
9+
onnx_backends: {onnxruntime: ['1.0.0']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'

ci_build/azure_pipelines/templates/setup.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ steps:
2828
# https://github.com/numpy/numpy/issues/12957
2929
# https://github.com/ContinuumIO/anaconda-issues/issues/10629
3030
# Add numpy lib path manually here
31+
# On Windows sqlite3.dll is found under Library/bin
3132
- bash: |
3233
site_dir=$(python -c "import site; print(site.getsitepackages()[1])")
3334
echo "##vso[task.prependpath]$site_dir\numpy\.libs"
34-
displayName: 'Fix Numpy Path'
35+
base_dir=$(python -c "import site; print(site.getsitepackages()[0])")
36+
echo "##vso[task.prependpath]$base_dir/Library/bin"
37+
displayName: 'Fix Paths'
3538
condition: and(succeeded(), in(variables['Agent.OS'], 'Windows_NT'))
3639

3740
- bash: env

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: ['10', '9', '8', '7']
4+
onnx_opsets: ['11', '10', '9', '8', '7']
55

66
steps:
77
- ${{ each onnx_opset in parameters.onnx_opsets }}:

ci_build/azure_pipelines/unit_test-matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ stages:
55
jobs:
66
- template: 'templates/job_generator.yml'
77
parameters:
8-
platforms: ['linux', 'windows', 'mac']
8+
platforms: ['linux', 'windows']
99
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']
10+
tf_versions: ['1.13.1', '1.11', '1.10', '1.9', '1.7', '1.5']
1111
onnx_opsets: ['']
1212
job:
1313
steps:
@@ -16,7 +16,7 @@ stages:
1616

1717
- template: 'templates/job_generator.yml'
1818
parameters:
19-
platforms: ['linux', 'windows', 'mac']
19+
platforms: ['linux', 'windows']
2020
python_versions: ['3.7', '3.6', '3.5']
2121
tf_versions: ['1.14']
2222
onnx_opsets: ['']

ci_build/azure_pipelines/unit_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ stages:
1515

1616
- template: 'templates/job_generator.yml'
1717
parameters:
18-
tf_versions: ['1.13.1', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5']
18+
tf_versions: ['1.14', '1.12', '1.11', '1.10', '1.9', '1.7']
1919
onnx_opsets: ['']
2020
job:
2121
steps:
@@ -24,7 +24,7 @@ stages:
2424

2525
- template: 'templates/job_generator.yml'
2626
parameters:
27-
platforms: ['windows', 'mac']
27+
platforms: ['windows']
2828
tf_versions: ['1.14']
2929
onnx_opsets: ['']
3030
job:

0 commit comments

Comments
 (0)