commit 86bc3d8ff06a9b59565504dfda02b3fcaab2b2c9
author Tee Jung <tee@tee-mac.local> Tue Oct 01 11:25:56 2019 +0900
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue Oct 01 13:46:19 2019 +0100
tree da6eee83b0d7c85d68dd46d082d845c1b4a027a4
parent 7db85b251cbe4f481ec6a445548460e4d90f109d

Update field name of serialized format not to make problem with js

Signed-off-by: Jung Tae-young <naey05@gmail.com>
Change-Id: I69ee32b5e201198610e7ba6ec22b0c0025a7e57c

src/armnnDeserializer/Deserializer.cpp

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index d887357..c85282f 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -910,7 +910,7 @@
     auto serializerDescriptor = serializerLayer->descriptor();
 
     armnn::ActivationDescriptor descriptor;
-    descriptor.m_Function = ToActivationFunction(serializerDescriptor->function());
+    descriptor.m_Function = ToActivationFunction(serializerDescriptor->activationFunction());
     descriptor.m_A = serializerDescriptor->a();
     descriptor.m_B = serializerDescriptor->b();
 
@@ -957,7 +957,7 @@
     auto serializerDescriptor = serializerLayer->descriptor();
 
     armnn::ArgMinMaxDescriptor descriptor;
-    descriptor.m_Function = ToArgMinMaxFunction(serializerDescriptor->function());
+    descriptor.m_Function = ToArgMinMaxFunction(serializerDescriptor->argMinMaxFunction());
     descriptor.m_Axis = serializerDescriptor->axis();
     auto layerName = GetLayerName(graph, layerIndex);
     IConnectableLayer* layer = m_Network->AddArgMinMaxLayer(descriptor, layerName.c_str());

src/armnnDeserializer/test/DeserializeActivation.cpp

diff --git a/src/armnnDeserializer/test/DeserializeActivation.cpp b/src/armnnDeserializer/test/DeserializeActivation.cpp
index ad03dd6..9e98893 100644
--- a/src/armnnDeserializer/test/DeserializeActivation.cpp
+++ b/src/armnnDeserializer/test/DeserializeActivation.cpp
@@ -71,7 +71,7 @@
                     descriptor: {
                         a: )" + a + R"(,
                         b: )" + b + R"(,
-                        function: )" + activationType + R"(
+                        activationFunction: )" + activationType + R"(
                     },
                 },
             },