aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/armnnDeserializer/Deserializer.cpp4
-rw-r--r--src/armnnDeserializer/test/DeserializeActivation.cpp2
-rw-r--r--src/armnnSerializer/ArmnnSchema.fbs4
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;
}