diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2018-12-20 17:03:06 +0000 |
|---|---|---|
| committer | Les Bell <les.bell@arm.com> | 2019-01-02 12:52:16 +0000 |
| commit | 7332ed8ceb38274805641e74537bf4f4fb1188ee (patch) | |
| tree | 1e9d0e06c2cecb89e90fda0569ec91a18240f76a /src/backends/backendsCommon/test/Conv2dTestImpl.hpp | |
| parent | fd899966cb881f5bb1ccce7903253a32d360419d (diff) | |
| download | armnn-7332ed8ceb38274805641e74537bf4f4fb1188ee.tar.gz | |
IVGCVSW-2308 Add Conv2d tests where stride > 1
Change-Id: Iae6a3bfad06cb669ef0abea465d03163bb8316f5
Diffstat (limited to 'src/backends/backendsCommon/test/Conv2dTestImpl.hpp')
| -rwxr-xr-x | src/backends/backendsCommon/test/Conv2dTestImpl.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp index 0ba8d7552c..37fa0f63d6 100755 --- a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp @@ -84,7 +84,9 @@ LayerTestResult<T, 4> SimpleConvolution2dTestImpl( uint32_t padLeft = 0, uint32_t padTop = 0, uint32_t padRight = 0, - uint32_t padBottom = 0) + uint32_t padBottom = 0, + uint32_t strideX = 1, + uint32_t strideY = 1) { unsigned int inputHeight = boost::numeric_cast<unsigned int>(originalInput.shape()[2]); unsigned int inputWidth = boost::numeric_cast<unsigned int>(originalInput.shape()[3]); @@ -181,10 +183,6 @@ LayerTestResult<T, 4> SimpleConvolution2dTestImpl( } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputData); - // Todo: nontrivial padding and strides. - uint32_t strideX = 1; - uint32_t strideY = 1; - std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); @@ -240,7 +238,7 @@ LayerTestResult<T, 4> SimpleConvolution2dNhwcTestImpl( const boost::multi_array<T, 4>& kernel, const boost::multi_array<B, 1>& bias, const boost::multi_array<T, 4>& outputExpected, - armnn::DataLayout dataLayout, + const armnn::DataLayout dataLayout, float qScale, int32_t qOffset, uint32_t padLeft = 1, |