From a71c0633eff4791eb98362f72f198a2d1ec3d8f9 Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Mon, 12 Apr 2021 13:12:19 +0100 Subject: 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 Change-Id: I40410141303d950be7888f9e491133251b6f69d8 --- ConversionUtils.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ConversionUtils.hpp') diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 439d4a4a..473f6d78 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -90,7 +90,7 @@ public: // @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 @@ 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) { -- cgit v1.2.1