From 3dc4303c94cf3f5976e495233f663ff56089e53a Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Thu, 18 Oct 2018 10:55:19 +0100 Subject: IVGCVSW-2040 Add unit tests for the newly implemented NHWC support in ref BatchNormalization * Added create workload unit tests for the NHWC data layout Change-Id: I03d66c88dc9b0340302b85012cb0152f0ec6fa72 --- .../reference/test/RefCreateWorkloadTests.cpp | 52 +++++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) (limited to 'src/backends/reference/test') diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index 1ec7749168..d258b81932 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -143,16 +143,56 @@ BOOST_AUTO_TEST_CASE(CreateDivisionUint8Workload) armnn::DataType::QuantisedAsymm8>(); } -BOOST_AUTO_TEST_CASE(CreateBatchNormalizationWorkload) +template +static void RefCreateBatchNormalizationWorkloadTest(DataLayout dataLayout) { - Graph graph; + Graph graph; RefWorkloadFactory factory; - auto workload = CreateBatchNormalizationWorkloadTest - (factory, graph); + auto workload = + CreateBatchNormalizationWorkloadTest(factory, graph, dataLayout); + + TensorShape inputShape; + TensorShape outputShape; + + switch (dataLayout) + { + case DataLayout::NHWC: + inputShape = { 2, 1, 1, 3 }; + outputShape = { 2, 1, 1, 3 }; + break; + case DataLayout::NCHW: + default: + inputShape = { 2, 3, 1, 1 }; + outputShape = { 2, 3, 1, 1 }; + break; + } // Checks that outputs and inputs are as we expect them (see definition of CreateBatchNormalizationWorkloadTest). - CheckInputOutput( - std::move(workload), TensorInfo({2, 3, 1, 1}, DataType::Float32), TensorInfo({2, 3, 1, 1}, DataType::Float32)); + CheckInputOutput(std::move(workload), TensorInfo(inputShape, DataType), TensorInfo(outputShape, DataType)); +} + +BOOST_AUTO_TEST_CASE(CreateBatchNormalizationFloat32Workload) +{ + RefCreateBatchNormalizationWorkloadTest + (DataLayout::NCHW); +} + +BOOST_AUTO_TEST_CASE(CreateBatchNormalizationFloat32WorkloadNhwc) +{ + RefCreateBatchNormalizationWorkloadTest + (DataLayout::NHWC); +} + +BOOST_AUTO_TEST_CASE(CreateBatchNormalizationUint8Workload) +{ + RefCreateBatchNormalizationWorkloadTest + (DataLayout::NCHW); +} + +BOOST_AUTO_TEST_CASE(CreateBatchNormalizationUint8WorkloadNhwc) +{ + RefCreateBatchNormalizationWorkloadTest + (DataLayout::NHWC); } BOOST_AUTO_TEST_CASE(CreateConvertFp16ToFp32Float32Workload) -- cgit v1.2.1