diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-10-09 18:19:20 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:53 +0100 |
| commit | 2400b6dd383f40febc78cf71475addd51ae9245f (patch) | |
| tree | b5bf24014c236894dbaa6007cb44d2b4465d05d5 /src/backends/neon/test/NeonCreateWorkloadTests.cpp | |
| parent | 9df2d951616e3d76b67a9852d5324de96633f0f9 (diff) | |
| download | armnn-2400b6dd383f40febc78cf71475addd51ae9245f.tar.gz | |
IVGCVSW-1967 Fix L2Norm NHWC unit test
* Applying the proper tensor shape during the tests depending on
the specific data layout used
Change-Id: I9c6c1e077236e84cecc1e10d7b2d0bd901df3ebd
Diffstat (limited to 'src/backends/neon/test/NeonCreateWorkloadTests.cpp')
| -rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index d1a5b2a5f2..05281cded2 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -493,17 +493,23 @@ BOOST_AUTO_TEST_CASE(CreateMemCopyWorkloadsNeon) template <typename L2NormalizationWorkloadType, typename armnn::DataType DataType> static void NeonCreateL2NormalizationWorkloadTest(DataLayout dataLayout) { - Graph graph; - NeonWorkloadFactory factory; - auto workload = CreateL2NormalizationWorkloadTest<L2NormalizationWorkloadType, - DataType>(factory, graph, dataLayout); + Graph graph; + NeonWorkloadFactory factory; + auto workload = + CreateL2NormalizationWorkloadTest<L2NormalizationWorkloadType, DataType>(factory, graph, dataLayout); // Checks that inputs/outputs are as we expect them (see definition of CreateNormalizationWorkloadTest). L2NormalizationQueueDescriptor queueDescriptor = workload->GetData(); auto inputHandle = boost::polymorphic_downcast<INeonTensorHandle*>(queueDescriptor.m_Inputs[0]); auto outputHandle = boost::polymorphic_downcast<INeonTensorHandle*>(queueDescriptor.m_Outputs[0]); - BOOST_TEST(TestNeonTensorHandleInfo(inputHandle, TensorInfo({ 5, 20, 50, 67 }, DataType))); - BOOST_TEST(TestNeonTensorHandleInfo(outputHandle, TensorInfo({ 5, 20, 50, 67 }, DataType))); + + TensorShape inputShape = (dataLayout == DataLayout::NCHW) ? + TensorShape{ 5, 20, 50, 67 } : TensorShape{ 5, 50, 67, 20 }; + TensorShape outputShape = (dataLayout == DataLayout::NCHW) ? + TensorShape{ 5, 20, 50, 67 } : TensorShape{ 5, 50, 67, 20 }; + + BOOST_TEST(TestNeonTensorHandleInfo(inputHandle, TensorInfo(inputShape, DataType))); + BOOST_TEST(TestNeonTensorHandleInfo(outputHandle, TensorInfo(outputShape, DataType))); } #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC |