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>

Utils.hpp

diff --git a/Utils.hpp b/Utils.hpp
index 812dfbd..e55d8f8 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <iomanip>
 
+namespace V1_0 = ::android::hardware::neuralnetworks::V1_0;
+
 namespace armnn_driver
 {
 
@@ -44,9 +46,9 @@
                         const std::vector<android::nn::RunTimePoolInfo>& memPools);
 
 /// Can throw UnsupportedOperand
-armnn::TensorInfo GetTensorInfoForOperand(const Operand& operand);
+armnn::TensorInfo GetTensorInfoForOperand(const V1_0::Operand& operand);
 
-std::string GetOperandSummary(const Operand& operand);
+std::string GetOperandSummary(const V1_0::Operand& operand);
 
 template <typename HalModel>
 std::string GetModelSummary(const HalModel& model)
@@ -130,4 +132,4 @@
     }
 }
 
-} // namespace armnn_driver
\ No newline at end of file
+} // namespace armnn_driver