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 --- ArmnnDriver.hpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'ArmnnDriver.hpp') diff --git a/ArmnnDriver.hpp b/ArmnnDriver.hpp index d961f861..a6fd9b2c 100644 --- a/ArmnnDriver.hpp +++ b/ArmnnDriver.hpp @@ -9,7 +9,28 @@ #include -#ifdef ARMNN_ANDROID_NN_V1_2 // Using ::android::hardware::neuralnetworks::V1_2 +#ifdef ARMNN_ANDROID_NN_V1_3 // Using ::android::hardware::neuralnetworks::V1_3 + +#include "1.1/ArmnnDriver.hpp" +#include "1.2/ArmnnDriver.hpp" +#include "1.3/ArmnnDriver.hpp" + +namespace armnn_driver +{ + +class ArmnnDriver : public hal_1_3::ArmnnDriver +{ +public: + ArmnnDriver(DriverOptions options) + : hal_1_3::ArmnnDriver(std::move(options)) + { + ALOGV("ArmnnDriver::ArmnnDriver()"); + } + ~ArmnnDriver() {} +}; + +} // namespace armnn_driver +#elif ARMNN_ANDROID_NN_V1_2 // Using ::android::hardware::neuralnetworks::V1_2 #include "1.1/ArmnnDriver.hpp" #include "1.2/ArmnnDriver.hpp" -- cgit v1.2.1