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 /RequestThread.hpp | |
| 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 'RequestThread.hpp')
| -rw-r--r-- | RequestThread.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/RequestThread.hpp b/RequestThread.hpp index 67069205..dc1b535a 100644 --- a/RequestThread.hpp +++ b/RequestThread.hpp @@ -19,10 +19,7 @@ namespace armnn_driver { -template<typename HalVersion> -class ArmnnPreparedModel; - -template<typename HalVersion> +template<template <typename HalVersion> class PreparedModel, typename HalVersion> class RequestThread { public: @@ -38,7 +35,7 @@ public: /// @param[in] inputTensors pointer to the input tensors for the request /// @param[in] outputTensors pointer to the output tensors for the request /// @param[in] callback the android notification callback - void PostMsg(armnn_driver::ArmnnPreparedModel<HalVersion>* model, + void PostMsg(PreparedModel<HalVersion>* model, std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& memPools, std::shared_ptr<armnn::InputTensors>& inputTensors, std::shared_ptr<armnn::OutputTensors>& outputTensors, @@ -51,7 +48,7 @@ private: /// storage for a prepared model and args for the asyncExecute call struct AsyncExecuteData { - AsyncExecuteData(ArmnnPreparedModel<HalVersion>* model, + AsyncExecuteData(PreparedModel<HalVersion>* model, std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& memPools, std::shared_ptr<armnn::InputTensors>& inputTensors, std::shared_ptr<armnn::OutputTensors>& outputTensors, @@ -64,7 +61,7 @@ private: { } - armnn_driver::ArmnnPreparedModel<HalVersion>* m_Model; + PreparedModel<HalVersion>* m_Model; std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>> m_MemPools; std::shared_ptr<armnn::InputTensors> m_InputTensors; std::shared_ptr<armnn::OutputTensors> m_OutputTensors; |