Skip to content

Commit 7b598d5

Browse files
guschmueguschmue
committed
Merge branch 'master' into r1.5
2 parents c62669a + 1ce1a9f commit 7b598d5

File tree

9 files changed

+313
-214
lines changed

9 files changed

+313
-214
lines changed

‎support_status.md

Lines changed: 149 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -2,153 +2,155 @@
22
### Domain: "" (default domain)
33
| Tensorflow Op | Convertible to ONNX Op Versions |
44
| ------------- | ------------------------------- |
5-
| Const | ['1'] |
6-
| ConstV2 | ['1'] |
7-
| RandomNormal | ['1'] |
8-
| RandomUniform | ['1'] |
9-
| RandomNormalLike | ['1'] |
10-
| RandomUniformLike | ['1'] |
11-
| ZerosLike | ['1'] |
12-
| LogicalNot | ['1'] |
13-
| LogicalOr | ['1', '6'] |
14-
| LogicalAnd | ['1', '6'] |
15-
| Equal | ['1', '7'] |
16-
| NotEqual | ['1', '7'] |
17-
| Greater | ['1', '7'] |
18-
| Less | ['1', '7'] |
19-
| Add | ['1', '6'] |
20-
| Div | ['1', '6'] |
21-
| Mul | ['1', '6'] |
22-
| Sub | ['1', '6'] |
23-
| RealDiv | ['1', '6'] |
24-
| TruncateDiv | ['1', '6'] |
25-
| LeakyRelu | ['1'] |
26-
| LogSoftmax | ['1'] |
27-
| Softplus | ['1'] |
28-
| Softsign | ['1'] |
29-
| Abs | ['1', '6'] |
30-
| Ceil | ['1', '6'] |
31-
| Elu | ['1', '6'] |
32-
| Exp | ['1', '6'] |
33-
| Floor | ['1', '6'] |
34-
| Log | ['1', '6'] |
35-
| Neg | ['1', '6'] |
36-
| Relu | ['1', '6'] |
37-
| Sigmoid | ['1', '6'] |
38-
| Sqrt | ['1', '6'] |
39-
| Tanh | ['1', '6'] |
40-
| Reciprocal | ['1', '6'] |
41-
| Maximum | ['1'] |
42-
| Minimum | ['1'] |
43-
| Softmax | ['1'] |
44-
| Square | ['1'] |
45-
| Relu6 | ['1'] |
46-
| Rsqrt | ['1'] |
47-
| SquaredDifference | ['1'] |
48-
| Sign | ['1', '9'] |
49-
| Pow | ['1', '7'] |
50-
| LRN | ['1'] |
51-
| MatMul | ['1'] |
52-
| BatchMatMul | ['1'] |
53-
| Erf | ['1', '9'] |
54-
| Selu | ['1'] |
55-
| CheckNumerics | ['1'] |
56-
| StopGradient | ['1'] |
57-
| Placeholder | ['1'] |
58-
| PlaceholderV2 | ['1'] |
59-
| PlaceholderWithDefault | ['1'] |
60-
| NoOp | ['1'] |
61-
| Size | ['1'] |
62-
| Flatten | ['1', '9'] |
63-
| Dropout | ['1', '6', '7', '10'] |
64-
| Identity | ['1'] |
65-
| Reshape | ['1', '5'] |
66-
| Squeeze | ['1'] |
67-
| Transpose | ['1'] |
68-
| Concat | ['1'] |
69-
| ConcatV2 | ['1'] |
70-
| Slice | ['1', '10'] |
71-
| Gather | ['1'] |
72-
| GatherV2 | ['1'] |
73-
| GatherNd | ['1'] |
74-
| Split | ['1', '2'] |
75-
| SplitV | ['1', '2'] |
76-
| ExpandDims | ['1', '7'] |
77-
| StridedSlice | ['1', '10'] |
78-
| Cast | ['1', '6', '9'] |
79-
| TopKV2 | ['1', '10'] |
80-
| Tile | ['1'] |
81-
| Pack | ['1'] |
82-
| Unpack | ['1'] |
83-
| OneHot | ['1', '9'] |
84-
| Shape | ['1'] |
85-
| BatchToSpaceND | ['1'] |
86-
| SpaceToBatchND | ['1'] |
87-
| Conv1D | ['1'] |
88-
| Conv2D | ['1'] |
89-
| Conv3D | ['1'] |
90-
| Conv2DBackpropInput | ['1'] |
91-
| DepthwiseConv2d | ['1'] |
92-
| DepthwiseConv2dNative | ['1'] |
93-
| MaxPool | ['1', '10'] |
94-
| MaxPoolV2 | ['1', '10'] |
95-
| AvgPool | ['1', '10'] |
96-
| AvgPool3D | ['1', '10'] |
97-
| BiasAdd | ['1', '7'] |
98-
| BiasAddV1 | ['1', '7'] |
99-
| Pad | ['1'] |
100-
| PadV2 | ['1'] |
101-
| MirrorPad | ['1'] |
102-
| SpaceToDepth | ['1'] |
103-
| DepthToSpace | ['1'] |
104-
| Prod | ['1'] |
105-
| Sum | ['1'] |
106-
| Mean | ['1'] |
107-
| Max | ['1'] |
108-
| Min | ['1'] |
109-
| ArgMax | ['1'] |
110-
| ArgMin | ['1'] |
111-
| LSTMBlockCell | ['1', '7'] |
112-
| FloorDiv | ['6'] |
113-
| FusedBatchNorm | ['6', '9'] |
114-
| FusedBatchNormV2 | ['6', '9'] |
115-
| All | ['6'] |
116-
| Any | ['6'] |
117-
| AddN | ['6'] |
118-
| If | ['7'] |
119-
| Loop | ['7'] |
120-
| Scan | ['7'] |
121-
| Range | ['7'] |
122-
| Fill | ['7', '9'] |
123-
| Multinomial | ['7'] |
124-
| LessEqual | ['7'] |
125-
| GreaterEqual | ['7'] |
126-
| Acos | ['7'] |
127-
| Asin | ['7'] |
128-
| Atan | ['7'] |
129-
| Cos | ['7'] |
130-
| Sin | ['7'] |
131-
| Tan | ['7'] |
132-
| FloorMod | ['7'] |
133-
| ResizeBilinear | ['7', '9', '10'] |
134-
| ResizeNearestNeighbor | ['7', '9', '10'] |
135-
| MatrixBandPart | ['7'] |
136-
| SoftmaxCrossEntropyWithLogits | ['7'] |
137-
| SparseSoftmaxCrossEntropyWithLogits | ['7', '9'] |
138-
| Select | ['8', '9'] |
139-
| ReverseSequence | ['8', '9', '10'] |
140-
| MaxPoolWithArgmax | ['8'] |
141-
| Where | ['9'] |
142-
| Acosh | ['9'] |
143-
| Asinh | ['9'] |
144-
| Atanh | ['9'] |
145-
| Cosh | ['9'] |
146-
| Sinh | ['9'] |
147-
| IsNan | ['9'] |
148-
| IsInf | ['10'] |
149-
| NonMaxSuppressionV2 | ['10'] |
150-
| NonMaxSuppressionV3 | ['10'] |
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+
| Div | 1 ~ 10 |
21+
| Mul | 1 ~ 10 |
22+
| Sub | 1 ~ 10 |
23+
| RealDiv | 1 ~ 10 |
24+
| TruncateDiv | 1 ~ 10 |
25+
| LeakyRelu | 1 ~ 10 |
26+
| LogSoftmax | 1 ~ 10 |
27+
| Softplus | 1 ~ 10 |
28+
| Softsign | 1 ~ 10 |
29+
| Abs | 1 ~ 10 |
30+
| Ceil | 1 ~ 10 |
31+
| Elu | 1 ~ 10 |
32+
| Exp | 1 ~ 10 |
33+
| Floor | 1 ~ 10 |
34+
| Log | 1 ~ 10 |
35+
| Neg | 1 ~ 10 |
36+
| Relu | 1 ~ 10 |
37+
| Sigmoid | 1 ~ 10 |
38+
| Sqrt | 1 ~ 10 |
39+
| Tanh | 1 ~ 10 |
40+
| Reciprocal | 1 ~ 10 |
41+
| Maximum | 1 ~ 10 |
42+
| Minimum | 1 ~ 10 |
43+
| Softmax | 1 ~ 10 |
44+
| Square | 1 ~ 10 |
45+
| Relu6 | 1 ~ 10 |
46+
| Rsqrt | 1 ~ 10 |
47+
| SquaredDifference | 1 ~ 10 |
48+
| Sign | 1 ~ 10 |
49+
| Pow | 1 ~ 10 |
50+
| LRN | 1 ~ 10 |
51+
| MatMul | 1 ~ 10 |
52+
| BatchMatMul | 1 ~ 10 |
53+
| BatchMatMulV2 | 1 ~ 10 |
54+
| Erf | 1 ~ 10 |
55+
| Selu | 1 ~ 10 |
56+
| CheckNumerics | 1 ~ 10 |
57+
| StopGradient | 1 ~ 10 |
58+
| Placeholder | 1 ~ 10 |
59+
| PlaceholderV2 | 1 ~ 10 |
60+
| PlaceholderWithDefault | 1 ~ 10 |
61+
| NoOp | 1 ~ 10 |
62+
| Size | 1 ~ 10 |
63+
| Flatten | 1 ~ 10 |
64+
| Dropout | 1 ~ 10 |
65+
| Identity | 1 ~ 10 |
66+
| Reshape | 1 ~ 10 |
67+
| Squeeze | 1 ~ 10 |
68+
| Transpose | 1 ~ 10 |
69+
| Concat | 1 ~ 10 |
70+
| ConcatV2 | 1 ~ 10 |
71+
| Slice | 1 ~ 10 |
72+
| Gather | 1 ~ 10 |
73+
| GatherV2 | 1 ~ 10 |
74+
| GatherNd | 1 ~ 10 |
75+
| Split | 1 ~ 10 |
76+
| SplitV | 1 ~ 10 |
77+
| ExpandDims | 1 ~ 10 |
78+
| StridedSlice | 1 ~ 10 |
79+
| Cast | 1 ~ 10 |
80+
| TopKV2 | 1 ~ 10 |
81+
| Tile | 1 ~ 10 |
82+
| Pack | 1 ~ 10 |
83+
| Unpack | 1 ~ 10 |
84+
| OneHot | 1 ~ 10 |
85+
| Shape | 1 ~ 10 |
86+
| BatchToSpaceND | 1 ~ 10 |
87+
| SpaceToBatchND | 1 ~ 10 |
88+
| Conv1D | 1 ~ 10 |
89+
| Conv2D | 1 ~ 10 |
90+
| Conv3D | 1 ~ 10 |
91+
| Conv2DBackpropInput | 1 ~ 10 |
92+
| DepthwiseConv2d | 1 ~ 10 |
93+
| DepthwiseConv2dNative | 1 ~ 10 |
94+
| MaxPool | 1 ~ 10 |
95+
| MaxPoolV2 | 1 ~ 10 |
96+
| AvgPool | 1 ~ 10 |
97+
| AvgPool3D | 1 ~ 10 |
98+
| BiasAdd | 1 ~ 10 |
99+
| BiasAddV1 | 1 ~ 10 |
100+
| Pad | 1 ~ 10 |
101+
| PadV2 | 1 ~ 10 |
102+
| MirrorPad | 1 ~ 10 |
103+
| SpaceToDepth | 1 ~ 10 |
104+
| DepthToSpace | 1 ~ 10 |
105+
| Prod | 1 ~ 10 |
106+
| Sum | 1 ~ 10 |
107+
| Mean | 1 ~ 10 |
108+
| Max | 1 ~ 10 |
109+
| Min | 1 ~ 10 |
110+
| ArgMax | 1 ~ 10 |
111+
| ArgMin | 1 ~ 10 |
112+
| LSTMBlockCell | 1 ~ 10 |
113+
| FloorDiv | 6 ~ 10 |
114+
| FusedBatchNorm | 6 ~ 10 |
115+
| FusedBatchNormV2 | 6 ~ 10 |
116+
| All | 6 ~ 10 |
117+
| Any | 6 ~ 10 |
118+
| AddN | 6 ~ 10 |
119+
| If | 7 ~ 10 |
120+
| Loop | 7 ~ 10 |
121+
| Scan | 7 ~ 10 |
122+
| Range | 7 ~ 10 |
123+
| Fill | 7 ~ 10 |
124+
| Multinomial | 7 ~ 10 |
125+
| LessEqual | 7 ~ 10 |
126+
| GreaterEqual | 7 ~ 10 |
127+
| Acos | 7 ~ 10 |
128+
| Asin | 7 ~ 10 |
129+
| Atan | 7 ~ 10 |
130+
| Cos | 7 ~ 10 |
131+
| Sin | 7 ~ 10 |
132+
| Tan | 7 ~ 10 |
133+
| FloorMod | 7 ~ 10 |
134+
| ResizeBilinear | 7 ~ 10 |
135+
| ResizeNearestNeighbor | 7 ~ 10 |
136+
| MatrixBandPart | 7 ~ 10 |
137+
| SoftmaxCrossEntropyWithLogits | 7 ~ 10 |
138+
| SparseSoftmaxCrossEntropyWithLogits | 7 ~ 10 |
139+
| Select | 8 ~ 10 |
140+
| ReverseSequence | 8 ~ 10 (Except 9) |
141+
| MaxPoolWithArgmax | 8 ~ 10 |
142+
| Where | 9 ~ 10 |
143+
| Acosh | 9 ~ 10 |
144+
| Asinh | 9 ~ 10 |
145+
| Atanh | 9 ~ 10 |
146+
| Cosh | 9 ~ 10 |
147+
| Sinh | 9 ~ 10 |
148+
| IsNan | 9 ~ 10 |
149+
| IsInf | 10 |
150+
| NonMaxSuppressionV2 | 10 |
151+
| NonMaxSuppressionV3 | 10 |
152+
| ReverseV2 | 10 |
151153
### Domain: "com.microsoft"
152154
| Tensorflow Op | Convertible to ONNX Op Versions |
153155
| ------------- | ------------------------------- |
154-
| Range | ['1'] |
156+
| Range | 1 |

‎tests/test_backend.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,16 @@ def test_less_unsupport_type(self):
808808
_ = tf.identity(mi, name=_TFOUTPUT)
809809
self._run_test_case([_OUTPUT], {_INPUT: x_val1, _INPUT1: x_val2})
810810

811+
@check_opset_min_version(11, "Equal")
812+
def test_equal_float(self):
813+
x_val1 = np.array([0., 1., 2., 3., 4., -1., -2], dtype=np.float32)
814+
x_val2 = np.array([0., 1., 2.1, 3.5, 4.6, -1.1, -2.9], dtype=np.float32)
815+
x1 = tf.placeholder(tf.float32, x_val1.shape, name=_TFINPUT)
816+
x2 = tf.placeholder(tf.float32, x_val2.shape, name=_TFINPUT1)
817+
mi = tf.equal(x1, x2)
818+
_ = tf.identity(mi, name=_TFOUTPUT)
819+
self._run_test_case([_OUTPUT], {_INPUT: x_val1, _INPUT1: x_val2})
820+
811821
def test_equal(self):
812822
x_val1 = np.array([4, 2, 4, 1], dtype=np.int32).reshape((2, 2))
813823
x_val2 = np.array([2, 4, 4, 1], dtype=np.int32).reshape((2, 2))

0 commit comments

Comments
 (0)