diff options
| author | Ellen Norris-Thompson <ellen.norris-thompson@arm.com> | 2019-06-24 09:23:38 +0100 |
|---|---|---|
| committer | Ellen Norris-Thompson <ellen.norris-thompson@arm.com> | 2019-06-25 17:12:20 +0100 |
| commit | e0dbedfa9fad91c94ae610c48057fc7c24ceb0d4 (patch) | |
| tree | 438d24b8411f41d155a5eb4d3b088d87ca3e2766 /src/backends/backendsCommon/WorkloadData.cpp | |
| parent | e440329a22e03e1813ecaaa9dad34a7d9dfd446e (diff) | |
| download | armnn-e0dbedfa9fad91c94ae610c48057fc7c24ceb0d4.tar.gz | |
IVGCVSW-3250 Extend the Gather workload for QSymm16 support
* Add LayerTests and EndToEndTests for QSymm16
* Updated GatherQueueDescriptor::Validate function
* Reimplemented RefLayerSupport::IsGatherSupported
Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
Change-Id: I5b4df55d31b5ee3c5563d2df17b412a387c27595
Diffstat (limited to 'src/backends/backendsCommon/WorkloadData.cpp')
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 5ca492888f..cd40097e74 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1597,23 +1597,41 @@ void RsqrtQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const void GatherQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const { - ValidateNumInputs(workloadInfo, "GatherQueueDescriptor", 2); - ValidateNumOutputs(workloadInfo, "GatherQueueDescriptor", 1); + const std::string GatherQueueDescriptorStr = "GatherQueueDescriptor"; + + ValidateNumInputs(workloadInfo, GatherQueueDescriptorStr, 2); + ValidateNumOutputs(workloadInfo, GatherQueueDescriptorStr, 1); const TensorInfo& indices = workloadInfo.m_InputTensorInfos[1]; if (indices.GetDataType() != DataType::Signed32) { - throw InvalidArgumentException("GatherQueueDescriptor: Indices tensor type must be int32."); + throw InvalidArgumentException(GatherQueueDescriptorStr + ": Indices tensor type must be int32."); } + std::vector<DataType> supportedTypes = + { + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + ValidateDataTypes(workloadInfo.m_InputTensorInfos[0], + supportedTypes, + GatherQueueDescriptorStr); + + ValidateTensorDataTypesMatch(workloadInfo.m_InputTensorInfos[0], + workloadInfo.m_OutputTensorInfos[0], + GatherQueueDescriptorStr, "Input", "Output"); + const TensorInfo& params = workloadInfo.m_InputTensorInfos[0]; const TensorInfo& output = workloadInfo.m_OutputTensorInfos[0]; unsigned int paramsDim = params.GetNumDimensions(); unsigned int indicesDim = indices.GetNumDimensions(); unsigned int outputDim = paramsDim - 1 + indicesDim; - ValidateTensorNumDimensions(output, "GatherQueueDescriptor", outputDim, "output"); + ValidateTensorNumDimensions(output, GatherQueueDescriptorStr, outputDim, "output"); } void DetectionPostProcessQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const |