diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-29 16:13:19 +0100 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-07-29 16:25:24 +0000 |
| commit | a5e2a458d6279560bbe24deafc12db286be2ca10 (patch) | |
| tree | e70005b30c03dc546fdfdfdaf12317c17031b6ba /1.0 | |
| parent | e5604e6dd73866710bac51f6c005a1eaa2be5326 (diff) | |
| download | android-nn-driver-a5e2a458d6279560bbe24deafc12db286be2ca10.tar.gz | |
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 <Aron.Virginas-Tar@arm.com>
Change-Id: I8387120b9abcc8458f7fac6df577cb6453051be3
Diffstat (limited to '1.0')
| -rw-r--r-- | 1.0/HalPolicy.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
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<hal_1_0::HalPolicy>(operation, model, data); + return ::ConvertConv2d<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertDepthwiseConv2d()"); - return ValidateDepthwiseConv2dParameters(operation) && - ::ConvertDepthwiseConv2d<hal_1_0::HalPolicy>(operation, model, data); + return ::ConvertDepthwiseConv2d<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data) |