From e6e54a8b8eae7200fb5501052b13f740fd0b51b9 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Wed, 8 May 2019 10:18:05 +0100 Subject: IVGCVSW-2911 Android Q compatibility code updates * Updates on test classes. Change-Id: I52e11a1d97d02c23e0a33e4e128dc43a4a95b5bc Signed-off-by: Sadik Armagan --- test/DriverTestHelpers.hpp | 82 +++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'test/DriverTestHelpers.hpp') diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp index 394720ed..4a8f607e 100644 --- a/test/DriverTestHelpers.hpp +++ b/test/DriverTestHelpers.hpp @@ -33,7 +33,7 @@ namespace driverTestHelpers std::ostream& operator<<(std::ostream& os, V1_0::ErrorStatus stat); -struct ExecutionCallback : public IExecutionCallback +struct ExecutionCallback : public V1_0::IExecutionCallback { ExecutionCallback() : mNotified(false) {} Return notify(ErrorStatus status) override; @@ -48,7 +48,7 @@ private: bool mNotified; }; -class PreparedModelCallback : public IPreparedModelCallback +class PreparedModelCallback : public V1_0::IPreparedModelCallback { public: PreparedModelCallback() @@ -58,13 +58,13 @@ public: ~PreparedModelCallback() override { } Return notify(ErrorStatus status, - const android::sp& preparedModel) override; + const android::sp& preparedModel) override; ErrorStatus GetErrorStatus() { return m_ErrorStatus; } - android::sp GetPreparedModel() { return m_PreparedModel; } + android::sp GetPreparedModel() { return m_PreparedModel; } private: ErrorStatus m_ErrorStatus; - android::sp m_PreparedModel; + android::sp m_PreparedModel; }; hidl_memory allocateSharedMemory(int64_t size); @@ -74,7 +74,7 @@ android::sp AddPoolAndGetData(uint32_t size, Request& request); void AddPoolAndSetData(uint32_t size, Request& request, const float* data); template -void AddOperand(HalModel& model, const Operand& op) +void AddOperand(HalModel& model, const V1_0::Operand& op) { model.operands.resize(model.operands.size() + 1); model.operands[model.operands.size() - 1] = op; @@ -87,11 +87,11 @@ void AddIntOperand(HalModel& model, int32_t value) location.offset = model.operandValues.size(); location.length = sizeof(int32_t); - Operand op = {}; - op.type = OperandType::INT32; - op.dimensions = hidl_vec{}; - op.lifetime = OperandLifeTime::CONSTANT_COPY; - op.location = location; + V1_0::Operand op = {}; + op.type = V1_0::OperandType::INT32; + op.dimensions = hidl_vec{}; + op.lifetime = V1_0::OperandLifeTime::CONSTANT_COPY; + op.location = location; model.operandValues.resize(model.operandValues.size() + location.length); *reinterpret_cast(&model.operandValues[location.offset]) = value; @@ -112,8 +112,8 @@ template void AddTensorOperand(HalModel& model, const hidl_vec& dimensions, const T* values, - OperandType operandType = OperandType::TENSOR_FLOAT32, - OperandLifeTime operandLifeTime = OperandLifeTime::CONSTANT_COPY) + V1_0::OperandType operandType = V1_0::OperandType::TENSOR_FLOAT32, + V1_0::OperandLifeTime operandLifeTime = V1_0::OperandLifeTime::CONSTANT_COPY) { uint32_t totalElements = 1; for (uint32_t dim : dimensions) @@ -124,16 +124,16 @@ void AddTensorOperand(HalModel& model, DataLocation location = {}; location.length = totalElements * sizeof(T); - if(operandLifeTime == OperandLifeTime::CONSTANT_COPY) + if(operandLifeTime == V1_0::OperandLifeTime::CONSTANT_COPY) { location.offset = model.operandValues.size(); } - Operand op = {}; - op.type = operandType; - op.dimensions = dimensions; - op.lifetime = OperandLifeTime::CONSTANT_COPY; - op.location = location; + V1_0::Operand op = {}; + op.type = operandType; + op.dimensions = dimensions; + op.lifetime = V1_0::OperandLifeTime::CONSTANT_COPY; + op.location = location; model.operandValues.resize(model.operandValues.size() + location.length); for (uint32_t i = 0; i < totalElements; i++) @@ -148,8 +148,8 @@ template void AddTensorOperand(HalModel& model, const hidl_vec& dimensions, const std::vector& values, - OperandType operandType = OperandType::TENSOR_FLOAT32, - OperandLifeTime operandLifeTime = OperandLifeTime::CONSTANT_COPY) + V1_0::OperandType operandType = V1_0::OperandType::TENSOR_FLOAT32, + V1_0::OperandLifeTime operandLifeTime = V1_0::OperandLifeTime::CONSTANT_COPY) { AddTensorOperand(model, dimensions, values.data(), operandType, operandLifeTime); } @@ -157,13 +157,13 @@ void AddTensorOperand(HalModel& model, template void AddInputOperand(HalModel& model, const hidl_vec& dimensions, - OperandType operandType = OperandType::TENSOR_FLOAT32) + V1_0::OperandType operandType = V1_0::OperandType::TENSOR_FLOAT32) { - Operand op = {}; - op.type = operandType; - op.scale = operandType == OperandType::TENSOR_QUANT8_ASYMM ? 1.f / 255.f : 0.f; - op.dimensions = dimensions; - op.lifetime = OperandLifeTime::MODEL_INPUT; + V1_0::Operand op = {}; + op.type = operandType; + op.scale = operandType == V1_0::OperandType::TENSOR_QUANT8_ASYMM ? 1.f / 255.f : 0.f; + op.dimensions = dimensions; + op.lifetime = V1_0::OperandLifeTime::MODEL_INPUT; AddOperand(model, op); @@ -174,13 +174,13 @@ void AddInputOperand(HalModel& model, template void AddOutputOperand(HalModel& model, const hidl_vec& dimensions, - OperandType operandType = OperandType::TENSOR_FLOAT32) + V1_0::OperandType operandType = V1_0::OperandType::TENSOR_FLOAT32) { - Operand op = {}; - op.type = operandType; - op.scale = operandType == OperandType::TENSOR_QUANT8_ASYMM ? 1.f / 255.f : 0.f; - op.dimensions = dimensions; - op.lifetime = OperandLifeTime::MODEL_OUTPUT; + V1_0::Operand op = {}; + op.type = operandType; + op.scale = operandType == V1_0::OperandType::TENSOR_QUANT8_ASYMM ? 1.f / 255.f : 0.f; + op.dimensions = dimensions; + op.lifetime = V1_0::OperandLifeTime::MODEL_OUTPUT; AddOperand(model, op); @@ -188,14 +188,14 @@ void AddOutputOperand(HalModel& model, model.outputIndexes[model.outputIndexes.size() - 1] = model.operands.size() - 1; } -android::sp PrepareModelWithStatus(const V1_0::Model& model, - armnn_driver::ArmnnDriver& driver, - ErrorStatus& prepareStatus, - ErrorStatus expectedStatus = ErrorStatus::NONE); +android::sp PrepareModelWithStatus(const V1_0::Model& model, + armnn_driver::ArmnnDriver& driver, + ErrorStatus& prepareStatus, + ErrorStatus expectedStatus = ErrorStatus::NONE); #ifdef ARMNN_ANDROID_NN_V1_1 -android::sp PrepareModelWithStatus(const V1_1::Model& model, +android::sp PrepareModelWithStatus(const V1_1::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, ErrorStatus expectedStatus = ErrorStatus::NONE); @@ -203,18 +203,18 @@ android::sp PrepareModelWithStatus(const V1_1::Model& model, #endif template -android::sp PrepareModel(const HalModel& model, +android::sp PrepareModel(const HalModel& model, armnn_driver::ArmnnDriver& driver) { ErrorStatus prepareStatus = ErrorStatus::NONE; return PrepareModelWithStatus(model, driver, prepareStatus); } -ErrorStatus Execute(android::sp preparedModel, +ErrorStatus Execute(android::sp preparedModel, const Request& request, ErrorStatus expectedStatus = ErrorStatus::NONE); -android::sp ExecuteNoWait(android::sp preparedModel, +android::sp ExecuteNoWait(android::sp preparedModel, const Request& request); } // namespace driverTestHelpers -- cgit v1.2.1