From a1ed73a7c0780584a957509ddc4e65ad4de22c39 Mon Sep 17 00:00:00 2001 From: Saoirse Stewart Date: Mon, 4 Mar 2019 13:40:12 +0000 Subject: IVGCVSW-2691 Add Serialize/Deseralize Gather layer Change-Id: I589d37c9f65801b701858d6e68e2e3151fac6e16 Signed-off-by: Saoirse Stewart --- src/armnnSerializer/test/SerializerTests.cpp | 223 ++++++++++++++------------- 1 file changed, 112 insertions(+), 111 deletions(-) (limited to 'src/armnnSerializer/test/SerializerTests.cpp') diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 5a6806adec..2751aff1d6 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -61,12 +61,13 @@ static std::vector GenerateRandomData(size_t size) return randomData; } +template void CheckDeserializedNetworkAgainstOriginal(const armnn::INetwork& deserializedNetwork, const armnn::INetwork& originalNetwork, const std::vector& inputShapes, const std::vector& outputShapes, - const std::vector& inputBindingIds = {0}, - const std::vector& outputBindingIds = {0}) + const std::vector& inputBindingIds={0}, + const std::vector& outputBindingIds={0}) { BOOST_CHECK(inputShapes.size() == inputBindingIds.size()); BOOST_CHECK(outputShapes.size() == outputBindingIds.size()); @@ -99,12 +100,11 @@ void CheckDeserializedNetworkAgainstOriginal(const armnn::INetwork& deserialized // Generate some input data armnn::InputTensors inputTensors1; armnn::InputTensors inputTensors2; - std::vector> inputData; + std::vector> inputData; inputData.reserve(inputShapes.size()); - for (unsigned int i = 0; i < inputShapes.size(); i++) - { - inputData.push_back(GenerateRandomData(inputShapes[i].GetNumElements())); + for (unsigned int i = 0; i < inputShapes.size(); i++) { + inputData.push_back(GenerateRandomData(inputShapes[i].GetNumElements())); inputTensors1.emplace_back( i, armnn::ConstTensor(runtime->GetInputTensorInfo(networkId1, inputBindingIds[i]), inputData[i].data())); @@ -115,8 +115,8 @@ void CheckDeserializedNetworkAgainstOriginal(const armnn::INetwork& deserialized armnn::OutputTensors outputTensors1; armnn::OutputTensors outputTensors2; - std::vector> outputData1; - std::vector> outputData2; + std::vector> outputData1; + std::vector> outputData2; outputData1.reserve(outputShapes.size()); outputData2.reserve(outputShapes.size()); @@ -249,10 +249,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeConstant) VerifyConstantName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*net, - *deserializedNetwork, - {commonTensorInfo.GetShape()}, - {commonTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *net, + {commonTensorInfo.GetShape()}, + {commonTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeFloor) @@ -502,10 +502,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeConvolution2d) VerifyConvolution2dName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputInfo.GetShape()}, - {outputInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeGreater) @@ -542,11 +542,11 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeGreater) VerifyGreaterName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, - {outputTensorInfo.GetShape()}, - {0, 1}); + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, + {outputTensorInfo.GetShape()}, + {0, 1}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeReshape) @@ -586,10 +586,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeReshape) VerifyReshapeName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeDepthwiseConvolution2d) @@ -642,10 +642,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeDepthwiseConvolution2d) VerifyDepthwiseConvolution2dName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputInfo.GetShape()}, - {outputInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeSoftmax) @@ -680,10 +680,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeSoftmax) VerifySoftmaxName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {tensorInfo.GetShape()}, - {tensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {tensorInfo.GetShape()}, + {tensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializePooling2d) @@ -732,10 +732,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializePooling2d) VerifyPooling2dName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputInfo.GetShape()}, - {outputInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializePermute) @@ -774,10 +774,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializePermute) VerifyPermuteName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeFullyConnected) @@ -831,10 +831,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeFullyConnected) VerifyFullyConnectedName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputInfo.GetShape()}, - {outputInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeSpaceToBatchNd) @@ -877,56 +877,57 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeSpaceToBatchNd) VerifySpaceToBatchNdName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } -BOOST_AUTO_TEST_CASE(SerializeDeserializeBatchToSpaceNd) +BOOST_AUTO_TEST_CASE(SerializeDeserializeGather) { - class VerifyBatchToSpaceNdName : public armnn::LayerVisitorBase + class VerifyGatherName : public armnn::LayerVisitorBase { public: - void VisitBatchToSpaceNdLayer(const armnn::IConnectableLayer*, - const armnn::BatchToSpaceNdDescriptor& descriptor, - const char* name) override + void VerifyGatherLayer(const armnn::IConnectableLayer *, const char *name) { - BOOST_TEST(name == "BatchToSpaceNdLayer"); + BOOST_TEST(name == "gatherLayer"); } }; - unsigned int inputShape[] = {4, 1, 2, 2}; - unsigned int outputShape[] = {1, 1, 4, 4}; + armnn::TensorInfo paramsInfo({ 8 }, armnn::DataType::QuantisedAsymm8); + armnn::TensorInfo indicesInfo({ 3 }, armnn::DataType::Signed32); + armnn::TensorInfo outputInfo({ 3 }, armnn::DataType::QuantisedAsymm8); - armnn::BatchToSpaceNdDescriptor desc; - desc.m_DataLayout = armnn::DataLayout::NCHW; - desc.m_BlockShape = {2, 2}; - desc.m_Crops = {{0, 0}, {0, 0}}; - - auto inputTensorInfo = armnn::TensorInfo(4, inputShape, armnn::DataType::Float32); - auto outputTensorInfo = armnn::TensorInfo(4, outputShape, armnn::DataType::Float32); + paramsInfo.SetQuantizationScale(1.0f); + paramsInfo.SetQuantizationOffset(0); + outputInfo.SetQuantizationScale(1.0f); + outputInfo.SetQuantizationOffset(0); + const std::vector& indicesData = {7, 6, 5}; armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - armnn::IConnectableLayer* const batchToSpaceNdLayer = network->AddBatchToSpaceNdLayer(desc, "BatchToSpaceNdLayer"); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer->GetOutputSlot(0).Connect(batchToSpaceNdLayer->GetInputSlot(0)); - inputLayer->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); - batchToSpaceNdLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - batchToSpaceNdLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + armnn::IConnectableLayer *const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer *const constantLayer = + network->AddConstantLayer(armnn::ConstTensor(indicesInfo, indicesData)); + armnn::IConnectableLayer *const gatherLayer = network->AddGatherLayer("gatherLayer"); + armnn::IConnectableLayer *const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(gatherLayer->GetInputSlot(0)); + inputLayer->GetOutputSlot(0).SetTensorInfo(paramsInfo); + constantLayer->GetOutputSlot(0).Connect(gatherLayer->GetInputSlot(1)); + constantLayer->GetOutputSlot(0).SetTensorInfo(indicesInfo); + gatherLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + gatherLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); BOOST_CHECK(deserializedNetwork); - VerifyBatchToSpaceNdName nameChecker; + VerifyGatherName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {paramsInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeBatchNormalization) @@ -991,10 +992,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeBatchNormalization) VerifyBatchNormalizationName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputInfo.GetShape()}, - {outputInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + {inputInfo.GetShape()}, + {outputInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDivision) @@ -1084,10 +1085,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeNormalization) VerifyNormalizationName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeEqual) @@ -1125,11 +1126,11 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeEqual) VerifyEqualName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, - {outputTensorInfo.GetShape()}, - {0, 1}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, + {outputTensorInfo.GetShape()}, + {0, 1}); } BOOST_AUTO_TEST_CASE(SerializeDeserializePad) @@ -1166,10 +1167,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializePad) VerifyPadName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeRsqrt) @@ -1202,10 +1203,10 @@ BOOST_AUTO_TEST_CASE(SerializeRsqrt) VerifyRsqrtName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {tensorInfo.GetShape()}, - {tensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {tensorInfo.GetShape()}, + {tensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeResizeBilinear) @@ -1244,10 +1245,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeResizeBilinear) VerifyResizeBilinearName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeSubtraction) @@ -1283,11 +1284,11 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeSubtraction) VerifySubtractionName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {info.GetShape(), info.GetShape()}, - {info.GetShape()}, - {0, 1}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {info.GetShape(), info.GetShape()}, + {info.GetShape()}, + {0, 1}); } BOOST_AUTO_TEST_CASE(SerializeDeserializeStridedSlice) @@ -1327,10 +1328,10 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeStridedSlice) VerifyStridedSliceName nameChecker; deserializedNetwork->Accept(nameChecker); - CheckDeserializedNetworkAgainstOriginal(*network, - *deserializedNetwork, - {inputTensorInfo.GetShape()}, - {outputTensorInfo.GetShape()}); + CheckDeserializedNetworkAgainstOriginal(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); } BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1