diff options
| author | James Conroy <james.conroy@arm.com> | 2018-10-19 10:41:35 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
| commit | 69482271d3e02af950d2d0f1947ae6c3eeed537b (patch) | |
| tree | d0ef56a1ba2d314eb821ce2b6bb8e09773f41a17 /src/armnn/test/CreateWorkload.hpp | |
| parent | dd6aceaa884815e68ed69fca71de81babd3204da (diff) | |
| download | armnn-69482271d3e02af950d2d0f1947ae6c3eeed537b.tar.gz | |
IVGCVSW-2024: Support NHWC for Pooling2D CpuRef
* Adds implementation to plumb DataLayout parameter
for Pooling2D on CpuRef.
* Adds unit tests to execute Pooling2D on CpuRef
using NHWC data layout.
* Refactors original tests to use DataLayoutIndexed
and removes duplicate code.
Change-Id: Ife7e0861a886cf58a2042e5be20e5b27af4528c9
Diffstat (limited to 'src/armnn/test/CreateWorkload.hpp')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 01c5e9f689..aac0a4ae6d 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -609,6 +609,7 @@ std::unique_ptr<Pooling2dWorkload> CreatePooling2dWorkloadTest(armnn::IWorkloadF BOOST_TEST(queueDescriptor.m_Parameters.m_PadRight == 2); BOOST_TEST(queueDescriptor.m_Parameters.m_PadTop == 1); BOOST_TEST(queueDescriptor.m_Parameters.m_PadBottom == 1); + BOOST_TEST((queueDescriptor.m_Parameters.m_DataLayout == dataLayout)); BOOST_TEST(queueDescriptor.m_Inputs.size() == 1); BOOST_TEST(queueDescriptor.m_Outputs.size() == 1); @@ -856,7 +857,8 @@ std::unique_ptr<ResizeBilinearWorkload> CreateResizeBilinearWorkloadTest(armnn:: inputShape = { 2, 4, 4, 3 }; outputShape = { 2, 2, 2, 3 }; break; - default: // NCHW + case DataLayout::NCHW: + default: inputShape = { 2, 3, 4, 4 }; outputShape = { 2, 3, 2, 2 }; } |