diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-11-05 18:00:21 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2019-11-06 12:10:02 +0000 |
| commit | 5edc8816118fcddb2681379db04c978041ce8b46 (patch) | |
| tree | 22e4382138e9963d0ed3dacefda4fb142877e1fc /src/backends/reference/RefLayerSupport.cpp | |
| parent | ec33a91ec1557b78b2d01975ec4c5eaf24aa058c (diff) | |
| download | armnn-5edc8816118fcddb2681379db04c978041ce8b46.tar.gz | |
IVGCVSW-3837 Add support for per-axis quantization to reference Convolution2d workload
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I0ac08ba4864d48e6f64c4ac645dad8ea850be112
Diffstat (limited to 'src/backends/reference/RefLayerSupport.cpp')
| -rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 716e8d9492..4252fecf35 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -433,11 +433,12 @@ bool RefLayerSupport::IsConvolution2dSupported(const TensorInfo& input, bool supported = true; // Define supported types. - std::array<DataType,4> supportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::QuantisedAsymm8, - DataType::QuantisedSymm16 + std::array<DataType,4> supportedTypes = + { + DataType::Float32, + DataType::Float16, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; supported &= CheckSupportRule(TypeAnyOf(input, supportedTypes), reasonIfUnsupported, @@ -446,22 +447,39 @@ bool RefLayerSupport::IsConvolution2dSupported(const TensorInfo& input, supported &= CheckSupportRule(TypeAnyOf(output, supportedTypes), reasonIfUnsupported, "Reference convolution2d: output is not a supported type."); - supported &= CheckSupportRule(TypeAnyOf(weights, supportedTypes), reasonIfUnsupported, - "Reference convolution2d: weights is not a supported type."); - supported &= CheckSupportRule(TypesAreEqual(input, output), reasonIfUnsupported, "Reference convolution2d: input and output types mismatched."); - supported &= CheckSupportRule(TypesAreEqual(input, weights), reasonIfUnsupported, - "Reference convolution2d: input and weights types mismatched."); + const DataType inputType = input.GetDataType(); + if (inputType == DataType::QuantisedAsymm8) + { + std::array<DataType, 2> supportedWeightTypes = + { + DataType::QuantisedAsymm8, + DataType::QuantizedSymm8PerAxis + }; + + supported &= CheckSupportRule(TypeAnyOf(weights, supportedWeightTypes), reasonIfUnsupported, + "Reference convolution2d: weights type not supported for quantized input."); + } + else + { + supported &= CheckSupportRule(TypeAnyOf(weights, supportedTypes), reasonIfUnsupported, + "Reference convolution2d: weights is not a supported type."); + + supported &= CheckSupportRule(TypesAreEqual(input, weights), reasonIfUnsupported, + "Reference convolution2d: input and weights types mismatched."); + } if (biases.has_value()) { - std::array<DataType,3> biasesSupportedTypes = { - DataType::Float32, - DataType::Float16, - DataType::Signed32 + std::array<DataType,3> biasesSupportedTypes = + { + DataType::Float32, + DataType::Float16, + DataType::Signed32 }; + supported &= CheckSupportRule(TypeAnyOf(biases.value(), biasesSupportedTypes), reasonIfUnsupported, "Reference convolution2d: biases is not a supported type."); } |