diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-07-25 09:26:06 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-07-25 09:26:06 +0100 |
| commit | 3c673949b4ed3ab3129859b18439ed8fe87a6ad1 (patch) | |
| tree | 0c5a47c6dbf9d03e7cdfdf10c72b8d3696bea59b /1.2 | |
| parent | 29404fb3b16b301d630f492a2b89b9eb39b67e63 (diff) | |
| download | android-nn-driver-3c673949b4ed3ab3129859b18439ed8fe87a6ad1.tar.gz | |
IVGCVSW-3521 CpuAcc V1.2 pad Failures
* Fixed Pad and PadV2 failures and skips.
* Templated ConvertPad to enable float16 tests to run.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I50ded84fe44ea5d5949e877f383f32adff88680d
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/HalPolicy.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index 906d6bcf..307475a8 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -68,7 +68,6 @@ bool HandledByV1_1(V1_2::OperationType operationType) case V1_1::OperationType::BATCH_TO_SPACE_ND: case V1_1::OperationType::DIV: case V1_1::OperationType::MEAN: - case V1_1::OperationType::PAD: case V1_1::OperationType::SPACE_TO_BATCH_ND: case V1_1::OperationType::SQUEEZE: case V1_1::OperationType::STRIDED_SLICE: @@ -146,6 +145,8 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, return ConvertMaximum(operation, model, data); case V1_2::OperationType::MINIMUM: return ConvertMinimum(operation, model, data); + case V1_2::OperationType::PAD: + return ConvertPad<hal_1_2::HalPolicy>(operation, model, data); case V1_2::OperationType::PAD_V2: return ConvertPadV2(operation, model, data); case V1_2::OperationType::PRELU: @@ -675,15 +676,12 @@ bool HalPolicy::ConvertPadV2(const Operation& operation, const Model& model, Con } else if (operandType0 == OperandType::TENSOR_QUANT8_ASYMM && operandType2 == OperandType::INT32) { - int32_t quantizedPadValue = 0; - if (!GetInputInt32<hal_1_2::HalPolicy>(operation, 2, quantizedPadValue, model, data)) + int32_t intPadValue = 0; + if (!GetInputInt32<hal_1_2::HalPolicy>(operation, 2, intPadValue, model, data)) { return Fail("%s: Could not read input 2 (INT32)", __func__); } - - descriptor.m_PadValue = armnn::Dequantize(quantizedPadValue, - inputInfo.GetQuantizationScale(), - inputInfo.GetQuantizationOffset()); + descriptor.m_PadValue = intPadValue; } else { |