diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
| commit | b5fdf38f0c6596958fab2b84882f2792a31e585a (patch) | |
| tree | d6b578b51c1923c759653d8a04efa90923ad4dd8 /ArmnnDriver.hpp | |
| parent | b92f8901fc34749337ea7a9ad7a2717fc9490de5 (diff) | |
| download | android-nn-driver-b5fdf38f0c6596958fab2b84882f2792a31e585a.tar.gz | |
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 <sadik.armagan@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I62856deab24e106f72cccce09468db4971756fa6
Diffstat (limited to 'ArmnnDriver.hpp')
| -rw-r--r-- | ArmnnDriver.hpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/ArmnnDriver.hpp b/ArmnnDriver.hpp index 7c6e5d0b..d961f861 100644 --- a/ArmnnDriver.hpp +++ b/ArmnnDriver.hpp @@ -9,7 +9,27 @@ #include <log/log.h> -#ifdef ARMNN_ANDROID_NN_V1_1 // Using ::android::hardware::neuralnetworks::V1_1 +#ifdef ARMNN_ANDROID_NN_V1_2 // Using ::android::hardware::neuralnetworks::V1_2 + +#include "1.1/ArmnnDriver.hpp" +#include "1.2/ArmnnDriver.hpp" + +namespace armnn_driver +{ + +class ArmnnDriver : public hal_1_2::ArmnnDriver +{ +public: + ArmnnDriver(DriverOptions options) + : hal_1_2::ArmnnDriver(std::move(options)) + { + ALOGV("ArmnnDriver::ArmnnDriver()"); + } + ~ArmnnDriver() {} +}; + +} // namespace armnn_driver +#elif ARMNN_ANDROID_NN_V1_1 // Using ::android::hardware::neuralnetworks::V1_1 #include "1.1/ArmnnDriver.hpp" |