From 4a3c61091037e7e86e8b03bb060d8c1ab82731a9 Mon Sep 17 00:00:00 2001 From: josh minor Date: Mon, 6 Jan 2020 16:40:46 -0600 Subject: IVGCVSW-4259 Add frontend and reference workload for UnaryOperationLayer * Added new layer named ElementwiseUnary * Deprecated existing Abs/Rsqrt layer functions * Updated existing Abs/Rsqrt test infrastructure to use new layer * Added boilerplate for new Exp,Neg,Sqrt elemwise op layers * AbsQuantize test removed pending future commit * Serialization support added !android-nn-driver:2550 Change-Id: Ic595c645925e17b45db568187fd05646daf2e87f Signed-off-by: josh minor --- src/armnnSerializer/test/SerializerTests.cpp | 51 ---------------------------- 1 file changed, 51 deletions(-) (limited to 'src/armnnSerializer/test/SerializerTests.cpp') diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 2b13109725..47804fe328 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -268,32 +268,6 @@ static std::vector GenerateRandomData(size_t size) BOOST_AUTO_TEST_SUITE(SerializerTests) -BOOST_AUTO_TEST_CASE(SerializeAbs) -{ - DECLARE_LAYER_VERIFIER_CLASS(Abs) - - const std::string layerName("abs"); - const armnn::TensorInfo tensorInfo({1, 2, 3}, armnn::DataType::Float32); - - armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - - armnn::IConnectableLayer* const absLayer = network->AddAbsLayer(layerName.c_str()); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer->GetOutputSlot(0).Connect(absLayer->GetInputSlot(0)); - absLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - - inputLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); - absLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); - - armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); - BOOST_CHECK(deserializedNetwork); - - AbsLayerVerifier verifier(layerName, {tensorInfo}, {tensorInfo}); - deserializedNetwork->Accept(verifier); -} - BOOST_AUTO_TEST_CASE(SerializeAddition) { DECLARE_LAYER_VERIFIER_CLASS(Addition) @@ -2176,31 +2150,6 @@ BOOST_AUTO_TEST_CASE(EnsureResizeBilinearBackwardCompatibility) deserializedNetwork->Accept(verifier); } -BOOST_AUTO_TEST_CASE(SerializeRsqrt) -{ - DECLARE_LAYER_VERIFIER_CLASS(Rsqrt) - - const std::string layerName("rsqrt"); - const armnn::TensorInfo tensorInfo({ 3, 1, 2 }, armnn::DataType::Float32); - - armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - armnn::IConnectableLayer* const rsqrtLayer = network->AddRsqrtLayer(layerName.c_str()); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer->GetOutputSlot(0).Connect(rsqrtLayer->GetInputSlot(0)); - rsqrtLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - - inputLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); - rsqrtLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); - - armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); - BOOST_CHECK(deserializedNetwork); - - RsqrtLayerVerifier verifier(layerName, {tensorInfo}, {tensorInfo}); - deserializedNetwork->Accept(verifier); -} - BOOST_AUTO_TEST_CASE(SerializeSlice) { DECLARE_LAYER_VERIFIER_CLASS_WITH_DESCRIPTOR(Slice) -- cgit v1.2.1