diff options
author | Colm Donelan <colm.donelan@arm.com> | 2023-06-22 10:19:17 +0100 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2023-06-30 14:20:56 +0100 |
commit | 0dfb2658ce521571aa0f9e859f813c60fda9d8d6 (patch) | |
tree | ef4605cebb29c6754da8dfea0decd4250288e2a5 /tests/ExecuteNetwork/ExecuteNetwork.cpp | |
parent | 16e27cf81424dcad05d129f9ba368a8c446cd25f (diff) | |
download | armnn-0dfb2658ce521571aa0f9e859f813c60fda9d8d6.tar.gz |
IVGCVSW-7666 Add a FileComparisonExecutor to ExecuteNetwork.
* Implement the "-C" command line option of executenetwork.
* Add a FileComparisonExecutorFile which will read tensors from
a previously written text file and compare them to the execution
output.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I8380fd263028af13d65a67fb6afd89626d1b07b8
Diffstat (limited to 'tests/ExecuteNetwork/ExecuteNetwork.cpp')
-rw-r--r-- | tests/ExecuteNetwork/ExecuteNetwork.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp index f9f583a9c6..9f81eb1168 100644 --- a/tests/ExecuteNetwork/ExecuteNetwork.cpp +++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT // -#include "ExecuteNetworkProgramOptions.hpp" #include "ArmNNExecutor.hpp" +#include "ExecuteNetworkProgramOptions.hpp" #if defined(ARMNN_TFLITE_DELEGATE) || defined(ARMNN_TFLITE_OPAQUE_DELEGATE) #include "TfliteExecutor.hpp" #endif +#include "FileComparisonExecutor.hpp" #include <armnn/Logging.hpp> - std::unique_ptr<IExecutor> BuildExecutor(ProgramOptions& programOptions) { if (programOptions.m_ExNetParams.m_TfLiteExecutor == @@ -42,7 +42,6 @@ int main(int argc, const char* argv[]) #endif armnn::ConfigureLogging(true, true, level); - // Get ExecuteNetwork parameters and runtime options from command line // This might throw an InvalidArgumentException if the user provided invalid inputs ProgramOptions programOptions; @@ -72,15 +71,14 @@ int main(int argc, const char* argv[]) return EXIT_FAILURE; } - executor->PrintNetworkInfo(); outputResults = executor->Execute(); if (!programOptions.m_ExNetParams.m_ComparisonComputeDevices.empty() || - programOptions.m_ExNetParams.m_CompareWithTflite) + programOptions.m_ExNetParams.m_CompareWithTflite) { ExecuteNetworkParams comparisonParams = programOptions.m_ExNetParams; - comparisonParams.m_ComputeDevices = programOptions.m_ExNetParams.m_ComparisonComputeDevices; + comparisonParams.m_ComputeDevices = programOptions.m_ExNetParams.m_ComparisonComputeDevices; if (programOptions.m_ExNetParams.m_CompareWithTflite) { @@ -99,4 +97,12 @@ int main(int argc, const char* argv[]) comparisonExecutor->CompareAndPrintResult(outputResults); } + + // If there's a file comparison specified create a FileComparisonExecutor. + if (!programOptions.m_ExNetParams.m_ComparisonFile.empty()) + { + FileComparisonExecutor comparisonExecutor(programOptions.m_ExNetParams); + comparisonExecutor.Execute(); + comparisonExecutor.CompareAndPrintResult(outputResults); + } } |