commit ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c
author Kevin May <kevin.may@arm.com> Wed Feb 26 17:00:39 2020 +0000
committer David Monahan <david.monahan@arm.com> Tue Mar 03 08:40:23 2020 +0000
tree ac4e2d3194012e08241afa9c6691d52608c1a869
parent 4a9565870037150ad6ee060a3cd232d867711b60

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>

1.1/ArmnnDriverImpl.cpp

diff --git a/1.1/ArmnnDriverImpl.cpp b/1.1/ArmnnDriverImpl.cpp
index d8939a0..1d1aaa7 100644
--- a/1.1/ArmnnDriverImpl.cpp
+++ b/1.1/ArmnnDriverImpl.cpp
@@ -11,11 +11,12 @@
 namespace
 {
 
-const char *g_Float32PerformanceExecTimeName             = "ArmNN.float32Performance.execTime";
-const char *g_Float32PerformancePowerUsageName           = "ArmNN.float32Performance.powerUsage";
-const char *g_Quantized8PerformanceExecTimeName          = "ArmNN.quantized8Performance.execTime";
-const char *g_Quantized8PerformancePowerUsageName        = "ArmNN.quantized8Performance.powerUsage";
-const char *g_RelaxedFloat32toFloat16PerformanceExecTime = "ArmNN.relaxedFloat32toFloat16Performance.execTime";
+const char *g_Float32PerformanceExecTimeName                   = "ArmNN.float32Performance.execTime";
+const char *g_Float32PerformancePowerUsageName                 = "ArmNN.float32Performance.powerUsage";
+const char *g_Quantized8PerformanceExecTimeName                = "ArmNN.quantized8Performance.execTime";
+const char *g_Quantized8PerformancePowerUsageName              = "ArmNN.quantized8Performance.powerUsage";
+const char *g_RelaxedFloat32toFloat16PerformanceExecTime       = "ArmNN.relaxedFloat32toFloat16Performance.execTime";
+const char *g_RelaxedFloat32toFloat16PerformancePowerUsageName = "ArmNN.relaxedFloat32toFloat16Performance.powerUsage";
 
 } // anonymous namespace
 
@@ -47,17 +48,21 @@
         capabilities.relaxedFloat32toFloat16Performance.execTime =
             ParseSystemProperty(g_RelaxedFloat32toFloat16PerformanceExecTime, .1f);
 
-        cb(ErrorStatus::NONE, capabilities);
+        capabilities.relaxedFloat32toFloat16Performance.powerUsage =
+            ParseSystemProperty(g_RelaxedFloat32toFloat16PerformancePowerUsageName, .1f);
+
+        cb(V1_0::ErrorStatus::NONE, capabilities);
     }
     else
     {
-        capabilities.float32Performance.execTime                 = 0;
-        capabilities.float32Performance.powerUsage               = 0;
-        capabilities.quantized8Performance.execTime              = 0;
-        capabilities.quantized8Performance.powerUsage            = 0;
-        capabilities.relaxedFloat32toFloat16Performance.execTime = 0;
+        capabilities.float32Performance.execTime                   = 0;
+        capabilities.float32Performance.powerUsage                 = 0;
+        capabilities.quantized8Performance.execTime                = 0;
+        capabilities.quantized8Performance.powerUsage              = 0;
+        capabilities.relaxedFloat32toFloat16Performance.execTime   = 0;
+        capabilities.relaxedFloat32toFloat16Performance.powerUsage = 0;
 
-        cb(ErrorStatus::DEVICE_UNAVAILABLE, capabilities);
+        cb(V1_0::ErrorStatus::DEVICE_UNAVAILABLE, capabilities);
     }
 
     return Void();