diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-09-04 16:28:10 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:40 +0100 |
| commit | 79250ab173e7dfa2c6057854c0d4b8dafe377fb0 (patch) | |
| tree | 7b52e6cf32c30b27440a68efc3cb5733b5ccedfe /ArmnnDriverImpl.cpp | |
| parent | e48bdff741568236d3c0747ad3d18a8eba5b36dd (diff) | |
| download | android-nn-driver-79250ab173e7dfa2c6057854c0d4b8dafe377fb0.tar.gz | |
IVGCVSW-1806 Restored the fp16 flag left behind during the previous
refactoring
* Split getCapabilities and getCapabilities_1_1 as it was before
* Setting relaxedFloat32toFloat16Performance when using HAL 1.1 as
required by one of the VTS test
Change-Id: Iff883b8cbd0511596e9848fa40e91e4fa58d4260
Diffstat (limited to 'ArmnnDriverImpl.cpp')
| -rw-r--r-- | ArmnnDriverImpl.cpp | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp index 0298f3b7..ce66e6d5 100644 --- a/ArmnnDriverImpl.cpp +++ b/ArmnnDriverImpl.cpp @@ -26,11 +26,6 @@ using namespace android::hardware; 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"; - void NotifyCallbackAndCheck(const sp<IPreparedModelCallback>& callback, ErrorStatus errorStatus, const sp<IPreparedModel>& preparedModelPtr) @@ -59,43 +54,6 @@ namespace armnn_driver { template <typename HalVersion> -Return<void> ArmnnDriverImpl<HalVersion>::getCapabilities( - const armnn::IRuntimePtr& runtime, - HalGetCapabilities_cb cb) -{ - ALOGV("ArmnnDriverImpl::getCapabilities()"); - - HalCapabilities capabilities; - if (runtime) - { - capabilities.float32Performance.execTime = - ParseSystemProperty(g_Float32PerformanceExecTimeName, .1f); - - capabilities.float32Performance.powerUsage = - ParseSystemProperty(g_Float32PerformancePowerUsageName, .1f); - - capabilities.quantized8Performance.execTime = - ParseSystemProperty(g_Quantized8PerformanceExecTimeName, .1f); - - capabilities.quantized8Performance.powerUsage = - ParseSystemProperty(g_Quantized8PerformancePowerUsageName, .1f); - - cb(ErrorStatus::NONE, capabilities); - } - else - { - capabilities.float32Performance.execTime = 0; - capabilities.float32Performance.powerUsage = 0; - capabilities.quantized8Performance.execTime = 0; - capabilities.quantized8Performance.powerUsage = 0; - - cb(ErrorStatus::DEVICE_UNAVAILABLE, capabilities); - } - - return Void(); -} - -template <typename HalVersion> Return<void> ArmnnDriverImpl<HalVersion>::getSupportedOperations( const armnn::IRuntimePtr& runtime, const DriverOptions& options, @@ -281,7 +239,7 @@ Return<DeviceStatus> ArmnnDriverImpl<HalVersion>::getStatus() // Class template specializations template class ArmnnDriverImpl<HalVersion_1_0>; -#ifdef ARMNN_ANDROID_NN_V1_1 +#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1. template class ArmnnDriverImpl<HalVersion_1_1>; #endif |