From 79250ab173e7dfa2c6057854c0d4b8dafe377fb0 Mon Sep 17 00:00:00 2001
From: Matteo Martincigh <matteo.martincigh@arm.com>
Date: Tue, 4 Sep 2018 16:28:10 +0100
Subject: 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
---
 1.1/ArmnnDriver.hpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to '1.1/ArmnnDriver.hpp')

diff --git a/1.1/ArmnnDriver.hpp b/1.1/ArmnnDriver.hpp
index f55aad4b..079d9cd1 100644
--- a/1.1/ArmnnDriver.hpp
+++ b/1.1/ArmnnDriver.hpp
@@ -8,7 +8,9 @@
 #include <HalInterfaces.h>
 
 #include "ArmnnDevice.hpp"
+#include "ArmnnDriverImpl.hpp"
 #include "../ArmnnDriverImpl.hpp"
+#include "../1.0/ArmnnDriverImpl.hpp"
 
 #include <log/log.h>
 
@@ -33,8 +35,8 @@ public:
     {
         ALOGV("V1_1::ArmnnDriver::getCapabilities()");
 
-        return armnn_driver::ArmnnDriverImpl<HalVersion_1_0>::getCapabilities(m_Runtime,
-                                                                              cb);
+        return V1_0::ArmnnDriverImpl::getCapabilities(m_Runtime,
+                                                      cb);
     }
 
     Return<void> getSupportedOperations(
@@ -67,8 +69,8 @@ public:
     {
         ALOGV("V1_1::ArmnnDriver::getCapabilities_1_1()");
 
-        return armnn_driver::ArmnnDriverImpl<HalVersion_1_1>::getCapabilities(m_Runtime,
-                                                                              cb);
+        return V1_1::ArmnnDriverImpl::getCapabilities_1_1(m_Runtime,
+                                                          cb);
     }
 
     Return<void> getSupportedOperations_1_1(
@@ -103,7 +105,9 @@ public:
                                                                            m_ClTunedParameters,
                                                                            m_Options,
                                                                            model,
-                                                                           cb);
+                                                                           cb,
+                                                                           model.relaxComputationFloat32toFloat16
+                                                                           && m_Options.GetFp16Enabled());
     }
 
     Return<DeviceStatus> getStatus() override
-- 
cgit v1.2.1