diff options
| author | James Conroy <james.conroy@arm.com> | 2020-01-22 16:40:57 +0000 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2020-01-24 14:02:34 +0000 |
| commit | 1bde8e31935ac375fd0aaa0dfddb0f7851c16087 (patch) | |
| tree | 71352ab311dfac773551694013477ec8befe0a86 /ConversionUtils.hpp | |
| parent | f2e175c99612189d640cb3dbb05a5dbb3c92b22f (diff) | |
| download | android-nn-driver-1bde8e31935ac375fd0aaa0dfddb0f7851c16087.tar.gz | |
IVGCVSW-4260 Fix Transpose CpuRef VTS failures
* Adds missing conversion for permutation vector
from ANN/TF/Numpy format to ArmNN format.
* Corrects legacy tests based on incorrect
permutation vectors.
Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: I767142378055e484d22f3ffba34580c528370cfe
Diffstat (limited to 'ConversionUtils.hpp')
| -rw-r--r-- | ConversionUtils.hpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index f8622dd6..72a668f7 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -3370,8 +3370,20 @@ bool ConvertTranspose(const HalOperation& operation, const HalModel& model, Conv std::vector<uint32_t> outputDims(perm.begin(), perm.begin() + rank); + // Permutation vectors (outputDims) are given in ANN/Tf format, we must convert them to ArmNN format + // For ANN/Tf/ACL: output[i] = input[ perm[i] ] + // For ArmNN: output[ perm[i] ] = input[i] + // e.g. 3,0,1,2 -> 1,2,3,0 + std::vector<unsigned int> armnnPermuteShape(rank); + std::vector<unsigned int>::iterator it; + for (unsigned int i = 0u; i < rank; ++i) + { + it = std::find(outputDims.begin(), outputDims.end(), i); + armnnPermuteShape[i] = static_cast<unsigned int>(std::distance(outputDims.begin(), it)); + } + armnn::PermuteDescriptor permuteDesc; - permuteDesc.m_DimMappings = armnn::PermutationVector(outputDims.data(), outputDims.size()); + permuteDesc.m_DimMappings = armnn::PermutationVector(armnnPermuteShape.data(), armnnPermuteShape.size()); const HalOperand* output = GetOutputOperand<HalPolicy>(operation, 0, model); if (!output) |