diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-05 13:37:19 +0100 |
---|---|---|
committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-05 13:37:29 +0100 |
commit | 1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4 (patch) | |
tree | 41acf0281797c5d4e9e515032ac989428efcb5b8 /src/armnnSerializer/test/SerializerTests.cpp | |
parent | 647aab364aa13490427533c427496ad725b47f7a (diff) | |
download | armnn-1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4.tar.gz |
IVGCVSW-2915 Add Merge Layer and no-op factory method
Change-Id: I54549671e0d3b207904cf9796a843eb2b0a631f7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/armnnSerializer/test/SerializerTests.cpp')
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 0979076476..a1ef9eef59 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1185,6 +1185,46 @@ BOOST_AUTO_TEST_CASE(SerializeMean) deserializedNetwork->Accept(verifier); } +BOOST_AUTO_TEST_CASE(SerializeMerge) +{ + class MergeLayerVerifier : public LayerVerifierBase + { + public: + MergeLayerVerifier(const std::string& layerName, + const std::vector<armnn::TensorInfo>& inputInfos, + const std::vector<armnn::TensorInfo>& outputInfos) + : LayerVerifierBase(layerName, inputInfos, outputInfos) {} + + void VisitMergeLayer(const armnn::IConnectableLayer* layer, const char* name) override + { + VerifyNameAndConnections(layer, name); + } + }; + + const std::string layerName("merge"); + const armnn::TensorInfo info({ 1, 2, 2, 3 }, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); + armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + armnn::IConnectableLayer* const mergeLayer = network->AddMergeLayer(layerName.c_str()); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer0->GetOutputSlot(0).Connect(mergeLayer->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).Connect(mergeLayer->GetInputSlot(1)); + mergeLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer0->GetOutputSlot(0).SetTensorInfo(info); + inputLayer1->GetOutputSlot(0).SetTensorInfo(info); + mergeLayer->GetOutputSlot(0).SetTensorInfo(info); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + MergeLayerVerifier verifier(layerName, {info, info}, {info}); + deserializedNetwork->Accept(verifier); +} + BOOST_AUTO_TEST_CASE(SerializeMerger) { class MergerLayerVerifier : public LayerVerifierBase |