commit 79250ab173e7dfa2c6057854c0d4b8dafe377fb0
author Matteo Martincigh <matteo.martincigh@arm.com> Tue Sep 04 16:28:10 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:40 2018 +0100
tree 7b52e6cf32c30b27440a68efc3cb5733b5ccedfe
parent e48bdff741568236d3c0747ad3d18a8eba5b36dd

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

ArmnnDriverImpl.hpp

diff --git a/ArmnnDriverImpl.hpp b/ArmnnDriverImpl.hpp
index c060097..87da581 100644
--- a/ArmnnDriverImpl.hpp
+++ b/ArmnnDriverImpl.hpp
@@ -17,17 +17,13 @@
 struct HalVersion_1_0
 {
     using Model = ::android::hardware::neuralnetworks::V1_0::Model;
-    using Capabilities = ::android::hardware::neuralnetworks::V1_0::Capabilities;
-    using getCapabilities_cb = ::android::hardware::neuralnetworks::V1_0::IDevice::getCapabilities_cb;
     using getSupportedOperations_cb = ::android::hardware::neuralnetworks::V1_0::IDevice::getSupportedOperations_cb;
 };
 
-#if defined(ARMNN_ANDROID_NN_V1_1)
+#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1.
 struct HalVersion_1_1
 {
     using Model = ::android::hardware::neuralnetworks::V1_1::Model;
-    using Capabilities = ::android::hardware::neuralnetworks::V1_1::Capabilities;
-    using getCapabilities_cb = ::android::hardware::neuralnetworks::V1_1::IDevice::getCapabilities_1_1_cb;
     using getSupportedOperations_cb = ::android::hardware::neuralnetworks::V1_1::IDevice::getSupportedOperations_1_1_cb;
 };
 #endif
@@ -37,13 +33,8 @@
 {
 public:
     using HalModel = typename HalVersion::Model;
-    using HalCapabilities = typename HalVersion::Capabilities;
-    using HalGetCapabilities_cb = typename HalVersion::getCapabilities_cb;
     using HalGetSupportedOperations_cb = typename HalVersion::getSupportedOperations_cb;
 
-    static Return<void> getCapabilities(
-            const armnn::IRuntimePtr& runtime,
-            HalGetCapabilities_cb cb);
     static Return<void> getSupportedOperations(
             const armnn::IRuntimePtr& runtime,
             const DriverOptions& options,