diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2021-02-12 17:16:42 +0000 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2021-02-15 16:50:24 +0000 |
| commit | 188675fd7e7239f56212d72f8ac10598de87e76a (patch) | |
| tree | 611876f7c43f81c88b8dec19ae86afcb6d6a1a64 /1.1 | |
| parent | cd639c98c347c1addae8c65eb1f4d8e75b468fdb (diff) | |
| download | android-nn-driver-188675fd7e7239f56212d72f8ac10598de87e76a.tar.gz | |
IVGCVSW-5665 Basic NN Driver support for next OS Version
Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I1e1db52322092c6b1b7ac6183c3adc90aabcec24
Diffstat (limited to '1.1')
| -rw-r--r-- | 1.1/ArmnnDriver.hpp | 8 | ||||
| -rw-r--r-- | 1.1/ArmnnDriverImpl.hpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/1.1/ArmnnDriver.hpp b/1.1/ArmnnDriver.hpp index a6849abc..521b9185 100644 --- a/1.1/ArmnnDriver.hpp +++ b/1.1/ArmnnDriver.hpp @@ -88,9 +88,9 @@ public: { ALOGV("hal_1_1::ArmnnDriver::prepareModel_1_1()"); - if (!(preference == ExecutionPreference::LOW_POWER || - preference == ExecutionPreference::FAST_SINGLE_ANSWER || - preference == ExecutionPreference::SUSTAINED_SPEED)) + if (!(preference == V1_1::ExecutionPreference::LOW_POWER || + preference == V1_1::ExecutionPreference::FAST_SINGLE_ANSWER || + preference == V1_1::ExecutionPreference::SUSTAINED_SPEED)) { ALOGV("hal_1_1::ArmnnDriver::prepareModel_1_1: Invalid execution preference"); cb->notify(V1_0::ErrorStatus::INVALID_ARGUMENT, nullptr); @@ -106,7 +106,7 @@ public: && m_Options.GetFp16Enabled()); } - Return<DeviceStatus> getStatus() override + Return<V1_0::DeviceStatus> getStatus() override { ALOGV("hal_1_1::ArmnnDriver::getStatus()"); diff --git a/1.1/ArmnnDriverImpl.hpp b/1.1/ArmnnDriverImpl.hpp index f49dee0e..c90e04bd 100644 --- a/1.1/ArmnnDriverImpl.hpp +++ b/1.1/ArmnnDriverImpl.hpp @@ -15,6 +15,10 @@ using namespace android::nn::hal; #endif +#ifdef ARMNN_ANDROID_S +using namespace android::hardware; +#endif + namespace V1_0 = ::android::hardware::neuralnetworks::V1_0; namespace V1_1 = ::android::hardware::neuralnetworks::V1_1; |