diff options
| author | Kevin May <kevin.may@arm.com> | 2020-03-26 13:34:14 +0000 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2020-03-26 17:39:25 +0000 |
| commit | 42477c1d3e7ddf74863e84ab79dbe6f42e4a0ba3 (patch) | |
| tree | e5260f4b9e5e36080269243c1f1cd74f5589b206 /RequestThread.cpp | |
| parent | cae7e927a5b5559f67bb87a1737f6606d5d6f328 (diff) | |
| download | android-nn-driver-42477c1d3e7ddf74863e84ab79dbe6f42e4a0ba3.tar.gz | |
IVGCVSW-4447 Add Hal 1_3 Support
* Add new 1.3 files HalPolicy, ArmnnDriver, ArmnnDriverImpl
* Add new .rc file for 1.3 service
* Add ArmnnPreparedModel_1_3 and implement new functions
* Update Android.mk with 1.3 driver and service
* Refactor ifdef to include ARMNN_ANDROID_NN_V1_3
* Create Utils getMainModel for new 1.3 Model Main Subgraph
* Use android Utils to convertToV1_X in ArmnnPrepapredModel_1_3
* Refactor HAL 1.2 convert functions into ConversionUtils_1_2.hpp
* Replace ArmnnBurstExecutorWithCache with call to ExecutionBurstServer
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I514069e9e1b16bcd1c4abfb5d563d25ac22d02e3
Diffstat (limited to 'RequestThread.cpp')
| -rw-r--r-- | RequestThread.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/RequestThread.cpp b/RequestThread.cpp index 22a3ac37..50c5161c 100644 --- a/RequestThread.cpp +++ b/RequestThread.cpp @@ -12,6 +12,11 @@ #include "ArmnnPreparedModel_1_2.hpp" #endif +#ifdef ARMNN_ANDROID_NN_V1_3 +#include "ArmnnPreparedModel_1_2.hpp" +#include "ArmnnPreparedModel_1_3.hpp" +#endif + #include <boost/assert.hpp> #include <log/log.h> @@ -151,4 +156,12 @@ template class RequestThread<ArmnnPreparedModel, hal_1_2::HalPolicy, CallbackCon template class RequestThread<ArmnnPreparedModel_1_2, hal_1_2::HalPolicy, CallbackContext_1_2>; #endif +#ifdef ARMNN_ANDROID_NN_V1_3 +template class RequestThread<ArmnnPreparedModel, hal_1_1::HalPolicy, CallbackContext_1_0>; +template class RequestThread<ArmnnPreparedModel, hal_1_2::HalPolicy, CallbackContext_1_0>; +template class RequestThread<ArmnnPreparedModel, hal_1_3::HalPolicy, CallbackContext_1_0>; +template class RequestThread<ArmnnPreparedModel_1_2, hal_1_2::HalPolicy, CallbackContext_1_2>; +template class RequestThread<ArmnnPreparedModel_1_3, hal_1_3::HalPolicy, CallbackContext_1_3>; +#endif + } // namespace armnn_driver |