commit a71c0633eff4791eb98362f72f198a2d1ec3d8f9
author Jan Eilers <jan.eilers@arm.com> Mon Apr 12 13:12:19 2021 +0100
committer Jan Eilers <jan.eilers@arm.com> Mon Apr 19 09:31:02 2021 +0100
tree 9976eb70e4c5f3a93b4db0b06e02f8d03057a235
parent 32fe97ec627a70b6453375fcfc6665c0e1ad2024

IVGCVSW-5826 Remove cross-wireing in depthwise

 * The permutation of the tensor info is now completely handled in
   the armnnUtils::Permuted function. That includes quantization
   informations too

!armnn:5411

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: I40410141303d950be7888f9e491133251b6f69d8

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 439d4a4..473f6d7 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -90,7 +90,7 @@
     // @param valueStart Start address of tensor data. Belongs to one of the memory pools associated with
     // the model being converted.
     // @param numBytes Number of bytes for the tensor data.
-    ConstTensorPin(const armnn::TensorInfo& tensorInfo, const void* valueStart, uint32_t numBytes,
+    ConstTensorPin(armnn::TensorInfo& tensorInfo, const void* valueStart, uint32_t numBytes,
                    const armnn::PermutationVector& mappings);
 
     ConstTensorPin(const ConstTensorPin& other) = delete;
@@ -843,11 +843,6 @@
     }
 
     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)
     {