Merge pull request #44 from notogawa/support_clipped_relu

support ClippedReLU
chainer · Nov 15, 2018 · bfcc5c9 · bfcc5c9
2 parents 06af407 + 5ecdf97
commit bfcc5c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/onnx_chainer/functions/__init__.py b/onnx_chainer/functions/__init__.py
@@ -1,3 +1,4 @@
+from onnx_chainer.functions.activation import convert_ClippedReLU  # NOQA
 from onnx_chainer.functions.activation import convert_ELU  # NOQA
 from onnx_chainer.functions.activation import convert_HardSigmoid  # NOQA
 from onnx_chainer.functions.activation import convert_LeakyReLU  # NOQA

diff --git a/onnx_chainer/functions/activation.py b/onnx_chainer/functions/activation.py
@@ -2,6 +2,20 @@
 from onnx_chainer import mapping
 
 
+def convert_ClippedReLU(func, onnx_op_name, opset_version, input_names, output_names, parameters):
+    if opset_version == 1:
+        return helper.make_node(
+            onnx_op_name, input_names, output_names,
+            min=0.0, max=func.cap,
+            consumed_inputs=[1]
+        ),
+    elif opset_version == 6:
+        return helper.make_node(
+            onnx_op_name, input_names, output_names,
+            min=0.0, max=func.cap,
+        ),
+
+
 def convert_ELU(func, onnx_op_name, opset_version, input_names, output_names, parameters):
     if opset_version == 1:
         return helper.make_node(

diff --git a/onnx_chainer/mapping.py b/onnx_chainer/mapping.py
@@ -20,6 +20,7 @@
 # Chainer Function -> (ONNX Operator, Operator set IDs)
 operators = {
     # Activation
+    'ClippedReLU': ('Clip', (1, 6)),
     'ELU': ('Elu', (1, 6)),
     'HardSigmoid': ('HardSigmoid', (1, 6)),
     'LeakyReLU': ('LeakyRelu', (1, 6)),

diff --git a/tests/functions_tests/test_activations.py b/tests/functions_tests/test_activations.py
@@ -12,6 +12,7 @@
 
 
 @testing.parameterize(
+    {'name': 'clipped_relu'},
     {'name': 'elu'},
     {'name': 'hard_sigmoid'},
     {'name': 'leaky_relu'},