diff options
| author | jimfly01 <jim.flynn@arm.com> | 2018-10-25 17:05:05 +0100 |
|---|---|---|
| committer | Les Bell <les.bell@arm.com> | 2018-10-26 08:45:43 +0000 |
| commit | 0a088a61d016bf7af77e2d73d0988223a5f98ef1 (patch) | |
| tree | 0688976c774f44bd62ebbf04d0922b916ddab879 /src/backends/reference/test/RefLayerTests.cpp | |
| parent | 77cec7f2077956d2ade3f0995b30ba2c46ac606d (diff) | |
| download | armnn-0a088a61d016bf7af77e2d73d0988223a5f98ef1.tar.gz | |
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
Diffstat (limited to 'src/backends/reference/test/RefLayerTests.cpp')
| -rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 38ce94d257..45239be8c1 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -18,11 +18,11 @@ using FactoryType = armnn::RefWorkloadFactory; // UNIT tests // Convolution -ARMNN_AUTO_TEST_CASE(SimpleConvolution2d3x5, SimpleConvolution2d3x5Test, true) -ARMNN_AUTO_TEST_CASE(SimpleConvolution2d3x5Uint8, SimpleConvolution2d3x5Uint8Test, true) +ARMNN_AUTO_TEST_CASE(SimpleConvolution2d3x5, SimpleConvolution2d3x5Test, true, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(SimpleConvolution2d3x5Uint8, SimpleConvolution2d3x5Uint8Test, true, armnn::DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2d, SimpleConvolution2d3x5Test, false) -ARMNN_AUTO_TEST_CASE(UnbiasedConvolutionUint8, SimpleConvolution2d3x5Uint8Test, false) +ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2d, SimpleConvolution2d3x5Test, false, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(UnbiasedConvolutionUint8, SimpleConvolution2d3x5Uint8Test, false, armnn::DataLayout::NCHW) ARMNN_AUTO_TEST_CASE(SimpleConvolution1d, Convolution1dTest, true) ARMNN_AUTO_TEST_CASE(SimpleConvolution1dUint8, Convolution1dUint8Test, true) |