commit 5c7ab05555d3abd23a11db403090b7563ce388e6
author ruoyan01 <ruomei.yan@arm.com> Mon Mar 04 14:48:02 2019 +0000
committer Ruomei Yan <ruomei.yan@arm.com> Mon Mar 04 15:38:09 2019 +0000
tree b744c997524f24e2ae721018c7d47f137a4805c0
parent a1ed73a7c0780584a957509ddc4e65ad4de22c39

IVGCVSW-2681 Fix layer name in BatchNormalization deserialization

Change-Id: Iec43db205d77dc9864abe1fe85104722a6954d57
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>

src/armnnDeserializer/Deserializer.cpp

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 405d95e..04c6296 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -877,7 +877,7 @@
     CHECK_VALID_SIZE(outputs.size(), 1);
     auto outputInfo = ToTensorInfo(outputs[0]);
 
-    auto layerName = boost::str(boost::format("BatchNormalization:%1%") % layerIndex);
+    auto layerName = GetLayerName(graph, layerIndex);
 
     auto serializerLayer = graph->layers()->Get(layerIndex)->layer_as_BatchNormalizationLayer();
     auto serializerDescriptor = serializerLayer->descriptor();

src/armnnSerializer/test/SerializerTests.cpp

diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 2751aff..62fa0c6 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -943,7 +943,7 @@
                                       const armnn::ConstTensor&,
                                       const char* name) override
         {
-            BOOST_TEST(name == "BatchNormalization:1");
+            BOOST_TEST(name == "BatchNormalizationLayer");
         }
     };