From deb3bdbe028a59da0759dd7a560387d03a11d322 Mon Sep 17 00:00:00 2001 From: surmeh01 Date: Thu, 5 Jul 2018 12:06:04 +0100 Subject: Release 18.05.02 --- test/DriverTestHelpers.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/DriverTestHelpers.hpp') diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp index e90f7ecf..57541a35 100644 --- a/test/DriverTestHelpers.hpp +++ b/test/DriverTestHelpers.hpp @@ -72,9 +72,9 @@ android::sp AddPoolAndGetData(uint32_t size, Request& request); void AddPoolAndSetData(uint32_t size, Request& request, const float* data); -void AddOperand(Model& model, const Operand& op); +void AddOperand(V1_0::Model& model, const Operand& op); -void AddIntOperand(Model& model, int32_t value); +void AddIntOperand(V1_0::Model& model, int32_t value); template OperandType TypeToOperandType(); @@ -86,7 +86,7 @@ template<> OperandType TypeToOperandType(); template -void AddTensorOperand(Model& model, hidl_vec dimensions, T* values) +void AddTensorOperand(V1_0::Model& model, hidl_vec dimensions, T* values) { uint32_t totalElements = 1; for (uint32_t dim : dimensions) @@ -113,14 +113,14 @@ void AddTensorOperand(Model& model, hidl_vec dimensions, T* values) AddOperand(model, op); } -void AddInputOperand(Model& model, hidl_vec dimensions); +void AddInputOperand(V1_0::Model& model, hidl_vec dimensions); -void AddOutputOperand(Model& model, hidl_vec dimensions); +void AddOutputOperand(V1_0::Model& model, hidl_vec dimensions); -android::sp PrepareModel(const Model& model, +android::sp PrepareModel(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver); -android::sp PrepareModelWithStatus(const Model& model, +android::sp PrepareModelWithStatus(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus & prepareStatus, ErrorStatus expectedStatus=ErrorStatus::NONE); -- cgit v1.2.1