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.cpp

diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp
index 9cc6e28..4cea727 100644
--- a/ConversionUtils.cpp
+++ b/ConversionUtils.cpp
@@ -56,7 +56,7 @@
     : m_Optional(optional)
 {}
 
-ConstTensorPin::ConstTensorPin(const armnn::TensorInfo& tensorInfo,
+ConstTensorPin::ConstTensorPin(armnn::TensorInfo& tensorInfo,
                                const void* valueStart,
                                uint32_t numBytes,
                                const armnn::PermutationVector& mappings)
@@ -73,7 +73,7 @@
         m_SwizzledTensorData.resize(tensorInfo.GetNumBytes());
         SwizzleAndroidNn4dTensorToArmNn(tensorInfo, valueStart, m_SwizzledTensorData.data(), mappings);
 
-        m_ConstTensor = armnn::ConstTensor(armnnUtils::Permuted(tensorInfo, mappings), m_SwizzledTensorData.data());
+        m_ConstTensor = armnn::ConstTensor(tensorInfo, m_SwizzledTensorData.data());
     }
     else
     {