diff options
| author | James Conroy <james.conroy@arm.com> | 2019-09-17 14:22:06 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-03 11:50:51 +0000 |
| commit | d47a064ab4c38559c6be931cb1771feb6e026ea4 (patch) | |
| tree | 5f2cad86258378e23e8c9d43a9555dcc2a443b7f /src/backends/backendsCommon/WorkloadData.cpp | |
| parent | 61d6f7305b02e025ee10aa07e5499993a0e77cc1 (diff) | |
| download | armnn-d47a064ab4c38559c6be931cb1771feb6e026ea4.tar.gz | |
IVGCVSW-3696 Add NEON ArgMinMax workload and tests
* Added layer tests and fixed WorkloadData validate.
* Also enabled copy to/from NEON for Signed32.
Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: I5e961f88434e18d5a8ebff956d20a1c2cf1b50bb
Diffstat (limited to 'src/backends/backendsCommon/WorkloadData.cpp')
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 3fbdec7bf9..e49fd09be0 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -450,10 +450,10 @@ void ActivationQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -476,15 +476,15 @@ void ArgMinMaxQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const throw InvalidArgumentException(descriptorName + ": Output of ArgMinMax layer must be Int32."); } - std::vector<DataType> supportedTypes = - { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 - }; + std::vector<DataType> supportedInputTypes = + { + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; - ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); + ValidateDataTypes(inputTensorInfo, supportedInputTypes, descriptorName); } void SoftmaxQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const @@ -499,10 +499,10 @@ void SoftmaxQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -519,12 +519,12 @@ void SplitterQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const // Check the supported data types std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::Boolean, - DataType::Signed32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float32, + DataType::Float16, + DataType::Boolean, + DataType::Signed32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; const TensorInfo& inputTensorInfo = workloadInfo.m_InputTensorInfos[0]; @@ -655,12 +655,12 @@ void ConcatQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const // Check the supported data types std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::Boolean, - DataType::Signed32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float32, + DataType::Float16, + DataType::Boolean, + DataType::Signed32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; const TensorInfo& outputTensorInfo = workloadInfo.m_OutputTensorInfos[0]; @@ -742,12 +742,12 @@ void StackQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const // Check the supported data types std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::Boolean, - DataType::Signed32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float32, + DataType::Float16, + DataType::Boolean, + DataType::Signed32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(workloadInfo.m_InputTensorInfos[0], supportedTypes, descriptorName); @@ -805,10 +805,10 @@ void FullyConnectedQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) c // Check the supported data types std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float32, + DataType::Float16, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -1937,8 +1937,8 @@ void QuantizeQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16 + DataType::Float32, + DataType::Float16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -1962,10 +1962,10 @@ void BatchToSpaceNdQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) c std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float32, + DataType::Float16, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -2129,10 +2129,10 @@ void RsqrtQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -2157,10 +2157,10 @@ void GatherQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); @@ -2255,8 +2255,8 @@ void DequantizeQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const std::vector<DataType> supportedTypes = { - DataType::Float32, - DataType::Float16 + DataType::Float32, + DataType::Float16 }; ValidateDataTypes(outputTensorInfo, supportedTypes, descriptorName); @@ -2578,12 +2578,12 @@ void AbsQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const ValidateTensorShapesMatch(inputTensorInfo, outputTensorInfo, descriptorName, "input", "output"); std::vector<DataType> supportedTypes = - { - DataType::Float16, - DataType::Float32, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 - }; + { + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); ValidateTensorDataTypesMatch(inputTensorInfo, outputTensorInfo, descriptorName, "input", "output"); |