resolve requested changes

Author: mindest

tests/common.py

@@ -33,7 +33,8 @@
     "validate_const_node",
     "group_nodes_by_type",
     "test_ms_domain",
-    "check_node_domain"
+    "check_node_domain",
+    "check_thresholded_relu_count"
 ]
 
 
@@ -305,6 +306,10 @@ def check_gru_count(graph, expected_count):
     return check_op_count(graph, "GRU", expected_count)
 
 
+def check_thresholded_relu_count(graph, expected_count):
+    return check_op_count(graph, "ThresholdedRelu", expected_count)
+
+
 _MAX_MS_OPSET_VERSION = 1
 
 

tests/test_backend.py

@@ -2148,7 +2148,8 @@ def test_thresholded_relu(self):
             t = tf.keras.layers.ThresholdedReLU(theta=theta_val)
             x_ = t.call(x)
             _ = tf.identity(x_, name=_TFOUTPUT)
-            self._run_test_case([_OUTPUT], {_INPUT: x_val})
+            self._run_test_case([_OUTPUT], {_INPUT: x_val},
+                                graph_validator=lambda g: check_thresholded_relu_count(g, 1))
             tf.reset_default_graph()
 
 

tf2onnx/onnx_opset/math.py

@@ -399,10 +399,3 @@ def version_7(cls, ctx, node, **kwargs):
         ctx.remove_node(node.name)
         ctx.make_node(op_type="Sub", inputs=[node.input[0], mul.output[0]],
                       name=node.name, outputs=node.output, shapes=shapes, dtypes=dtypes)
-
-
-@tf_op("ThresholdedReLU", onnx_op="ThresholdedRelu")
-class ThresholdedRelu:
-    @classmethod
-    def version_10(cls, ctx, node, **kwargs):
-        pass

tf2onnx/rewriter/__init__.py

@@ -9,7 +9,7 @@
 from tf2onnx.rewriter.cond_rewriter import rewrite_cond
 from tf2onnx.rewriter.random_uniform import rewrite_random_uniform, rewrite_random_uniform_fold_const
 from tf2onnx.rewriter.leakyrelu_rewriter import rewrite_leakyrelu
-from tf2onnx.rewriter.thresholdedrelu_rewriter import rewrite_thresholded_relu
+from tf2onnx.rewriter.thresholded_relu_rewriter import rewrite_thresholded_relu
 from tf2onnx.rewriter.rnn import rewrite_single_direction_lstm, rewrite_bi_direction_lstm, \
     rewrite_single_direction_gru, rewrite_bi_direction_gru, \
     rewrite_custom_rnn_cell, rewrite_generic_loop

tf2onnx/rewriter/thresholdedrelu_rewriter.py renamed to tf2onnx/rewriter/thresholded_relu_rewriter.py

@@ -40,9 +40,6 @@ def rewrite_thresholded_relu(g, ops):
         mul_input_edge_name = _find_edge_name_between_nodes(mul_input_node, mul_node)
         if greater_input_edge_name == mul_input_edge_name:
             theta = match.get_op('theta').get_tensor_value()
-            # check disabled for now, tf requires theta to be non-negative, while onnx does not
-            # if theta < 0:
-            #     continue
             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])])