commit a68d8530d3dcfc7c54b9c2bfa00b407f45145253
author Teresa Charlin <teresa.charlinreyes@arm.com> Fri Nov 29 13:59:18 2019 +0000
committer Teresa Charlin <teresa.charlinreyes@arm.com> Fri Nov 29 13:59:18 2019 +0000
tree 224f2b65857dc6f725b4e4c491097af604eeca1f
parent 2ba48d251d0fe4dca214497ac33283106ca0973b

IVGCVSW-3860 Per-channel QSymm8 support of DepthwiseConvolution2d in Cl
    *Add the call to ReorderWeightChannelsForAcl for QuantizedSymm8PerAxis weights

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I0d2e4c8328753ad15858130945b4fbb193943dfa

src/backends/backendsCommon/WorkloadUtils.cpp

diff --git a/src/backends/backendsCommon/WorkloadUtils.cpp b/src/backends/backendsCommon/WorkloadUtils.cpp
index 385d970..73946c6 100644
--- a/src/backends/backendsCommon/WorkloadUtils.cpp
+++ b/src/backends/backendsCommon/WorkloadUtils.cpp
@@ -172,6 +172,9 @@
             case DataType::QuantisedAsymm8:
                 weightPermuted = ReorderWeightChannelsForAcl<uint8_t>(weightPermuted, dataLayout, permuteBuffer);
                 break;
+            case DataType::QuantizedSymm8PerAxis:
+                weightPermuted = ReorderWeightChannelsForAcl<int8_t>(weightPermuted, dataLayout, permuteBuffer);
+                break;
             default:
                 break;
         }

src/backends/cl/test/ClLayerTests.cpp

diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 16fe07c..c821dd9 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -183,6 +183,11 @@
 
 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)