From ef8a393e1945535721fea09a11cce50d7c607c47 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Thu, 9 Apr 2020 17:21:50 +0100 Subject: IVGCVSW-4641 Investigate Hal 1.3 VTS Failures * Return correct ErrorStatus for MemoryDomain test * Return if ErrorStatus is different than NONE Signed-off-by: Sadik Armagan Change-Id: I4224256b7c382e5a46349ac730e5f6d5828539ed --- ArmnnPreparedModel_1_3.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp index a3ad6aeb..68156cab 100644 --- a/ArmnnPreparedModel_1_3.cpp +++ b/ArmnnPreparedModel_1_3.cpp @@ -337,7 +337,7 @@ std::tuple, Timing, std::string> { if (!setRunTimePoolInfosFromMemoryPools(&memPools, request.pools)) { - return {ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming, "ArmnnPreparedModel_1_3::execute"}; + return {ErrorStatus::INVALID_ARGUMENT, {}, g_NoTiming, "ArmnnPreparedModel_1_3::execute"}; } // add the inputs and outputs with their data @@ -397,6 +397,7 @@ Return ArmnnPreparedModel_1_3::ExecuteSynchronously(const V1_3 {}, g_NoTiming, "ArmnnPreparedModel_1_3::ExecuteSynchronously invalid request model"); + return Void(); } @@ -412,6 +413,7 @@ Return ArmnnPreparedModel_1_3::ExecuteSynchronously(const V1_3 if (status != V1_3::ErrorStatus::NONE) { cbCtx.callback(status, outputShapes, timing, message); + return Void(); } ALOGV("ArmnnPreparedModel_1_3::ExecuteSynchronously() before Execution"); -- cgit v1.2.1