IVGCVSW-2681 Fix layer name in BatchNormalization deserialization

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

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 405d95e..04c6296 100644 (file)
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -877,7 +877,7 @@ void Deserializer::ParseBatchNormalization(GraphPtr graph, unsigned int layerInd
     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();

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