diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-01 19:01:44 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-07-02 13:50:24 +0000 |
commit | 169d2f120cc9021f170fede22a448fd6b66fc979 (patch) | |
tree | a55b62678a85f63c074148d33fae744b22c834a8 /src/armnnSerializer/test | |
parent | 38e05bd2836b1b65b440330a9c283038ba4192c3 (diff) | |
download | armnn-169d2f120cc9021f170fede22a448fd6b66fc979.tar.gz |
IVGCVSW-3382 Deprecate ResizeBilinear and use Resize with Bilinear method
!android-nn-driver:1451
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ieedbce1f6e95891137a250fdd07e2f7e4e1f4828
Diffstat (limited to 'src/armnnSerializer/test')
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 67 |
1 files changed, 5 insertions, 62 deletions
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index e51f76bd33..285d21ce46 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -2048,10 +2048,10 @@ BOOST_AUTO_TEST_CASE(SerializeResize) private: void VerifyDescriptor(const armnn::ResizeDescriptor& descriptor) { - BOOST_CHECK(descriptor.m_DataLayout == m_Descriptor.m_DataLayout); - BOOST_CHECK(descriptor.m_TargetWidth == m_Descriptor.m_TargetWidth); + BOOST_CHECK(descriptor.m_DataLayout == m_Descriptor.m_DataLayout); + BOOST_CHECK(descriptor.m_TargetWidth == m_Descriptor.m_TargetWidth); BOOST_CHECK(descriptor.m_TargetHeight == m_Descriptor.m_TargetHeight); - BOOST_CHECK(descriptor.m_Method == m_Descriptor.m_Method); + BOOST_CHECK(descriptor.m_Method == m_Descriptor.m_Method); } armnn::ResizeDescriptor m_Descriptor; @@ -2062,9 +2062,9 @@ BOOST_AUTO_TEST_CASE(SerializeResize) const armnn::TensorInfo outputInfo = armnn::TensorInfo({1, 3, 2, 4}, armnn::DataType::Float32); armnn::ResizeDescriptor desc; - desc.m_TargetWidth = 4; + desc.m_TargetWidth = 4; desc.m_TargetHeight = 2; - desc.m_Method = armnn::ResizeMethod::NearestNeighbor; + desc.m_Method = armnn::ResizeMethod::NearestNeighbor; armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); @@ -2084,63 +2084,6 @@ BOOST_AUTO_TEST_CASE(SerializeResize) deserializedNetwork->Accept(verifier); } -BOOST_AUTO_TEST_CASE(SerializeResizeBilinear) -{ - class ResizeBilinearLayerVerifier : public LayerVerifierBase - { - public: - ResizeBilinearLayerVerifier(const std::string& layerName, - const std::vector<armnn::TensorInfo>& inputInfos, - const std::vector<armnn::TensorInfo>& outputInfos, - const armnn::ResizeBilinearDescriptor& descriptor) - : LayerVerifierBase(layerName, inputInfos, outputInfos) - , m_Descriptor(descriptor) {} - - void VisitResizeBilinearLayer(const armnn::IConnectableLayer* layer, - const armnn::ResizeBilinearDescriptor& descriptor, - const char* name) override - { - VerifyNameAndConnections(layer, name); - VerifyDescriptor(descriptor); - } - - private: - void VerifyDescriptor(const armnn::ResizeBilinearDescriptor& descriptor) - { - BOOST_TEST(GetDataLayoutName(descriptor.m_DataLayout) == GetDataLayoutName(m_Descriptor.m_DataLayout)); - BOOST_TEST(descriptor.m_TargetWidth == m_Descriptor.m_TargetWidth); - BOOST_TEST(descriptor.m_TargetHeight == m_Descriptor.m_TargetHeight); - } - - armnn::ResizeBilinearDescriptor m_Descriptor; - }; - - const std::string layerName("resizeBilinear"); - const armnn::TensorInfo inputInfo = armnn::TensorInfo({1, 3, 5, 5}, armnn::DataType::Float32); - const armnn::TensorInfo outputInfo = armnn::TensorInfo({1, 3, 2, 4}, armnn::DataType::Float32); - - armnn::ResizeBilinearDescriptor desc; - desc.m_TargetWidth = 4; - desc.m_TargetHeight = 2; - - armnn::INetworkPtr network = armnn::INetwork::Create(); - armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - armnn::IConnectableLayer* const resizeLayer = network->AddResizeBilinearLayer(desc, layerName.c_str()); - armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); - - inputLayer->GetOutputSlot(0).Connect(resizeLayer->GetInputSlot(0)); - resizeLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); - - inputLayer->GetOutputSlot(0).SetTensorInfo(inputInfo); - resizeLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); - - armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); - BOOST_CHECK(deserializedNetwork); - - ResizeBilinearLayerVerifier verifier(layerName, {inputInfo}, {outputInfo}, desc); - deserializedNetwork->Accept(verifier); -} - BOOST_AUTO_TEST_CASE(SerializeRsqrt) { class RsqrtLayerVerifier : public LayerVerifierBase |