diff options
author | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
---|---|---|
committer | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
commit | ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94 (patch) | |
tree | 77a769e27879fb712027c990071b061c5e0e3b60 /ArmnnPreparedModel.hpp | |
parent | deb3bdbe028a59da0759dd7a560387d03a11d322 (diff) | |
download | android-nn-driver-ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94.tar.gz |
Release 18.08
Diffstat (limited to 'ArmnnPreparedModel.hpp')
-rw-r--r-- | ArmnnPreparedModel.hpp | 51 |
1 files changed, 13 insertions, 38 deletions
diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp index f7644b95..a700e54d 100644 --- a/ArmnnPreparedModel.hpp +++ b/ArmnnPreparedModel.hpp @@ -7,12 +7,11 @@ #include "RequestThread.hpp" -#include "HalInterfaces.h" -#include "NeuralNetworks.h" -#include <armnn/ArmNN.hpp> - #include "ArmnnDriver.hpp" +#include <NeuralNetworks.h> +#include <armnn/ArmNN.hpp> + #include <string> #include <vector> @@ -24,8 +23,9 @@ class ArmnnPreparedModel : public IPreparedModel public: ArmnnPreparedModel(armnn::NetworkId networkId, armnn::IRuntime* runtime, - const V1_0::Model& model, - const std::string& requestInputsAndOutputsDumpDir); + const ::android::hardware::neuralnetworks::V1_0::Model& model, + const std::string& requestInputsAndOutputsDumpDir, + const bool gpuProfilingEnabled); virtual ~ArmnnPreparedModel(); @@ -46,40 +46,15 @@ private: template <typename TensorBindingCollection> void DumpTensorsIfRequired(char const* tensorNamePrefix, const TensorBindingCollection& tensorBindings); - armnn::NetworkId m_NetworkId; - armnn::IRuntime* m_Runtime; - V1_0::Model m_Model; + armnn::NetworkId m_NetworkId; + armnn::IRuntime* m_Runtime; + ::android::hardware::neuralnetworks::V1_0::Model m_Model; // There must be a single RequestThread for all ArmnnPreparedModel objects to ensure serial execution of workloads // It is specific to this class, so it is declared as static here - static RequestThread m_RequestThread; - uint32_t m_RequestCount; - const std::string& m_RequestInputsAndOutputsDumpDir; -}; - -class AndroidNnCpuExecutorPreparedModel : public IPreparedModel -{ -public: - - AndroidNnCpuExecutorPreparedModel(const V1_0::Model& model, const std::string& requestInputsAndOutputsDumpDir); - virtual ~AndroidNnCpuExecutorPreparedModel() { } - - bool Initialize(); - - virtual Return<ErrorStatus> execute(const Request& request, - const ::android::sp<IExecutionCallback>& callback) override; - -private: - - void DumpTensorsIfRequired( - char const* tensorNamePrefix, - const hidl_vec<uint32_t>& operandIndices, - const hidl_vec<RequestArgument>& requestArgs, - const std::vector<android::nn::RunTimePoolInfo>& requestPoolInfos); - - V1_0::Model m_Model; - std::vector<android::nn::RunTimePoolInfo> m_ModelPoolInfos; - const std::string& m_RequestInputsAndOutputsDumpDir; - uint32_t m_RequestCount; + static RequestThread m_RequestThread; + uint32_t m_RequestCount; + const std::string& m_RequestInputsAndOutputsDumpDir; + const bool m_GpuProfilingEnabled; }; } |