1 files changed, 6 insertions, 0 deletions
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);