From 42477c1d3e7ddf74863e84ab79dbe6f42e4a0ba3 Mon Sep 17 00:00:00 2001 From: Kevin May Date: Thu, 26 Mar 2020 13:34:14 +0000 Subject: IVGCVSW-4447 Add Hal 1_3 Support * Add new 1.3 files HalPolicy, ArmnnDriver, ArmnnDriverImpl * Add new .rc file for 1.3 service * Add ArmnnPreparedModel_1_3 and implement new functions * Update Android.mk with 1.3 driver and service * Refactor ifdef to include ARMNN_ANDROID_NN_V1_3 * Create Utils getMainModel for new 1.3 Model Main Subgraph * Use android Utils to convertToV1_X in ArmnnPrepapredModel_1_3 * Refactor HAL 1.2 convert functions into ConversionUtils_1_2.hpp * Replace ArmnnBurstExecutorWithCache with call to ExecutionBurstServer Signed-off-by: Kevin May Change-Id: I514069e9e1b16bcd1c4abfb5d563d25ac22d02e3 --- ArmnnDriverImpl.hpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ArmnnDriverImpl.hpp') diff --git a/ArmnnDriverImpl.hpp b/ArmnnDriverImpl.hpp index dfaafb34..cdff9054 100644 --- a/ArmnnDriverImpl.hpp +++ b/ArmnnDriverImpl.hpp @@ -20,6 +20,11 @@ namespace V1_1 = ::android::hardware::neuralnetworks::V1_1; namespace V1_2 = ::android::hardware::neuralnetworks::V1_2; #endif +#ifdef ARMNN_ANDROID_NN_V1_3 // Using ::android::hardware::neuralnetworks::V1_3 +namespace V1_2 = ::android::hardware::neuralnetworks::V1_2; +namespace V1_3 = ::android::hardware::neuralnetworks::V1_3; +#endif + namespace armnn_driver { @@ -36,6 +41,7 @@ class ArmnnDriverImpl public: using HalModel = typename HalPolicy::Model; using HalGetSupportedOperations_cb = typename HalPolicy::getSupportedOperations_cb; + using HalErrorStatus = typename HalPolicy::ErrorStatus; static Return getSupportedOperations( const armnn::IRuntimePtr& runtime, -- cgit v1.2.1