diff options
author | Kevin May <kevin.may@arm.com> | 2019-08-21 16:53:50 +0100 |
---|---|---|
committer | mike.kelly <mike.kelly@arm.com> | 2019-08-26 16:22:55 +0000 |
commit | 665a964aab8858447c3e1261f2c38d59b150da82 (patch) | |
tree | 1a752fe37dec8e639ccea9bdab0993f20e1acd25 /src/backends/neon/test/NeonLayerTests.cpp | |
parent | dcaa6109c95034aa3b945acd50a2882e40f13370 (diff) | |
download | armnn-665a964aab8858447c3e1261f2c38d59b150da82.tar.gz |
IVGCVSW-3575 Fix DepthwiseConvolution VTS Test Failures
Failing VTS tests were "NeuralnetworksHidlTest.depthwise_conv2d_*"
In depthwise convolution there was a difference in weight tensor channel
order between the reference and ACL implementations. This specifically related
to NCHW. This commit:
* Adds ReorderWeightChannelsForAcl to WorkloadUtils which will correct the weight tensor channel order.
* Add unit tests to detect this problem.
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: Icaeac08e14b3d5da9e222ad2f118db55ebb15d09
Diffstat (limited to 'src/backends/neon/test/NeonLayerTests.cpp')
-rw-r--r-- | src/backends/neon/test/NeonLayerTests.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 27f1dd24da..954f281144 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -104,6 +104,14 @@ ARMNN_AUTO_TEST_CASE(Convolution2d2x2Dilation2x2Padding2x2Stride3x3NhwcUint8, <DataType::QuantisedAsymm8, DataType::Signed32>, false, DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dMult4, + DepthwiseConvolution2dMult4Test<armnn::DataType::Float32, armnn::DataType::Float32>, + false, + armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dMult2, + DepthwiseConvolution2dMult2Test<armnn::DataType::Float32, armnn::DataType::Float32>, + false, + armnn::DataLayout::NCHW) // Depthwise Convolution ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1, |