Merge pull request #49 from onnx/gs/onnx-1.2

upsample scales must be nchw, update to onnx-1.2.2

Author: guschmue

setup.py

@@ -80,5 +80,5 @@ def run(self):
     author='[email protected]',
     author_email='[email protected]',
     url='https://github.com/onnx/tensorflow-onnx',
-    install_requires=['numpy>=1.14.1', 'onnx>=1.2']
+    install_requires=['numpy>=1.14.1', 'onnx>=1.2.2']
 )

tests/unity.yaml

@@ -1,6 +1,6 @@
 3DBall:
   # caffe2: needs RandomNormal
-  # onnxmsrtnext: int->float cast fails
+  # onnxmsrtnext: fails on missing onnx min/max broadcast
   disabled: true
   url: https://github.com/Unity-Technologies/ml-agents/raw/master/unity-environment/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.bytes
   model: 3DBall.bytes
@@ -58,7 +58,7 @@ Basic:
 
 Bouncer:
   # caffe2: needs RandomNormal
-  # onnxmsrtnext: int->float cast fails
+  # onnxmsrtnext: fails on missing onnx min/max broadcast
   disabled: true
   url: https://github.com/Unity-Technologies/ml-agents/raw/master/unity-environment/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.bytes
   model: Bouncer.bytes
@@ -71,7 +71,7 @@ Bouncer:
 
 crawler:
   # caffe2: needs RandomNormal
-  # onnxmsrtnext: int->float cast fails
+  # onnxmsrtnext: fails on missing onnx min/max broadcast
   disabled: true
   url: https://github.com/Unity-Technologies/ml-agents/raw/master/unity-environment/Assets/ML-Agents/Examples/Crawler/TFModels/crawler.bytes
   model: crawler.bytes
@@ -135,7 +135,7 @@ PushBlock:
 
 Reacher:
   # caffe2: needs RandomNormal
-  # onnxmsrtnext: int->float cast fails
+  # onnxmsrtnext: fails on missing onnx min/max broadcast
   disabled: true
   url: https://github.com/Unity-Technologies/ml-agents/raw/master/unity-environment/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.bytes
   model: Reacher.bytes

tf2onnx/tfonnx.py

@@ -38,7 +38,8 @@ def tensorflow_to_onnx(graph):
     # ignore the following attributes
     ignored_attr = ["unknown_rank", "_class", "Tidx", "Tshape", "use_cudnn_on_gpu", "Index",
                     "Tpaddings", "TI", "Tparams", "Tindices", "Tlen", "Tdim", "dynamic_size", "element_shape",
-                    "Tmultiples", "output_dtype", "Tblock_shape", "Tcrops", "index_type", "Taxis", "U"]
+                    "Tmultiples", "output_dtype", "Tblock_shape", "Tcrops", "index_type", "Taxis", "U",
+                    "maxval", "Tout"]
     # some stats
     op_cnt = collections.Counter()
     attr_cnt = collections.Counter()
@@ -757,8 +758,8 @@ def upsample_op7(ctx, node, name, args):
     # wants the input to be NHWC - adjust target_shape to this.
     n, h, w, c = shape
     nh, nw = target_shape
-    # scaler = [float(n), float(nh) / h, float(nw) / w, float(c)]
-    scaler = [float(nh) / h, float(nw) / w]
+    # scaler is nchw
+    scaler = [1., 1., float(nh) / h, float(nw) / w]
     node.set_attr("scales", scaler)
     node.set_attr("mode", mode)
     ctx.remove_input(node, node.input[1])