From dba634fd6a66a9e033a1925b0b26c80b270bbf21 Mon Sep 17 00:00:00 2001 From: Matthew Jackson Date: Thu, 15 Aug 2019 15:14:18 +0100 Subject: IVGCVSW-3639 Add 5d tensor support * Increased MaxNumOfTensorDimensions and fixed issues related to its use * Fixed issues caused by assuming 5d tensors are invalid * Updated ArmComputeTensorUtils for 5d tensors * Added 5d tensor unit tests for add, mul, stack and reshape (needed by IVGCVSW-3527) Signed-off-by: Matthew Jackson Change-Id: I5bcd64942d0d04efcc6c5acb240ad4b88e010743 --- include/armnn/Types.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp index 12897e2af7..6d8ea6f877 100644 --- a/include/armnn/Types.hpp +++ b/include/armnn/Types.hpp @@ -13,7 +13,7 @@ namespace armnn { -constexpr unsigned int MaxNumOfTensorDimensions = 4U; +constexpr unsigned int MaxNumOfTensorDimensions = 5U; /// @enum Status enumeration /// @var Status::Successful @@ -167,7 +167,12 @@ public: bool IsEqual(const PermutationVector& other) const { - return std::equal(begin(), end(), other.begin(), other.end()); + if (m_NumDimMappings != other.m_NumDimMappings) return false; + for (unsigned int i = 0; i < m_NumDimMappings; ++i) + { + if (m_DimMappings[i] != other.m_DimMappings[i]) return false; + } + return true; } bool IsInverse(const PermutationVector& other) const -- cgit v1.2.1