From b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f Mon Sep 17 00:00:00 2001
From: arovir01 <Aron.Virginas-Tar@arm.com>
Date: Wed, 5 Sep 2018 17:03:25 +0100
Subject: IVGCVSW-1806: Refactor Android-NN-Driver ModelToINetworkConverter

* Moved conversion logic into new V1_0 and V1_1 HalPolicy classes
* Extracted common helper functions into ConversionUtils class

Change-Id: I1ab50edc266dd528c0cb22a5cd1aa65e103674d9
---
 RequestThread.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'RequestThread.cpp')

diff --git a/RequestThread.cpp b/RequestThread.cpp
index aedd607e..0b06b51e 100644
--- a/RequestThread.cpp
+++ b/RequestThread.cpp
@@ -8,10 +8,10 @@
 #include "RequestThread.hpp"
 #include "ArmnnPreparedModel.hpp"
 
-#include <log/log.h>
-
 #include <boost/assert.hpp>
 
+#include <log/log.h>
+
 using namespace android;
 
 namespace armnn_driver
@@ -131,12 +131,14 @@ void RequestThread<HalVersion>::Process()
     }
 }
 
-// Class template specializations
-template class RequestThread<HalVersion_1_0>;
+///
+/// Class template specializations
+///
 
-#if defined(ARMNN_ANDROID_NN_V1_1) // Using ::android::hardware::neuralnetworks::V1_1.
-template class RequestThread<HalVersion_1_1>;
-#endif
+template class RequestThread<hal_1_0::HalPolicy>;
 
-} // namespace armnn_driver
+#if defined(ARMNN_ANDROID_NN_V1_1)
+template class RequestThread<hal_1_1::HalPolicy>;
+#endif
 
+} // namespace armnn_driver
\ No newline at end of file
-- 
cgit v1.2.1