diff options
| author | arovir01 <Aron.Virginas-Tar@arm.com> | 2018-09-05 17:03:25 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:40 +0100 |
| commit | b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f (patch) | |
| tree | 84159d2eb142f12081c494483c07012e8ebee8cb /ArmnnDriver.hpp | |
| parent | 93e48980920ddcc8c6390fa6cbfdfc9740786617 (diff) | |
| download | android-nn-driver-b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f.tar.gz | |
IVGCVSW-1806: Refactor Android-NN-Driver ModelToINetworkConverter
* Moved conversion logic into new V1_0 and V1_1 HalPolicy classes
* Extracted common helper functions into ConversionUtils class
Change-Id: I1ab50edc266dd528c0cb22a5cd1aa65e103674d9
Diffstat (limited to 'ArmnnDriver.hpp')
| -rw-r--r-- | ArmnnDriver.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ArmnnDriver.hpp b/ArmnnDriver.hpp index 2bf47eb3..fd5cfad0 100644 --- a/ArmnnDriver.hpp +++ b/ArmnnDriver.hpp @@ -9,18 +9,18 @@ #include <log/log.h> -#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1. +#if defined(ARMNN_ANDROID_NN_V1_1) #include "1.1/ArmnnDriver.hpp" namespace armnn_driver { -class ArmnnDriver : public V1_1::ArmnnDriver +class ArmnnDriver : public hal_1_1::ArmnnDriver { public: ArmnnDriver(DriverOptions options) - : V1_1::ArmnnDriver(std::move(options)) + : hal_1_1::ArmnnDriver(std::move(options)) { ALOGV("ArmnnDriver::ArmnnDriver()"); } @@ -36,11 +36,11 @@ public: namespace armnn_driver { -class ArmnnDriver : public V1_0::ArmnnDriver +class ArmnnDriver : public hal_1_0::ArmnnDriver { public: ArmnnDriver(DriverOptions options) - : V1_0::ArmnnDriver(std::move(options)) + : hal_1_0::ArmnnDriver(std::move(options)) { ALOGV("ArmnnDriver::ArmnnDriver()"); } |