diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-11-11 12:54:47 +0000 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2019-11-12 09:16:17 +0000 |
commit | 94d3b931eddd1f75fccb2ec111e6499cb9ccdeeb (patch) | |
tree | 3ebe2e73be1d93cb98e3189ad57a78783f96de1f /src/backends/backendsCommon/WorkloadData.cpp | |
parent | 62cdb08ed5d006b8f130d73665211d35e71f6cf3 (diff) | |
download | armnn-94d3b931eddd1f75fccb2ec111e6499cb9ccdeeb.tar.gz |
IVGCVSW-3839 Add support of per-axis quantization to reference TransposeConvolution2d
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ie0dc1204eee925adfb1e59aba3f1137178302184
Diffstat (limited to 'src/backends/backendsCommon/WorkloadData.cpp')
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 201cc7d1ec..6222ba4800 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -2595,22 +2595,37 @@ void TransposeConvolution2dQueueDescriptor::Validate(const WorkloadInfo& workloa const TensorInfo& weightTensorInfo = m_Weight->GetTensorInfo(); ValidateTensorNumDimensions(weightTensorInfo, descriptorName, 4, "weight"); - ValidateTensorDataType(weightTensorInfo, inputTensorInfo.GetDataType(), descriptorName, "weight"); + ValidateWeightDataType(inputTensorInfo, weightTensorInfo, descriptorName); + + Optional<TensorInfo> optionalBiasTensorInfo; if (m_Parameters.m_BiasEnabled) { ValidatePointer(m_Bias, descriptorName, "bias"); - const TensorInfo& biasTensorInfo = m_Bias->GetTensorInfo(); - ValidateTensorNumDimensions(biasTensorInfo, descriptorName, 1, "bias"); - - ValidateTensorDataType(biasTensorInfo, - GetBiasDataType(inputTensorInfo.GetDataType()), - descriptorName, - "bias"); + optionalBiasTensorInfo = MakeOptional<TensorInfo>(m_Bias->GetTensorInfo()); + const TensorInfo& biasTensorInfo = optionalBiasTensorInfo.value(); + ValidateTensorDataType(biasTensorInfo, GetBiasDataType(inputTensorInfo.GetDataType()), descriptorName, "bias"); ValidateBiasTensorQuantization(biasTensorInfo, inputTensorInfo, weightTensorInfo, descriptorName); } + + ValidatePerAxisQuantization(inputTensorInfo, + outputTensorInfo, + weightTensorInfo, + optionalBiasTensorInfo, + descriptorName); + + std::vector<DataType> supportedTypes = + { + DataType::Float32, + DataType::Float16, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); + ValidateTensorDataTypesMatch(inputTensorInfo, outputTensorInfo, descriptorName, "input", "output"); } void QuantizedLstmQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const |