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

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

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index d887357..c85282f 100644 (file)
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -910,7 +910,7 @@ void Deserializer::ParseActivation(GraphPtr graph, unsigned int layerIndex)
     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 @@ void Deserializer::ParseArgMinMax(GraphPtr graph, unsigned int layerIndex)
     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());

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

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 6450d16..3f3e8fc 100644 (file)
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -170,7 +170,7 @@ table ActivationLayer {
 }
 
 table ActivationDescriptor {
-    function:ActivationFunction = Sigmoid;
+    activationFunction:ActivationFunction = Sigmoid;
     a:float;
     b:float;
 }
@@ -185,7 +185,7 @@ table ArgMinMaxLayer {
 }
 
 table ArgMinMaxDescriptor{
-    function:ArgMinMaxFunction;
+    argMinMaxFunction:ArgMinMaxFunction;
     axis:int;
 }