From 02d4046a0fa6c3a335adf1fc305c1b6a96a0907e Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Tue, 2 Apr 2024 14:35:34 +0100 Subject: IVGCVSW-8298 Fix failing fsrcnn test Change-Id: I03c26ab763ec306a6efe31f9b4e0b1c058589bf7 Signed-off-by: Nikhil Raj --- tests/ExecuteNetwork/ArmNNExecutor.cpp | 13 ++++++------- tests/ExecuteNetwork/ExecuteNetwork.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/ExecuteNetwork/ArmNNExecutor.cpp b/tests/ExecuteNetwork/ArmNNExecutor.cpp index 7060497c83..4518f1426f 100644 --- a/tests/ExecuteNetwork/ArmNNExecutor.cpp +++ b/tests/ExecuteNetwork/ArmNNExecutor.cpp @@ -91,7 +91,12 @@ ArmNNExecutor::ArmNNExecutor(const ExecuteNetworkParams& params, armnn::IRuntime ArmNNExecutor::~ArmNNExecutor() { - m_Runtime->UnloadNetwork(m_NetworkId); + std::shared_ptr profiler = m_Runtime->GetProfiler(m_NetworkId); + // If profiling is enabled print out the results + if (profiler && profiler->IsProfilingEnabled()) + { + profiler->Print(std::cout); + } } void ArmNNExecutor::ExecuteAsync() @@ -194,12 +199,6 @@ void ArmNNExecutor::ExecuteSync() const auto inferenceDuration = armnn::GetTimeDuration(start_time); - // If profiling is enabled print out the results - if(profiler && profiler->IsProfilingEnabled() && x == (m_Params.m_Iterations - 1)) - { - profiler->Print(std::cout); - } - if(ret == armnn::Status::Failure) { throw armnn::Exception("IRuntime::EnqueueWorkload failed"); diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp index 9f81eb1168..8727fc6dc2 100644 --- a/tests/ExecuteNetwork/ExecuteNetwork.cpp +++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2022-2024 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -93,6 +93,11 @@ int main(int argc, const char* argv[]) } comparisonExecutor->PrintNetworkInfo(); + + if (programOptions.m_ExNetParams.m_OutputDetailsOnlyToStdOut) + { + return EXIT_SUCCESS; + } comparisonExecutor->Execute(); comparisonExecutor->CompareAndPrintResult(outputResults); -- cgit v1.2.1