commit 912b36224f19952663ebd3edc2a69d9031662fd1
author Matthew Bentham <matthew.bentham@arm.com> Fri May 03 15:49:14 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 07 07:54:08 2019 +0000
tree b84bdf384a6a9866336cfe5db7a613a4fc96d03c
parent 856d1c9c9b0b1609282c4f797cbafefc6531240d

IVGCVSW-2911 Work towards compatibility with Q

Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback

Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

ModelToINetworkConverter.cpp

diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp
index fccd759..2a79a27 100644
--- a/ModelToINetworkConverter.cpp
+++ b/ModelToINetworkConverter.cpp
@@ -68,7 +68,7 @@
         {
             // inputs in android nn are represented by operands
             uint32_t inputIndex = m_Model.inputIndexes[i];
-            const Operand& operand = m_Model.operands[inputIndex];
+            const V1_0::Operand& operand = m_Model.operands[inputIndex];
             const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand);
             armnn::IConnectableLayer* layer = m_Data.m_Network->AddInputLayer(i);
 
@@ -137,7 +137,7 @@
             {
                 // outputs in android nn are represented by operands
                 uint32_t outputIndex = m_Model.outputIndexes[i];
-                const Operand& operand = m_Model.operands[outputIndex];
+                const V1_0::Operand& operand = m_Model.operands[outputIndex];
                 const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand);
                 armnn::IConnectableLayer* layer = m_Data.m_Network->AddOutputLayer(i);