aboutsummaryrefslogtreecommitdiff
path: root/src/armnnSerializer
diff options
context:
space:
mode:
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r--src/armnnSerializer/ArmnnSchema.fbs11
-rw-r--r--src/armnnSerializer/Serializer.cpp8
-rw-r--r--src/armnnSerializer/Serializer.hpp3
-rw-r--r--src/armnnSerializer/SerializerSupport.md1
-rw-r--r--src/armnnSerializer/test/SerializerTests.cpp41
5 files changed, 61 insertions, 3 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index f416912618..410849ec8b 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -104,7 +104,8 @@ enum LayerType : uint {
Pad = 20,
Rsqrt = 21,
Floor = 22,
- BatchNormalization = 23
+ BatchNormalization = 23,
+ Greater = 24
}
// Base layer table to be used as part of other layers
@@ -184,6 +185,10 @@ table FullyConnectedDescriptor {
transposeWeightsMatrix:bool = false;
}
+table GreaterLayer {
+ base:LayerBase;
+}
+
table InputLayer {
base:BindableLayerBase;
}
@@ -341,7 +346,6 @@ table PadDescriptor {
padList:[uint];
}
-
table RsqrtLayer {
base:LayerBase;
}
@@ -384,7 +388,8 @@ union Layer {
NormalizationLayer,
PadLayer,
RsqrtLayer,
- FloorLayer
+ FloorLayer,
+ GreaterLayer
}
table AnyLayer {
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 423706ceb3..b55adb266d 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -329,6 +329,14 @@ void SerializerVisitor::VisitMaximumLayer(const armnn::IConnectableLayer* layer,
CreateAnyLayer(fbMaximumLayer.o, serializer::Layer::Layer_MaximumLayer);
}
+void SerializerVisitor::VisitGreaterLayer(const armnn::IConnectableLayer* layer, const char* name)
+{
+ auto fbGreaterBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Greater);
+ auto fbGreaterLayer = serializer::CreateGreaterLayer(m_flatBufferBuilder, fbGreaterBaseLayer);
+
+ CreateAnyLayer(fbGreaterLayer.o, serializer::Layer::Layer_GreaterLayer);
+}
+
// Build FlatBuffer for Multiplication Layer
void SerializerVisitor::VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name)
{
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index a60d19b860..164db19e6a 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -92,6 +92,9 @@ public:
const armnn::Optional<armnn::ConstTensor>& biases,
const char* name = nullptr) override;
+ void VisitGreaterLayer(const armnn::IConnectableLayer* layer,
+ const char* name = nullptr) override;
+
void VisitInputLayer(const armnn::IConnectableLayer* layer,
armnn::LayerBindingId id,
const char* name = nullptr) override;
diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index 98023a6771..f18ef3af68 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -17,6 +17,7 @@ The Arm NN SDK Serializer currently supports the following layers:
* Equal
* Floor
* FullyConnected
+* Greater
* Maximum
* Minimum
* Multiplication
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 3ef15831b1..7206d6dc53 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -508,6 +508,47 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeConvolution2d)
{outputInfo.GetShape()});
}
+BOOST_AUTO_TEST_CASE(SerializeDeserializeGreater)
+{
+ class VerifyGreaterName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy>
+ {
+ public:
+ void VisitGreaterLayer(const armnn::IConnectableLayer*, const char* name) override
+ {
+ BOOST_TEST(name == "greater");
+ }
+ };
+
+ const armnn::TensorInfo inputTensorInfo1({ 1, 2, 2, 2 }, armnn::DataType::Float32);
+ const armnn::TensorInfo inputTensorInfo2({ 1, 2, 2, 2 }, armnn::DataType::Float32);
+ const armnn::TensorInfo outputTensorInfo({ 1, 2, 2, 2 }, armnn::DataType::Boolean);
+
+ armnn::INetworkPtr network = armnn::INetwork::Create();
+ armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(0);
+ armnn::IConnectableLayer* const inputLayer2 = network->AddInputLayer(1);
+ armnn::IConnectableLayer* const greaterLayer = network->AddGreaterLayer("greater");
+ armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0);
+
+ inputLayer1->GetOutputSlot(0).Connect(greaterLayer->GetInputSlot(0));
+ inputLayer1->GetOutputSlot(0).SetTensorInfo(inputTensorInfo1);
+ inputLayer2->GetOutputSlot(0).Connect(greaterLayer->GetInputSlot(1));
+ inputLayer2->GetOutputSlot(0).SetTensorInfo(inputTensorInfo2);
+ greaterLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+ greaterLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+ armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+ BOOST_CHECK(deserializedNetwork);
+
+ VerifyGreaterName nameChecker;
+ deserializedNetwork->Accept(nameChecker);
+
+ CheckDeserializedNetworkAgainstOriginal(*network,
+ *deserializedNetwork,
+ {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()},
+ {outputTensorInfo.GetShape()},
+ {0, 1});
+}
+
BOOST_AUTO_TEST_CASE(SerializeDeserializeReshape)
{
class VerifyReshapeName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy>