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/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | |
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/armnn/test/TestNameAndDescriptorLayerVisitor.hpp')
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index 0db956d36d..f1936d6847 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -385,33 +385,35 @@ public: }; }; -class TestResizeBilinearLayerVisitor : public TestLayerVisitor +class TestResizeLayerVisitor : public TestLayerVisitor { private: - ResizeBilinearDescriptor m_VisitorDescriptor; + ResizeDescriptor m_VisitorDescriptor; public: - explicit TestResizeBilinearLayerVisitor(const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) + explicit TestResizeLayerVisitor(const ResizeDescriptor& descriptor, const char* name = nullptr) : TestLayerVisitor(name) { - m_VisitorDescriptor.m_TargetWidth = resizeDesc.m_TargetWidth; - m_VisitorDescriptor.m_TargetHeight = resizeDesc.m_TargetHeight; - m_VisitorDescriptor.m_DataLayout = resizeDesc.m_DataLayout; + m_VisitorDescriptor.m_Method = descriptor.m_Method; + m_VisitorDescriptor.m_TargetWidth = descriptor.m_TargetWidth; + m_VisitorDescriptor.m_TargetHeight = descriptor.m_TargetHeight; + m_VisitorDescriptor.m_DataLayout = descriptor.m_DataLayout; }; - void CheckDescriptor(const ResizeBilinearDescriptor& resizeDesc) + void CheckDescriptor(const ResizeDescriptor& descriptor) { - BOOST_CHECK_EQUAL(resizeDesc.m_TargetWidth, m_VisitorDescriptor.m_TargetWidth); - BOOST_CHECK_EQUAL(resizeDesc.m_TargetHeight, m_VisitorDescriptor.m_TargetHeight); - BOOST_CHECK(resizeDesc.m_DataLayout == m_VisitorDescriptor.m_DataLayout); + BOOST_CHECK(descriptor.m_Method == m_VisitorDescriptor.m_Method); + BOOST_CHECK(descriptor.m_TargetWidth == m_VisitorDescriptor.m_TargetWidth); + BOOST_CHECK(descriptor.m_TargetHeight == m_VisitorDescriptor.m_TargetHeight); + BOOST_CHECK(descriptor.m_DataLayout == m_VisitorDescriptor.m_DataLayout); } - void VisitResizeBilinearLayer(const IConnectableLayer* layer, - const ResizeBilinearDescriptor& resizeDesc, - const char* name = nullptr) override + void VisitResizeLayer(const IConnectableLayer* layer, + const ResizeDescriptor& descriptor, + const char* name = nullptr) override { CheckLayerPointer(layer); - CheckDescriptor(resizeDesc); + CheckDescriptor(descriptor); CheckLayerName(name); }; }; |