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
diff --git a/RequestThread.cpp b/RequestThread.cpp
index aedd607..0b06b51 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 @@
}
}
-// 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>;
+template class RequestThread<hal_1_0::HalPolicy>;
+
+#if defined(ARMNN_ANDROID_NN_V1_1)
+template class RequestThread<hal_1_1::HalPolicy>;
#endif
-} // namespace armnn_driver
-
+} // namespace armnn_driver
\ No newline at end of file