From b5fdf38f0c6596958fab2b84882f2792a31e585a Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Tue, 11 Jun 2019 16:35:25 +0100 Subject: IVGCVSW-3181 Add HAL 1.2 support to android-nn-driver * Updated Android.mk to build HAL 1.2 driver * Added 1.2 HalPolicy and ArmnnDriver * Added 1.2 ArmnnPreparedModel * Updated converters and utilities to accept new HAL 1.2 operands and operand types. Signed-off-by: Sadik Armagan Signed-off-by: Mike Kelly Change-Id: I62856deab24e106f72cccce09468db4971756fa6 --- 1.0/HalPolicy.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '1.0/HalPolicy.hpp') diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp index c09dc8a8..844b67c7 100644 --- a/1.0/HalPolicy.hpp +++ b/1.0/HalPolicy.hpp @@ -35,10 +35,6 @@ private: static bool ConvertConcatenation(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data); - - static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertFloor(const Operation& operation, const Model& model, ConversionData& data); @@ -74,6 +70,10 @@ private: static bool ConvertReshape(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertResizeBilinear(const Operation& operation, const Model& model, ConversionData& data); + + static bool ValidateConv2dParameters(const Operation& operation); + + static bool ValidateDepthwiseConv2dParameters(const Operation& operation); }; } // namespace hal_1_0 -- cgit v1.2.1