diff options
author | Matthew Jackson <matthew.jackson@arm.com> | 2019-08-15 15:14:18 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-08-16 11:43:00 +0000 |
commit | dba634fd6a66a9e033a1925b0b26c80b270bbf21 (patch) | |
tree | c89740a40b9c109582635b7c40b17a16dd6c0649 /src/backends/backendsCommon/WorkloadData.cpp | |
parent | 11f99b4e72a92051329b23af7ded759463380086 (diff) | |
download | armnn-dba634fd6a66a9e033a1925b0b26c80b270bbf21.tar.gz |
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 <matthew.jackson@arm.com>
Change-Id: I5bcd64942d0d04efcc6c5acb240ad4b88e010743
Diffstat (limited to 'src/backends/backendsCommon/WorkloadData.cpp')
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 4b0b84a73d..109aeb963a 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -669,6 +669,11 @@ void StackQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const } } + if (inputShape.GetNumDimensions() > 4) + { + throw InvalidArgumentException(descriptorName + ": Input tensor may have up to 4 dimensions."); + } + // m_Axis is 0-based and may take values from 0 to the number of input dimensions (inclusive), // since the output tensor has an additional dimension. if (m_Parameters.m_Axis > inputShape.GetNumDimensions()) @@ -703,6 +708,11 @@ void StackQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const } } + if (outputShape.GetNumDimensions() > 5) + { + throw InvalidArgumentException(descriptorName + ": Output tensor may have up to 5 dimensions."); + } + // Check the supported data types std::vector<DataType> supportedTypes = { |