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/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index 7a275af..e4a8b14 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -295,11 +295,14 @@
}
}
-// Class template specializations
-template class ArmnnPreparedModel<HalVersion_1_0>;
+///
+/// Class template specializations
+///
-#ifdef ARMNN_ANDROID_NN_V1_1 // Using ::android::hardware::neuralnetworks::V1_1.
-template class ArmnnPreparedModel<HalVersion_1_1>;
+template class ArmnnPreparedModel<hal_1_0::HalPolicy>;
+
+#if defined(ARMNN_ANDROID_NN_V1_1)
+template class ArmnnPreparedModel<hal_1_1::HalPolicy>;
#endif
-} // namespace armnn_driver
+} // namespace armnn_driver
\ No newline at end of file