Skip to content

Commit 1cb1077

Browse files
sdpythonsdpython
committed
Merge branch 'master' of https://github.com/onnx/tensorflow-onnx into i500qu
2 parents e64b5d0 + 38b19b2 commit 1cb1077

Some content is hidden

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

50 files changed

+3281
-768
lines changed

‎README.md

Lines changed: 166 additions & 97 deletions
Large diffs are not rendered by default.

‎VERSION_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.0
1+
1.7.0

‎ci_build/azure_pipelines/pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- bash: |
1010
set -ex
11-
pip install pylint
11+
pip install pylint==2.4.4
1212
pip freeze
1313
pylint --rcfile=tools/pylintrc --ignore=version.py --disable=cyclic-import tf2onnx tests/*.py tools -j 0
1414
displayName: 'Pylint'

‎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.7']
66
tf_versions: ['']
77
onnx_versions: ['']
8-
onnx_opsets: ['11', '10', '9', '8', '7']
9-
onnx_backends: {onnxruntime: ['1.2.0']}
8+
onnx_opsets: ['12', '11', '10', '9', '8', '7']
9+
onnx_backends: {onnxruntime: ['1.3.0']}
1010
job: {}
1111
run_setup: 'True'
1212
report_coverage: 'False'

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

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

‎ci_build/azure_pipelines/unit_test.yml

Lines changed: 1 addition & 1 deletion
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.7']
9-
tf_versions: ['1.14.0','1.15.2','2.1.0']
9+
tf_versions: ['1.14.0','1.15.2','2.1.0','2.2.0']
1010
onnx_opsets: ['']
1111
job:
1212
steps:

‎examples/custom_op_via_python.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def print_handler(ctx, node, name, args):
2222
with tf.Session() as sess:
2323
x = tf.placeholder(tf.float32, [2, 3], name="input")
2424
x_ = tf.add(x, x)
25-
x_ = tf.Print(x, [x], "hello")
25+
x_ = tf.Print(x_, [x_], "hello")
2626
_ = tf.identity(x_, name="output")
2727
onnx_graph = tf2onnx.tfonnx.process_tf_graph(sess.graph,
2828
custom_op_handlers={"Print": (print_handler, [])},

‎support_status.md

Lines changed: 190 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -2,156 +2,197 @@
22
### Domain: "" (default domain)
33
| Tensorflow Op | Convertible to ONNX Op Versions |
44
| ------------- | ------------------------------- |
5-
| Const | 1 ~ 10 |
6-
| ConstV2 | 1 ~ 10 |
7-
| RandomNormal | 1 ~ 10 |
8-
| RandomUniform | 1 ~ 10 |
9-
| RandomNormalLike | 1 ~ 10 |
10-
| RandomUniformLike | 1 ~ 10 |
11-
| ZerosLike | 1 ~ 10 |
12-
| LogicalNot | 1 ~ 10 |
13-
| LogicalOr | 1 ~ 10 |
14-
| LogicalAnd | 1 ~ 10 |
15-
| Equal | 1 ~ 10 |
16-
| NotEqual | 1 ~ 10 |
17-
| Greater | 1 ~ 10 |
18-
| Less | 1 ~ 10 |
19-
| Add | 1 ~ 10 |
20-
| AddV2 | 1 ~ 10 |
21-
| Div | 1 ~ 10 |
22-
| Mul | 1 ~ 10 |
23-
| Sub | 1 ~ 10 |
24-
| RealDiv | 1 ~ 10 |
25-
| TruncateDiv | 1 ~ 10 |
26-
| LeakyRelu | 1 ~ 10 |
27-
| LogSoftmax | 1 ~ 10 |
28-
| Softplus | 1 ~ 10 |
29-
| Softsign | 1 ~ 10 |
30-
| Abs | 1 ~ 10 |
31-
| Ceil | 1 ~ 10 |
32-
| Elu | 1 ~ 10 |
33-
| Exp | 1 ~ 10 |
34-
| Floor | 1 ~ 10 |
35-
| Log | 1 ~ 10 |
36-
| Neg | 1 ~ 10 |
37-
| Relu | 1 ~ 10 |
38-
| Sigmoid | 1 ~ 10 |
39-
| Sqrt | 1 ~ 10 |
40-
| Tanh | 1 ~ 10 |
41-
| Reciprocal | 1 ~ 10 |
42-
| Maximum | 1 ~ 10 |
43-
| Minimum | 1 ~ 10 |
44-
| Softmax | 1 ~ 10 |
45-
| Square | 1 ~ 10 |
46-
| Relu6 | 1 ~ 10 |
47-
| Rsqrt | 1 ~ 10 |
48-
| SquaredDifference | 1 ~ 10 |
49-
| Sign | 1 ~ 10 |
50-
| Pow | 1 ~ 10 |
51-
| LRN | 1 ~ 10 |
52-
| MatMul | 1 ~ 10 |
53-
| BatchMatMul | 1 ~ 10 |
54-
| BatchMatMulV2 | 1 ~ 10 |
55-
| Erf | 1 ~ 10 |
56-
| Selu | 1 ~ 10 |
57-
| CheckNumerics | 1 ~ 10 |
58-
| StopGradient | 1 ~ 10 |
59-
| Placeholder | 1 ~ 10 |
60-
| PlaceholderV2 | 1 ~ 10 |
61-
| PlaceholderWithDefault | 1 ~ 10 |
62-
| NoOp | 1 ~ 10 |
63-
| Size | 1 ~ 10 |
64-
| Flatten | 1 ~ 10 |
65-
| Dropout | 1 ~ 10 |
66-
| Identity | 1 ~ 10 |
67-
| Reshape | 1 ~ 10 |
68-
| Squeeze | 1 ~ 10 |
69-
| Transpose | 1 ~ 10 |
70-
| Concat | 1 ~ 10 |
71-
| ConcatV2 | 1 ~ 10 |
72-
| Slice | 1 ~ 10 |
73-
| Gather | 1 ~ 10 |
74-
| GatherV2 | 1 ~ 10 |
75-
| GatherNd | 1 ~ 10 |
76-
| Split | 1 ~ 10 |
77-
| SplitV | 1 ~ 10 |
78-
| ExpandDims | 1 ~ 10 |
79-
| StridedSlice | 1 ~ 10 |
80-
| Cast | 1 ~ 10 |
81-
| TopKV2 | 1 ~ 10 |
82-
| Tile | 1 ~ 10 |
83-
| Pack | 1 ~ 10 |
84-
| Unpack | 1 ~ 10 |
85-
| OneHot | 1 ~ 10 |
86-
| Shape | 1 ~ 10 |
87-
| BatchToSpaceND | 1 ~ 10 |
88-
| SpaceToBatchND | 1 ~ 10 |
89-
| Conv1D | 1 ~ 10 |
90-
| Conv2D | 1 ~ 10 |
91-
| Conv3D | 1 ~ 10 |
92-
| Conv2DBackpropInput | 1 ~ 10 |
93-
| DepthwiseConv2d | 1 ~ 10 |
94-
| DepthwiseConv2dNative | 1 ~ 10 |
95-
| MaxPool | 1 ~ 10 |
96-
| MaxPoolV2 | 1 ~ 10 |
97-
| AvgPool | 1 ~ 10 |
98-
| AvgPool3D | 1 ~ 10 |
99-
| BiasAdd | 1 ~ 10 |
100-
| BiasAddV1 | 1 ~ 10 |
101-
| Pad | 1 ~ 10 |
102-
| PadV2 | 1 ~ 10 |
103-
| MirrorPad | 1 ~ 10 |
104-
| SpaceToDepth | 1 ~ 10 |
105-
| DepthToSpace | 1 ~ 10 |
106-
| Prod | 1 ~ 10 |
107-
| Sum | 1 ~ 10 |
108-
| Mean | 1 ~ 10 |
109-
| Max | 1 ~ 10 |
110-
| Min | 1 ~ 10 |
111-
| ArgMax | 1 ~ 10 |
112-
| ArgMin | 1 ~ 10 |
113-
| LSTMBlockCell | 1 ~ 10 |
114-
| FloorDiv | 6 ~ 10 |
115-
| FusedBatchNorm | 6 ~ 10 |
116-
| FusedBatchNormV2 | 6 ~ 10 |
117-
| All | 6 ~ 10 |
118-
| Any | 6 ~ 10 |
119-
| AddN | 6 ~ 10 |
120-
| If | 7 ~ 10 |
121-
| Loop | 7 ~ 10 |
122-
| Scan | 7 ~ 10 |
123-
| Range | 7 ~ 10 |
124-
| Fill | 7 ~ 10 |
125-
| Multinomial | 7 ~ 10 |
126-
| LessEqual | 7 ~ 10 |
127-
| GreaterEqual | 7 ~ 10 |
128-
| Acos | 7 ~ 10 |
129-
| Asin | 7 ~ 10 |
130-
| Atan | 7 ~ 10 |
131-
| Cos | 7 ~ 10 |
132-
| Sin | 7 ~ 10 |
133-
| Tan | 7 ~ 10 |
134-
| FloorMod | 7 ~ 10 |
135-
| ResizeBilinear | 7 ~ 10 |
136-
| ResizeNearestNeighbor | 7 ~ 10 |
137-
| MatrixBandPart | 7 ~ 10 |
138-
| SoftmaxCrossEntropyWithLogits | 7 ~ 10 |
139-
| SparseSoftmaxCrossEntropyWithLogits | 7 ~ 10 |
140-
| Select | 8 ~ 10 |
141-
| ReverseSequence | 8 ~ 10 (Except 9) |
142-
| MaxPoolWithArgmax | 8 ~ 10 |
143-
| Where | 9 ~ 10 |
144-
| Acosh | 9 ~ 10 |
145-
| Asinh | 9 ~ 10 |
146-
| Atanh | 9 ~ 10 |
147-
| Cosh | 9 ~ 10 |
148-
| Sinh | 9 ~ 10 |
149-
| IsNan | 9 ~ 10 |
150-
| IsInf | 10 |
151-
| NonMaxSuppressionV2 | 10 |
152-
| NonMaxSuppressionV3 | 10 |
153-
| ReverseV2 | 10 |
5+
| Abs | 1 ~ 12 |
6+
| Acos | 7 ~ 12 |
7+
| Acosh | 9 ~ 12 |
8+
| Add | 1 ~ 12 |
9+
| AddN | 6 ~ 12 |
10+
| AddV2 | 1 ~ 12 |
11+
| All | 6 ~ 12 |
12+
| Any | 6 ~ 12 |
13+
| ArgMax | 1 ~ 12 |
14+
| ArgMin | 1 ~ 12 |
15+
| Asin | 7 ~ 12 |
16+
| Asinh | 9 ~ 12 |
17+
| Atan | 7 ~ 12 |
18+
| Atanh | 9 ~ 12 |
19+
| AvgPool | 1 ~ 12 |
20+
| AvgPool3D | 1 ~ 12 |
21+
| BatchMatMul | 1 ~ 12 |
22+
| BatchMatMulV2 | 1 ~ 12 |
23+
| BatchToSpaceND | 1 ~ 12 |
24+
| BiasAdd | 1 ~ 12 |
25+
| BiasAddV1 | 1 ~ 12 |
26+
| BroadcastTo | 8 ~ 12 |
27+
| Cast | 1 ~ 12 |
28+
| Ceil | 1 ~ 12 |
29+
| CheckNumerics | 1 ~ 12 |
30+
| ClipByValue | 8 ~ 12 |
31+
| Concat | 1 ~ 12 |
32+
| ConcatV2 | 1 ~ 12 |
33+
| Const | 1 ~ 12 |
34+
| ConstV2 | 1 ~ 12 |
35+
| Conv1D | 1 ~ 12 |
36+
| Conv2D | 1 ~ 12 |
37+
| Conv2DBackpropInput | 1 ~ 12 |
38+
| Conv3D | 1 ~ 12 |
39+
| Cos | 7 ~ 12 |
40+
| Cosh | 9 ~ 12 |
41+
| CropAndResize | 10 ~ 12 |
42+
| CudnnRNN | 10 ~ 12 |
43+
| Cumsum | 11 ~ 12 |
44+
| DepthToSpace | 1 ~ 12 |
45+
| DepthwiseConv2d | 1 ~ 12 |
46+
| DepthwiseConv2dNative | 1 ~ 12 |
47+
| Div | 1 ~ 12 |
48+
| Dropout | 1 ~ 12 |
49+
| Einsum | 12 |
50+
| Elu | 1 ~ 12 |
51+
| Equal | 1 ~ 12 |
52+
| Erf | 1 ~ 12 |
53+
| Exp | 1 ~ 12 |
54+
| ExpandDims | 1 ~ 12 |
55+
| FIFOQueueV2 | 8 ~ 12 |
56+
| Fill | 7 ~ 12 |
57+
| Flatten | 1 ~ 12 |
58+
| Floor | 1 ~ 12 |
59+
| FloorDiv | 6 ~ 12 |
60+
| FloorMod | 7 ~ 12 |
61+
| FusedBatchNorm | 6 ~ 12 |
62+
| FusedBatchNormV2 | 6 ~ 12 |
63+
| FusedBatchNormV3 | 6 ~ 12 |
64+
| Gather | 1 ~ 12 |
65+
| GatherNd | 1 ~ 12 |
66+
| GatherV2 | 1 ~ 12 |
67+
| Greater | 1 ~ 12 |
68+
| GreaterEqual | 7 ~ 12 |
69+
| HashTableV2 | 8 ~ 12 |
70+
| Identity | 1 ~ 12 |
71+
| IdentityN | 1 ~ 12 |
72+
| If | 1 ~ 12 |
73+
| IsFinite | 10 ~ 12 |
74+
| IsInf | 10 ~ 12 |
75+
| IsNan | 9 ~ 12 |
76+
| IteratorGetNext | 8 ~ 12 |
77+
| IteratorV2 | 8 ~ 12 |
78+
| LRN | 1 ~ 12 |
79+
| LSTMBlockCell | 1 ~ 12 |
80+
| LeakyRelu | 1 ~ 12 |
81+
| LeftShift | 11 ~ 12 |
82+
| Less | 1 ~ 12 |
83+
| LessEqual | 7 ~ 12 |
84+
| Log | 1 ~ 12 |
85+
| LogSoftmax | 1 ~ 12 |
86+
| LogicalAnd | 1 ~ 12 |
87+
| LogicalNot | 1 ~ 12 |
88+
| LogicalOr | 1 ~ 12 |
89+
| LookupTableFindV2 | 8 ~ 12 |
90+
| Loop | 7 ~ 12 |
91+
| MatMul | 1 ~ 12 |
92+
| MatrixBandPart | 7 ~ 12 |
93+
| MatrixDeterminant | 11 ~ 12 |
94+
| MatrixDiagPart | 11 ~ 12 |
95+
| MatrixDiagPartV2 | 11 ~ 12 |
96+
| MatrixDiagPartV3 | 11 ~ 12 |
97+
| Max | 1 ~ 12 |
98+
| MaxPool | 1 ~ 12 |
99+
| MaxPoolV2 | 1 ~ 12 |
100+
| MaxPoolWithArgmax | 8 ~ 12 |
101+
| Maximum | 1 ~ 12 |
102+
| Mean | 1 ~ 12 |
103+
| Min | 1 ~ 12 |
104+
| Minimum | 1 ~ 12 |
105+
| MirrorPad | 1 ~ 12 |
106+
| Mul | 1 ~ 12 |
107+
| Multinomial | 7 ~ 12 |
108+
| Neg | 1 ~ 12 |
109+
| NoOp | 1 ~ 12 |
110+
| NonMaxSuppressionV2 | 10 ~ 12 |
111+
| NonMaxSuppressionV3 | 10 ~ 12 |
112+
| NonMaxSuppressionV4 | 10 ~ 12 |
113+
| NonMaxSuppressionV5 | 10 ~ 12 |
114+
| NotEqual | 1 ~ 12 |
115+
| OneHot | 1 ~ 12 |
116+
| Pack | 1 ~ 12 |
117+
| Pad | 1 ~ 12 |
118+
| PadV2 | 1 ~ 12 |
119+
| Placeholder | 1 ~ 12 |
120+
| PlaceholderV2 | 1 ~ 12 |
121+
| PlaceholderWithDefault | 1 ~ 12 |
122+
| Pow | 1 ~ 12 |
123+
| Prod | 1 ~ 12 |
124+
| QueueDequeueV2 | 8 ~ 12 |
125+
| RandomNormal | 1 ~ 12 |
126+
| RandomNormalLike | 1 ~ 12 |
127+
| RandomUniform | 1 ~ 12 |
128+
| RandomUniformLike | 1 ~ 12 |
129+
| Range | 7 ~ 12 |
130+
| RealDiv | 1 ~ 12 |
131+
| Reciprocal | 1 ~ 12 |
132+
| Relu | 1 ~ 12 |
133+
| Relu6 | 1 ~ 12 |
134+
| Reshape | 1 ~ 12 |
135+
| ResizeBilinear | 7 ~ 12 |
136+
| ResizeNearestNeighbor | 7 ~ 12 |
137+
| ReverseSequence | 8 ~ 12 (Except 9) |
138+
| ReverseV2 | 10 ~ 12 |
139+
| RightShift | 11 ~ 12 |
140+
| Round | 11 ~ 12 |
141+
| Rsqrt | 1 ~ 12 |
142+
| Scan | 7 ~ 12 |
143+
| ScatterNd | 11 ~ 12 |
144+
| Select | 7 ~ 12 |
145+
| SelectV2 | 7 ~ 12 |
146+
| Selu | 1 ~ 12 |
147+
| Shape | 1 ~ 12 |
148+
| Sigmoid | 1 ~ 12 |
149+
| Sign | 1 ~ 12 |
150+
| Sin | 7 ~ 12 |
151+
| Sinh | 9 ~ 12 |
152+
| Size | 1 ~ 12 |
153+
| Slice | 1 ~ 12 |
154+
| Softmax | 1 ~ 12 |
155+
| SoftmaxCrossEntropyWithLogits | 7 ~ 12 |
156+
| Softplus | 1 ~ 12 |
157+
| Softsign | 1 ~ 12 |
158+
| SpaceToBatchND | 1 ~ 12 |
159+
| SpaceToDepth | 1 ~ 12 |
160+
| SparseSoftmaxCrossEntropyWithLogits | 7 ~ 12 |
161+
| Split | 1 ~ 12 |
162+
| SplitV | 1 ~ 12 |
163+
| Sqrt | 1 ~ 12 |
164+
| Square | 1 ~ 12 |
165+
| SquaredDifference | 1 ~ 12 |
166+
| SquaredDistance | 12 |
167+
| Squeeze | 1 ~ 12 |
168+
| StatelessIf | 1 ~ 12 |
169+
| StatelessWhile | 7 ~ 12 |
170+
| StopGradient | 1 ~ 12 |
171+
| StridedSlice | 1 ~ 12 |
172+
| Sub | 1 ~ 12 |
173+
| Sum | 1 ~ 12 |
174+
| Tan | 7 ~ 12 |
175+
| Tanh | 1 ~ 12 |
176+
| TensorListFromTensor | 7 ~ 12 |
177+
| TensorListGetItem | 7 ~ 12 |
178+
| TensorListLength | 7 ~ 12 |
179+
| TensorListReserve | 7 ~ 12 |
180+
| TensorListResize | 7 ~ 12 |
181+
| TensorListSetItem | 7 ~ 12 |
182+
| TensorListStack | 7 ~ 12 |
183+
| Tile | 1 ~ 12 |
184+
| TopKV2 | 1 ~ 12 |
185+
| Transpose | 1 ~ 12 |
186+
| TruncateDiv | 1 ~ 12 |
187+
| Unique | 11 ~ 12 |
188+
| Unpack | 1 ~ 12 |
189+
| Where | 9 ~ 12 |
190+
| While | 7 ~ 12 |
191+
| ZerosLike | 1 ~ 12 |
154192
### Domain: "com.microsoft"
155193
| Tensorflow Op | Convertible to ONNX Op Versions |
156194
| ------------- | ------------------------------- |
195+
| Conv2DBackpropInput | 1 |
196+
| CropAndResize | 1 |
197+
| MatrixInverse | 1 |
157198
| Range | 1 |

0 commit comments

Comments
 (0)