From a68d8530d3dcfc7c54b9c2bfa00b407f45145253 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Fri, 29 Nov 2019 13:59:18 +0000 Subject: IVGCVSW-3860 Per-channel QSymm8 support of DepthwiseConvolution2d in Cl *Add the call to ReorderWeightChannelsForAcl for QuantizedSymm8PerAxis weights Signed-off-by: Teresa Charlin Change-Id: I0d2e4c8328753ad15858130945b4fbb193943dfa --- src/backends/backendsCommon/WorkloadUtils.cpp | 3 +++ src/backends/cl/test/ClLayerTests.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/backends/backendsCommon/WorkloadUtils.cpp b/src/backends/backendsCommon/WorkloadUtils.cpp index 385d970dac..73946c6db7 100644 --- a/src/backends/backendsCommon/WorkloadUtils.cpp +++ b/src/backends/backendsCommon/WorkloadUtils.cpp @@ -172,6 +172,9 @@ armnn::ConstTensor ConvertWeightTensorFromArmnnToAcl(const ConstCpuTensorHandle* case DataType::QuantisedAsymm8: weightPermuted = ReorderWeightChannelsForAcl(weightPermuted, dataLayout, permuteBuffer); break; + case DataType::QuantizedSymm8PerAxis: + weightPermuted = ReorderWeightChannelsForAcl(weightPermuted, dataLayout, permuteBuffer); + break; default: break; } diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 16fe07c194..c821dd94c3 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -183,6 +183,11 @@ ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dAsymmetricNhwc, ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul64, DepthwiseConvolution2dDepthMul64Test); +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dPerAxisQuantTestNchw, DepthwiseConvolution2dPerAxisQuantTest, + DataLayout::NCHW); +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dPerAxisQuantTestNhwc, DepthwiseConvolution2dPerAxisQuantTest, + DataLayout::NHWC); + // Splitter ARMNN_AUTO_TEST_CASE(SimpleSplitterFloat32, SplitterFloat32Test) ARMNN_AUTO_TEST_CASE(SimpleSplitterUint8, SplitterUint8Test) -- cgit v1.2.1