Merge pull request #457 from onnx/gs/fix-mobilenetv2

fix mobilnetv2

Author: guschmue

tests/run_pretrained_models.yaml

@@ -176,8 +176,6 @@ googlenet_v4_slim:
   rtol: 0.1
 
 mobilenet_v2_1.4_224:
-  # fails because of input[1] in squeeze is 0 instead of 1
-  disabled: true
   url: https://storage.googleapis.com/mobilenet_v2/checkpoints/mobilenet_v2_1.4_224.tgz
   model: mobilenet_v2_1.4_224_frozen.pb
   input_get: get_beach

tf2onnx/onnx_opset/nn.py

@@ -149,7 +149,7 @@ def add_padding(ctx, node, kernel_shape, strides, dilations=None, spatial=2):
                 input_shape = spatial_map(input_shape, constants.NHWC_TO_NCHW)
                 output_shape = spatial_map(output_shape, constants.NHWC_TO_NCHW)
             # calculate pads
-            if any(input_shape[i + 2] == -1 for i in range(spatial)):
+            if any(input_shape[i + 2] == -1 or output_shape[i + 2] == -1 for i in range(spatial)):
                 logger.debug("node %s has unknown dim %d for pads calculation, fallback to auto_pad",
                              node.name, input_shape)
                 node.set_attr("auto_pad", "SAME_UPPER")