From 2400b6dd383f40febc78cf71475addd51ae9245f Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Tue, 9 Oct 2018 18:19:20 +0100 Subject: 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 --- src/backends/cl/test/ClCreateWorkloadTests.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/backends/cl') diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index 659ba82e8a..6ec89aa579 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -578,17 +578,23 @@ static void ClL2NormalizationWorkloadTest(DataLayout dataLayout) { Graph graph; ClWorkloadFactory factory; - - auto workload = CreateL2NormalizationWorkloadTest - (factory, graph, dataLayout); + auto workload = + CreateL2NormalizationWorkloadTest(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(queueDescriptor.m_Inputs[0]); auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); - BOOST_TEST(CompareIClTensorHandleShape(inputHandle, { 5, 20, 50, 67 })); - BOOST_TEST(CompareIClTensorHandleShape(outputHandle, { 5, 20, 50, 67 })); + std::initializer_list inputShape = (dataLayout == DataLayout::NCHW) + ? std::initializer_list({ 5, 20, 50, 67 }) + : std::initializer_list({ 5, 50, 67, 20 }); + std::initializer_list outputShape = (dataLayout == DataLayout::NCHW) + ? std::initializer_list({ 5, 20, 50, 67 }) + : std::initializer_list({ 5, 50, 67, 20 }); + + BOOST_TEST(CompareIClTensorHandleShape(inputHandle, inputShape)); + BOOST_TEST(CompareIClTensorHandleShape(outputHandle, outputShape)); } BOOST_AUTO_TEST_CASE(CreateL2NormalizationFloatNchwWorkload) -- cgit v1.2.1