From 86bc3d8ff06a9b59565504dfda02b3fcaab2b2c9 Mon Sep 17 00:00:00 2001 From: Tee Jung Date: Tue, 1 Oct 2019 11:25:56 +0900 Subject: Update field name of serialized format not to make problem with js Signed-off-by: Jung Tae-young Change-Id: I69ee32b5e201198610e7ba6ec22b0c0025a7e57c --- src/armnnDeserializer/Deserializer.cpp | 4 ++-- src/armnnDeserializer/test/DeserializeActivation.cpp | 2 +- src/armnnSerializer/ArmnnSchema.fbs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index d887357ef1..c85282f418 100644 --- 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 ad03dd662b..9e98893038 100644 --- 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 6450d16ca8..3f3e8fcb0b 100644 --- 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; } -- cgit v1.2.1