commit 7af00da9068c71ae6f66eaa488048feea62e7aa9
author jimfly01 <jim.flynn@arm.com> Wed Oct 31 14:43:53 2018 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Thu Nov 01 12:13:37 2018 +0000
tree 1c0808b0a1beeb85a3103f8fe01d561b1011ecc5
parent 1b417c4970462d08e8e80d2f2462230ca5b91515

IVGCVSW-2074: Updated CompareDepthwiseConvolution2dTest for NHWC

Change-Id: Ib0568024b4f43ae17e6c75ac35d31cf103ce3482

src/backends/cl/test/ClLayerTests.cpp

diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 198bddd..f2a28ec 100755
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -314,8 +314,19 @@
 
 ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareConv2dWithReference, CompareConvolution2dTest)
 
-ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceFloat32, CompareDepthwiseConvolution2dTest<float>)
-ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceUint8, CompareDepthwiseConvolution2dTest<uint8_t>)
+ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceFloat32,
+                                 CompareDepthwiseConvolution2dTest<float>,
+                                 armnn::DataLayout::NCHW)
+ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceUint8,
+                                 CompareDepthwiseConvolution2dTest<uint8_t>,
+                                 armnn::DataLayout::NCHW)
+
+ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceFloat32Nhwc,
+                                 CompareDepthwiseConvolution2dTest<float>,
+                                 armnn::DataLayout::NHWC)
+ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceUint8Nhwc,
+                                 CompareDepthwiseConvolution2dTest<uint8_t>,
+                                 armnn::DataLayout::NHWC)
 
 ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareNormalizationWithinWithReference, CompareNormalizationTest,
                                  armnn::NormalizationAlgorithmChannel::Within,