diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
| commit | b5fdf38f0c6596958fab2b84882f2792a31e585a (patch) | |
| tree | d6b578b51c1923c759653d8a04efa90923ad4dd8 /ArmnnPreparedModel.cpp | |
| parent | b92f8901fc34749337ea7a9ad7a2717fc9490de5 (diff) | |
| download | android-nn-driver-b5fdf38f0c6596958fab2b84882f2792a31e585a.tar.gz | |
IVGCVSW-3181 Add HAL 1.2 support to android-nn-driver
* Updated Android.mk to build HAL 1.2 driver
* Added 1.2 HalPolicy and ArmnnDriver
* Added 1.2 ArmnnPreparedModel
* Updated converters and utilities to accept new HAL 1.2 operands and operand types.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I62856deab24e106f72cccce09468db4971756fa6
Diffstat (limited to 'ArmnnPreparedModel.cpp')
| -rw-r--r-- | ArmnnPreparedModel.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp index f183caff..3256836e 100644 --- a/ArmnnPreparedModel.cpp +++ b/ArmnnPreparedModel.cpp @@ -12,7 +12,7 @@ #include <log/log.h> #include <OperationsUtils.h> -#if defined(ARMNN_ANDROID_P) +#if defined(ARMNN_ANDROID_P) || defined(ARMNN_ANDROID_Q) // The headers of the ML framework have changed between Android O and Android P. // The validation functions have been moved into their own header, ValidateHal.h. #include <ValidateHal.h> @@ -89,7 +89,7 @@ namespace armnn_driver { template<typename HalVersion> -RequestThread<HalVersion> ArmnnPreparedModel<HalVersion>::m_RequestThread; +RequestThread<ArmnnPreparedModel, HalVersion> ArmnnPreparedModel<HalVersion>::m_RequestThread; template<typename HalVersion> template <typename TensorBindingCollection> @@ -318,4 +318,8 @@ template class ArmnnPreparedModel<hal_1_0::HalPolicy>; template class ArmnnPreparedModel<hal_1_1::HalPolicy>; #endif +#ifdef ARMNN_ANDROID_NN_V1_2 +template class ArmnnPreparedModel<hal_1_1::HalPolicy>; +template class ArmnnPreparedModel<hal_1_2::HalPolicy>; +#endif } // namespace armnn_driver |