Merge pull request #504 from zhijxu-MS/support_pool_dropout_10

Support pool-10 and dropout-10

Author: nbcsm

tf2onnx/onnx_opset/nn.py

@@ -294,6 +294,14 @@ def version_4(cls, ctx, node, **kwargs):
 class PoolOp:
     @classmethod
     def version_4(cls, ctx, node, **kwargs):
+        cls._convert(ctx, node, **kwargs)
+
+    @classmethod
+    def version_10(cls, ctx, node, **kwargs):
+        cls._convert(ctx, node, **kwargs)
+
+    @classmethod
+    def _convert(cls, ctx, node, **kwargs):
         # T output = MaxPool(T input, @list(int) ksize, @list(int) strides, @string padding, @string data_format)
         # T Y = MaxPool(T X, @AttrType.STRING auto_pad, @AttrType.INTS kernel_shape, @AttrType.INTS pads,
         #               @AttrType.INTS strides)

tf2onnx/onnx_opset/tensor.py

@@ -59,13 +59,24 @@ def _wrap_concat_with_cast(ctx, node):
             ctx.copy_shape(output_name, output_cast.output[0])
 
 
-@tf_op(["Size", "Flatten", "Dropout"])
+@tf_op(["Size", "Flatten"])
 class DirectOp:
     @classmethod
     def version_4(cls, ctx, node, **kwargs):
         pass
 
 
+@tf_op("Dropout")
+class Dropout:
+    @classmethod
+    def version_4(cls, ctx, node, **kwargs):
+        pass
+
+    @classmethod
+    def version_10(cls, ctx, node, **kwargs):
+        pass
+
+
 @tf_op("Identity")
 class Identity:
     @classmethod