From 0a088a61d016bf7af77e2d73d0988223a5f98ef1 Mon Sep 17 00:00:00 2001 From: jimfly01 Date: Thu, 25 Oct 2018 17:05:05 +0100 Subject: IVGCVSW-2074: SimpleConvolution2dTestImpl updated for NHWC * Added a defaulted DataLayoutIndexed argument to the SimpleConvolution2dTestImpl * Permute test data tensors just before use if necessary * Add DataLayout to descriptor * Added a DataLayoutIndexed argument to SimpleConvolution2d3x5TestCommon * Added NHWC versions of the SimpleConvolution2d3x5Test for Neon and CL Change-Id: I10e3ece42a50108baeabe4d8b0f0ac3e6d532261 --- src/backends/neon/test/NeonLayerTests.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/backends/neon/test') diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 568a2367c6..ffd0d292df 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -26,9 +26,12 @@ using FactoryType = armnn::NeonWorkloadFactory; // Convolution ARMNN_AUTO_TEST_CASE(SimpleConvolution1d, Convolution1dTest, true) -ARMNN_AUTO_TEST_CASE(SimpleConvolution2d, SimpleConvolution2d3x5Test, true) +ARMNN_AUTO_TEST_CASE(SimpleConvolution2d, SimpleConvolution2d3x5Test, true, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(SimpleConvolution2dNhwc, SimpleConvolution2d3x5Test, true, armnn::DataLayout::NHWC) ARMNN_AUTO_TEST_CASE(SimpleConvolution2dSquare, SimpleConvolution2d3x3Test, true) -ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2d, SimpleConvolution2d3x5Test, false) +ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2d, SimpleConvolution2d3x5Test, false, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2dNhwc, SimpleConvolution2d3x5Test, false, armnn::DataLayout::NHWC) + ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2dSquare, SimpleConvolution2d3x3Test, false) ARMNN_AUTO_TEST_CASE(SimpleConvolution2dAsymmetricPadding, Convolution2dAsymmetricPaddingTest) -- cgit v1.2.1