commit deb3bdbe028a59da0759dd7a560387d03a11d322
author surmeh01 <surabhi.mehta@arm.com> Thu Jul 05 12:06:04 2018 +0100
committer surmeh01 <surabhi.mehta@arm.com> Thu Jul 05 12:06:04 2018 +0100
tree 869b7ee10d8f1f19a0861e0b552bb453330adf0a
parent 49b9e100bfbb3b8da01472a0ff48b2bd92944e01

Release 18.05.02

ArmnnPreparedModel.hpp

diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp
index f61d56c..f7644b9 100644
--- a/ArmnnPreparedModel.hpp
+++ b/ArmnnPreparedModel.hpp
@@ -11,6 +11,8 @@
 #include "NeuralNetworks.h"
 #include <armnn/ArmNN.hpp>
 
+#include "ArmnnDriver.hpp"
+
 #include <string>
 #include <vector>
 
@@ -22,7 +24,7 @@
 public:
     ArmnnPreparedModel(armnn::NetworkId networkId,
                        armnn::IRuntime* runtime,
-                       const Model& model,
+                       const V1_0::Model& model,
                        const std::string& requestInputsAndOutputsDumpDir);
 
     virtual ~ArmnnPreparedModel();
@@ -46,7 +48,7 @@
 
     armnn::NetworkId     m_NetworkId;
     armnn::IRuntime*     m_Runtime;
-    Model                m_Model;
+    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;
@@ -58,7 +60,7 @@
 {
 public:
 
-    AndroidNnCpuExecutorPreparedModel(const Model& model, const std::string& requestInputsAndOutputsDumpDir);
+    AndroidNnCpuExecutorPreparedModel(const V1_0::Model& model, const std::string& requestInputsAndOutputsDumpDir);
     virtual ~AndroidNnCpuExecutorPreparedModel() { }
 
     bool Initialize();
@@ -74,7 +76,7 @@
         const hidl_vec<RequestArgument>& requestArgs,
         const std::vector<android::nn::RunTimePoolInfo>& requestPoolInfos);
 
-    Model m_Model;
+    V1_0::Model m_Model;
     std::vector<android::nn::RunTimePoolInfo> m_ModelPoolInfos;
     const std::string& m_RequestInputsAndOutputsDumpDir;
     uint32_t m_RequestCount;