aboutsummaryrefslogtreecommitdiff
path: root/Utils.hpp
diff options
context:
space:
mode:
authorMatthew Bentham <matthew.bentham@arm.com>2019-05-03 15:49:14 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-05-07 07:54:08 +0000
commit912b36224f19952663ebd3edc2a69d9031662fd1 (patch)
treeb84bdf384a6a9866336cfe5db7a613a4fc96d03c /Utils.hpp
parent856d1c9c9b0b1609282c4f797cbafefc6531240d (diff)
downloadandroid-nn-driver-912b36224f19952663ebd3edc2a69d9031662fd1.tar.gz
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>
Diffstat (limited to 'Utils.hpp')
-rw-r--r--Utils.hpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Utils.hpp b/Utils.hpp
index 812dfbd5..e55d8f80 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 @@ void* GetMemoryFromPool(DataLocation location,
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 @@ void ExportNetworkGraphToDotFile(const armnn::IOptimizedNetwork& optimizedNetwor
}
}
-} // namespace armnn_driver \ No newline at end of file
+} // namespace armnn_driver