diff options
| author | Kevin May <kevin.may@arm.com> | 2020-02-26 17:00:39 +0000 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2020-03-03 08:40:23 +0000 |
| commit | ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c (patch) | |
| tree | ac4e2d3194012e08241afa9c6691d52608c1a869 /1.1/ArmnnDriver.hpp | |
| parent | 4a9565870037150ad6ee060a3cd232d867711b60 (diff) | |
| download | android-nn-driver-ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c.tar.gz | |
IVGCVSW-4473 Android R pre Hal 1_3 build changes
* Update ErrorStatus to V1_0::ErrorStatus
* Update Request to V1_0::Request
* Update OperandType to V1_2::OperandType
* Add namespace android::nn::hal in ArmnnDriverImpl for R only
* Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName
* Add namespace V1_0 or V1_1 where necessary
* Update Android.mk with R macro and android.hardware.neuralnetworks@1.3
* Remove androidnn.go
* include IAllocator in DriverTestHelpers
* Remove unused LOCAL_CFLAGS
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to '1.1/ArmnnDriver.hpp')
| -rw-r--r-- | 1.1/ArmnnDriver.hpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/1.1/ArmnnDriver.hpp b/1.1/ArmnnDriver.hpp index baae6350..a6849abc 100644 --- a/1.1/ArmnnDriver.hpp +++ b/1.1/ArmnnDriver.hpp @@ -33,6 +33,7 @@ public: ~ArmnnDriver() {} public: + Return<void> getCapabilities(V1_0::IDevice::getCapabilities_cb cb) override { ALOGV("hal_1_1::ArmnnDriver::getCapabilities()"); @@ -51,8 +52,8 @@ public: cb); } - Return<ErrorStatus> prepareModel(const V1_0::Model& model, - const android::sp<V1_0::IPreparedModelCallback>& cb) override + Return<V1_0::ErrorStatus> prepareModel(const V1_0::Model& model, + const android::sp<V1_0::IPreparedModelCallback>& cb) override { ALOGV("hal_1_1::ArmnnDriver::prepareModel()"); @@ -81,9 +82,9 @@ public: cb); } - Return<ErrorStatus> prepareModel_1_1(const V1_1::Model& model, - V1_1::ExecutionPreference preference, - const android::sp<V1_0::IPreparedModelCallback>& cb) override + Return<V1_0::ErrorStatus> prepareModel_1_1(const V1_1::Model& model, + V1_1::ExecutionPreference preference, + const android::sp<V1_0::IPreparedModelCallback>& cb) override { ALOGV("hal_1_1::ArmnnDriver::prepareModel_1_1()"); @@ -92,8 +93,8 @@ public: preference == ExecutionPreference::SUSTAINED_SPEED)) { ALOGV("hal_1_1::ArmnnDriver::prepareModel_1_1: Invalid execution preference"); - cb->notify(ErrorStatus::INVALID_ARGUMENT, nullptr); - return ErrorStatus::INVALID_ARGUMENT; + cb->notify(V1_0::ErrorStatus::INVALID_ARGUMENT, nullptr); + return V1_0::ErrorStatus::INVALID_ARGUMENT; } return armnn_driver::ArmnnDriverImpl<hal_1_1::HalPolicy>::prepareModel(m_Runtime, |