diff options
| author | arovir01 <Aron.Virginas-Tar@arm.com> | 2018-09-05 17:03:25 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:40 +0100 |
| commit | b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f (patch) | |
| tree | 84159d2eb142f12081c494483c07012e8ebee8cb /RequestThread.cpp | |
| parent | 93e48980920ddcc8c6390fa6cbfdfc9740786617 (diff) | |
| download | android-nn-driver-b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f.tar.gz | |
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
Diffstat (limited to 'RequestThread.cpp')
| -rw-r--r-- | RequestThread.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
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 |