From 02dce097d4fc643c790609e750dfa3c84abe1a34 Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Mon, 11 Nov 2019 17:06:23 +0000
Subject: 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 88c15375..bcccd272 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -755,6 +755,12 @@ ConstTensorPin ConvertOperandToConstTensorPin(const HalOperand& operand,
     }
 
     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);
-- 
cgit v1.2.1