aboutsummaryrefslogtreecommitdiff
path: root/1.2/ArmnnDriver.hpp
diff options
context:
space:
mode:
authorSadik Armagan <sadik.armagan@arm.com>2021-02-12 17:16:42 +0000
committerKevin May <kevin.may@arm.com>2021-02-15 16:50:24 +0000
commit188675fd7e7239f56212d72f8ac10598de87e76a (patch)
tree611876f7c43f81c88b8dec19ae86afcb6d6a1a64 /1.2/ArmnnDriver.hpp
parentcd639c98c347c1addae8c65eb1f4d8e75b468fdb (diff)
downloadandroid-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.2/ArmnnDriver.hpp')
-rw-r--r--1.2/ArmnnDriver.hpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/1.2/ArmnnDriver.hpp b/1.2/ArmnnDriver.hpp
index 6dba2e9a..5227272f 100644
--- a/1.2/ArmnnDriver.hpp
+++ b/1.2/ArmnnDriver.hpp
@@ -93,9 +93,9 @@ public:
{
ALOGV("hal_1_2::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_2::ArmnnDriver::prepareModel_1_1: Invalid execution preference");
cb->notify(V1_0::ErrorStatus::INVALID_ARGUMENT, nullptr);
@@ -111,7 +111,7 @@ public:
&& m_Options.GetFp16Enabled());
}
- Return<DeviceStatus> getStatus() override
+ Return<V1_0::DeviceStatus> getStatus() override
{
ALOGV("hal_1_2::ArmnnDriver::getStatus()");
@@ -138,7 +138,7 @@ public:
const android::hardware::hidl_vec<android::hardware::hidl_handle>&,
const android::hardware::hidl_vec<android::hardware::hidl_handle>&,
const HidlToken&,
- const sp<V1_2::IPreparedModelCallback>& callback)
+ const android::sp<V1_2::IPreparedModelCallback>& callback)
{
ALOGV("hal_1_2::ArmnnDriver::prepareModelFromCache()");
callback->notify_1_2(V1_0::ErrorStatus::GENERAL_FAILURE, nullptr);
@@ -152,9 +152,9 @@ public:
{
ALOGV("hal_1_2::ArmnnDriver::prepareModel_1_2()");
- 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_2::ArmnnDriver::prepareModel_1_2: Invalid execution preference");
cb->notify(V1_0::ErrorStatus::INVALID_ARGUMENT, nullptr);