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.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/DriverTestHelpers.cpp') diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp index 5b371921..d2d380a7 100644 --- a/test/DriverTestHelpers.cpp +++ b/test/DriverTestHelpers.cpp @@ -107,13 +107,13 @@ void AddPoolAndSetData(uint32_t size, Request& request, const float* data) memcpy(dst, data, size * sizeof(float)); } -void AddOperand(Model& model, const Operand& op) +void AddOperand(V1_0::Model& model, const Operand& op) { model.operands.resize(model.operands.size() + 1); model.operands[model.operands.size() - 1] = op; } -void AddIntOperand(Model& model, int32_t value) +void AddIntOperand(V1_0::Model& model, int32_t value) { DataLocation location = {}; location.offset = model.operandValues.size(); @@ -131,7 +131,7 @@ void AddIntOperand(Model& model, int32_t value) AddOperand(model, op); } -void AddInputOperand(Model& model, hidl_vec dimensions) +void AddInputOperand(V1_0::Model& model, hidl_vec dimensions) { Operand op = {}; op.type = OperandType::TENSOR_FLOAT32; @@ -144,7 +144,7 @@ void AddInputOperand(Model& model, hidl_vec dimensions) model.inputIndexes[model.inputIndexes.size() - 1] = model.operands.size() - 1; } -void AddOutputOperand(Model& model, hidl_vec dimensions) +void AddOutputOperand(V1_0::Model& model, hidl_vec dimensions) { Operand op = {}; op.type = OperandType::TENSOR_FLOAT32; @@ -158,7 +158,7 @@ void AddOutputOperand(Model& model, hidl_vec dimensions) } -android::sp PrepareModelWithStatus(const Model& model, +android::sp PrepareModelWithStatus(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus & prepareStatus, ErrorStatus expectedStatus) @@ -176,7 +176,7 @@ android::sp PrepareModelWithStatus(const Model& model, return cb->GetPreparedModel(); } -android::sp PrepareModel(const Model& model, +android::sp PrepareModel(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver) { ErrorStatus prepareStatus = ErrorStatus::NONE; -- cgit v1.2.1