commit c4aacb3d3a4c7566203751e2f2cc7204d3104f2f
author Matthew Bentham <Matthew.Bentham@arm.com> Wed Nov 27 16:55:05 2019 +0000
committer Matthew Bentham <Matthew.Bentham@arm.com> Wed Nov 27 16:55:09 2019 +0000
tree 5e572e8584129ca7841e23afceffac15ef434736
parent e9eeb205d4282ca49a311aee3d2180bba2772a55

MLCE-115 Remove redundant support checking for Permute

This should all be done in the LayerSupport mechanism in Arm NN now.

Change-Id: Icbbb1be2efad2ababf8bdd5543f3e5a06958dccd
Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index b24cbde..12a8826 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -3360,16 +3360,8 @@
 
     std::vector<uint32_t> outputDims(perm.begin(), perm.begin() + rank);
 
-    auto permutationVector = armnn::PermutationVector(outputDims.data(), outputDims.size());
-    if (!permutationVector.IsEqual(NHWCToArmNN)
-        && !permutationVector.IsEqual(ArmNNToNHWC)
-        && !permutationVector.IsEqual({ 3, 2, 0, 1 }))
-    {
-        return Fail("%s: Only [0, 3, 1, 2], [0, 2, 3, 1] and [3, 2, 0, 1] permutations are supported.", __func__);
-    }
-
     armnn::PermuteDescriptor permuteDesc;
-    permuteDesc.m_DimMappings = permutationVector;
+    permuteDesc.m_DimMappings = armnn::PermutationVector(outputDims.data(), outputDims.size());
 
     const HalOperand* output = GetOutputOperand<HalPolicy>(operation, 0, model);
     if (!output)