From 912b36224f19952663ebd3edc2a69d9031662fd1 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Fri, 3 May 2019 15:49:14 +0100 Subject: IVGCVSW-2911 Work towards compatibility with Q Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699 Signed-off-by: Matthew Bentham --- Utils.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Utils.hpp') diff --git a/Utils.hpp b/Utils.hpp index 812dfbd5..e55d8f80 100644 --- a/Utils.hpp +++ b/Utils.hpp @@ -19,6 +19,8 @@ #include #include +namespace V1_0 = ::android::hardware::neuralnetworks::V1_0; + namespace armnn_driver { @@ -44,9 +46,9 @@ void* GetMemoryFromPool(DataLocation location, const std::vector& 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 std::string GetModelSummary(const HalModel& model) @@ -130,4 +132,4 @@ void ExportNetworkGraphToDotFile(const armnn::IOptimizedNetwork& optimizedNetwor } } -} // namespace armnn_driver \ No newline at end of file +} // namespace armnn_driver -- cgit v1.2.1