From ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 26 Feb 2020 17:00:39 +0000 Subject: 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 Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853 Signed-off-by: Kevin May --- 1.0/ArmnnDriverImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1.0/ArmnnDriverImpl.cpp') diff --git a/1.0/ArmnnDriverImpl.cpp b/1.0/ArmnnDriverImpl.cpp index a35bb0e9..57f828c0 100644 --- a/1.0/ArmnnDriverImpl.cpp +++ b/1.0/ArmnnDriverImpl.cpp @@ -43,7 +43,7 @@ Return ArmnnDriverImpl::getCapabilities(const armnn::IRuntimePtr& runtime, capabilities.quantized8Performance.powerUsage = ParseSystemProperty(g_Quantized8PerformancePowerUsageName, .1f); - cb(ErrorStatus::NONE, capabilities); + cb(V1_0::ErrorStatus::NONE, capabilities); } else { @@ -52,7 +52,7 @@ Return ArmnnDriverImpl::getCapabilities(const armnn::IRuntimePtr& runtime, capabilities.quantized8Performance.execTime = 0; capabilities.quantized8Performance.powerUsage = 0; - cb(ErrorStatus::DEVICE_UNAVAILABLE, capabilities); + cb(V1_0::ErrorStatus::DEVICE_UNAVAILABLE, capabilities); } return Void(); -- cgit v1.2.1