Merge pull request onnx#420 from winnietsang/add-thresholdedRelu

Add opset 10 support for thresholded-relu

Author: chinhuang007

doc/support_status.md

@@ -153,7 +153,7 @@ ______
 |Tan|7|
 |Tanh|1, 6|
 |TfIdfVectorizer|N/A|
-|ThresholdedRelu|1|
+|ThresholdedRelu|1, 10|
 |Tile|1, 6|
 |TopK|1, 10|
 |Transpose|1|

onnx_tf/handlers/backend/thresholded_relu.py

@@ -10,17 +10,16 @@
 class ThresholdedRelu(BackendHandler):
 
   @classmethod
-  def get_attrs_processor_param(cls):
-    return {"rename": {"alpha": "theta"}}
+  def _common(cls, node, **kwargs):
+    x = kwargs["tensor_dict"][node.inputs[0]]
+    alpha = node.attrs.get("alpha", 1.0)
+    epsilon = 1e-5
+    return [tf.nn.relu(x) - tf.nn.relu(tf.sign(alpha - x + epsilon) * x)]
 
   @classmethod
   def version_1(cls, node, **kwargs):
-    x = kwargs["tensor_dict"][node.inputs[0]]
-    if "alpha" not in node.attrs.keys():
-      warnings.warn("Provide an alpha value.", UserWarning)
-      alpha = 1
-    else:
-      alpha = node.attrs["alpha"]
+    return cls._common(node, **kwargs)
 
-    epsilon = 1e-5
-    return [tf.nn.relu(x) - tf.nn.relu(tf.sign(alpha - x + epsilon) * x)]
+  @classmethod
+  def version_10(cls, node, **kwargs):
+    return cls._common(node, **kwargs)

onnx_tf/opset_version.py

@@ -146,7 +146,7 @@
     'Tan': [7],
     'Tanh': [1, 6],
     'TfIdfVectorizer': [],
-    'ThresholdedRelu': [1],
+    'ThresholdedRelu': [1, 10],
     'Tile': [1, 6],
     'TopK': [1, 10],
     'Transpose': [1],

test/backend/test_node.py

@@ -1071,6 +1071,16 @@ def test_tanh(self):
     output = run_node(node_def, [x])
     np.testing.assert_almost_equal(output["Y"], np.tanh(x), decimal=5)
 
+  def test_thresholded_relu(self):
+    alpha = 2.0
+    node_def = helper.make_node(
+        "ThresholdedRelu", ["X"], ["Y"], alpha=alpha)
+    x = self._get_rnd([10], -3.0, 3.0)
+    y = np.clip(x, alpha, np.inf)
+    y[y == alpha] = 0
+    output = run_node(node_def, [x])
+    np.testing.assert_almost_equal(output["Y"], y)
+
   def test_tile(self):
     if legacy_onnx_pre_ver(1, 2):
       raise unittest.SkipTest(