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 /ArmnnDriverImpl.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 'ArmnnDriverImpl.hpp')
| -rw-r--r-- | ArmnnDriverImpl.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ArmnnDriverImpl.hpp b/ArmnnDriverImpl.hpp index 49f0975e..c5b17781 100644 --- a/ArmnnDriverImpl.hpp +++ b/ArmnnDriverImpl.hpp @@ -9,6 +9,10 @@ #include <HalInterfaces.h> +#ifdef ARMNN_ANDROID_R +using namespace android::nn::hal; +#endif + namespace V1_0 = ::android::hardware::neuralnetworks::V1_0; namespace V1_1 = ::android::hardware::neuralnetworks::V1_1; @@ -32,7 +36,7 @@ public: const HalModel& model, HalGetSupportedOperations_cb); - static Return<ErrorStatus> prepareModel( + static Return<V1_0::ErrorStatus> prepareModel( const armnn::IRuntimePtr& runtime, const armnn::IGpuAccTunedParametersPtr& clTunedParameters, const DriverOptions& options, |