commit 02dce097d4fc643c790609e750dfa3c84abe1a34
author Teresa Charlin <teresa.charlinreyes@arm.com> Mon Nov 11 17:06:23 2019 +0000
committer TeresaARM <teresa.charlinreyes@arm.com> Tue Nov 12 10:35:40 2019 +0000
tree 487979e6b82310a9c998beeb7750ac44635303fa
parent f76a876d88b841d147c29e08ee83b314ca768027

IVGCVSW-4079 Modify the channel dimension accordingly with the weights permutation

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

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 88c1537..bcccd27 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -755,6 +755,12 @@
     }
 
     armnn::TensorInfo tensorInfo = GetTensorInfoForOperand(operand);
+    // Android datalayout might be different than armnn datalayout, e.g. the kernel for the depthwise convolution.
+    if (tensorInfo.HasPerAxisQuantization())
+    {
+        tensorInfo.SetQuantizationDim(dimensionMappings[tensorInfo.GetQuantizationDim().value()]);
+    }
+
     if (overrideTensorShape != nullptr)
     {
         tensorInfo.SetShape(*overrideTensorShape);