fix bugs

Author: lucienwang1009

tf2onnx/onnx_opset/tensor.py

@@ -941,7 +941,12 @@ class Unpack:
     @classmethod
     def version_1(cls, ctx, node, **kwargs):
         # hack to make up for the missing onnx unpack op
+        # squeeze does not support negative axis
         axis = node.get_attr("axis").i
+        if axis < 0:
+            shape = ctx.get_shape(node.input[0])
+            utils.make_sure(shape is not None, "shape of unpack input is None: {}".format(node.input[0]))
+            axis += len(shape)
         # split the tensor into n outputs
         node.type = "Split"
         # for each output we need to squeeze axis

tf2onnx/rewriter/leakyrelu_rewriter.py

@@ -40,8 +40,6 @@ def rewrite_leakyrelu(g, ops):
                 continue
             leakyrelu = g.make_node("LeakyRelu", inputs=[max_input_edge_name], attr={"alpha": alpha},
                                     shapes=[g.get_shape(max_node.output[0])], dtypes=[g.get_dtype(max_node.output[0])])
-            ops.remove(max_node)
-            ops.remove(mul_node)
             ops.append(leakyrelu)
             g.replace_all_inputs(ops, max_node.output[0], leakyrelu.output[0])
 

tf2onnx/rewriter/thresholded_relu_rewriter.py

@@ -34,7 +34,6 @@ def rewrite_thresholded_relu(g, ops):
         greater_input_node = match.get_op('greater_input')
         mul_node = match.get_op("mul")
         mul_input_node = match.get_op('mul_input')
-        cast_node = match.get_op('cast')
 
         greater_input_edge_name = _find_edge_name_between_nodes(greater_input_node, greater_node)
         mul_input_edge_name = _find_edge_name_between_nodes(mul_input_node, mul_node)
@@ -43,9 +42,6 @@ def rewrite_thresholded_relu(g, ops):
             thresholded_relu = g.make_node("ThresholdedRelu", inputs=[mul_input_edge_name], attr={"alpha": theta},
                                            shapes=[g.get_shape(mul_node.output[0])],
                                            dtypes=[g.get_dtype(mul_node.output[0])])
-            ops.remove(greater_node)
-            ops.remove(cast_node)
-            ops.remove(mul_node)
             ops.append(thresholded_relu)
             g.replace_all_inputs(ops, mul_node.output[0], thresholded_relu.output[0])
     return ops