Identityがexperimentalじゃなくなったので正式に対応

sony · May 7, 2018 · 60b9166 · 60b9166
1 parent 72e48b7
commit 60b9166
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/python/src/nnabla/utils/converter/onnx/exporter.py b/python/src/nnabla/utils/converter/onnx/exporter.py
@@ -36,6 +36,7 @@
     "Greater": "Greater",
     "Equal": "Equal",
     "Exp": "Exp",
+    "Identity": "Identity",
     # optype with different names
     "ReLU": "Relu",
     "LeakyReLU": "LeakyRelu",
@@ -61,7 +62,6 @@
     "Maximum2": "Max",
     "Minimum2": "Min",
     # optype that gets converted
-    "Identity": "Dropout",
     "Affine": "Gemm",
     # optype that should get merged
     # with other operators
@@ -113,12 +113,6 @@ def convert_to_nodes(func, variables, input_types, output_types, broadcast_targe
         attr = onnx.helper.make_attribute("is_test", 0)
         n.attribute.extend([attr])
         nl.append(n)
-    elif func.type == "Identity":
-        # Convert Identity to a Dropout with is_test=true
-        # so we just copy the input to output
-        attr = onnx.helper.make_attribute("is_test", 1)
-        n.attribute.extend([attr])
-        nl.append(n)
     elif func.type == "MaxPooling":
         mpp = func.max_pooling_param
         if not mpp.ignore_border:

diff --git a/python/src/nnabla/utils/converter/onnx/reader.py b/python/src/nnabla/utils/converter/onnx/reader.py
@@ -48,6 +48,7 @@
     "Greater": "Greater",
     "Equal": "Equal",
     "Exp": "Exp",
+    "Identity": "Identity",
     # optype with different names
     "Relu": "ReLU",
     "Concat": "Concatenate",

diff --git a/python/test/utils/conversion/test_conversion.py b/python/test/utils/conversion/test_conversion.py
@@ -815,6 +815,20 @@ def test_nnp_onnx_conversion_exp(tmpdir, nnp_fixture):
                                     "out_data_1", "exec_0")
 
 
+def test_onnx_nnp_conversion_identity(tmpdir, nnp_fixture):
+    convert_onnx_to_nnp_and_compare(tmpdir, TEST_DATA_DIR,
+                                    "identity.onnx",
+                                    "identity.nnp",
+                                    "out_data_1", "exec_0")
+
+
+def test_nnp_onnx_conversion_identity(tmpdir, nnp_fixture):
+    convert_nnp_to_onnx_and_compare(tmpdir, TEST_DATA_DIR,
+                                    "identity.nnp",
+                                    "identity.onnx",
+                                    "out_data_1", "exec_0")
+
+
 # These following tests are invalidated due to a
 # backend bug? decribed in the following issue:
 # https://github.com/Microsoft/CNTK/issues/3127