From a5e2a458d6279560bbe24deafc12db286be2ca10 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Mon, 29 Jul 2019 16:13:19 +0100 Subject: IVGCVSW-3593 Remove HAL1.2-specific code from HAL1.0 ConvertConv2d() and ConvertDepthwiseConv2d() * Removed code for reading data layout flag (only available in HAL1.2) * Removed code for reading dilation parameters (only available in HAL1.2) * Added more restrictive input size checks (== instead of >=, as none of the inputs are optional in HAL1.0/1.1) * Removed superfluous input size validation from 1.0/HalPolicy.cpp Signed-off-by: Aron Virginas-Tar Change-Id: I8387120b9abcc8458f7fac6df577cb6453051be3 --- 1.0/HalPolicy.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to '1.0') diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index b6074b42..a3c0e63b 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -71,24 +71,6 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, } } -bool HalPolicy::ValidateConv2dParameters(const Operation &operation) -{ - if (operation.inputs.size() != 10 && operation.inputs.size() != 7) - { - return Fail("%s: Unsupported number of operation inputs", __func__); - } - return true; -} - -bool HalPolicy::ValidateDepthwiseConv2dParameters(const Operation &operation) -{ - if (operation.inputs.size() != 11 && operation.inputs.size() != 8) - { - return Fail("%s: Unsupported number of operation inputs", __func__); - } - return true; -} - bool HalPolicy::ConvertAdd(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertAdd()"); @@ -391,14 +373,13 @@ bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& mo bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertConv2d()"); - return ValidateConv2dParameters(operation) && ::ConvertConv2d(operation, model, data); + return ::ConvertConv2d(operation, model, data); } bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertDepthwiseConv2d()"); - return ValidateDepthwiseConv2dParameters(operation) && - ::ConvertDepthwiseConv2d(operation, model, data); + return ::ConvertDepthwiseConv2d(operation, model, data); } bool HalPolicy::ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data) -- cgit v1.2.1