diff options
Diffstat (limited to 'tests/ExecuteNetwork')
-rw-r--r-- | tests/ExecuteNetwork/ExecuteNetwork.cpp | 5 | ||||
-rw-r--r-- | tests/ExecuteNetwork/ExecuteNetworkParams.hpp | 1 | ||||
-rw-r--r-- | tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp index 64296d31b7..9a4864542f 100644 --- a/tests/ExecuteNetwork/ExecuteNetwork.cpp +++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp @@ -325,6 +325,7 @@ int MainImpl(const ExecuteNetworkParams& params, inferenceModelParams.m_AsyncEnabled = params.m_Concurrent; inferenceModelParams.m_ThreadPoolSize = params.m_ThreadPoolSize; inferenceModelParams.m_OutputDetailsToStdOut = params.m_OutputDetailsToStdOut; + inferenceModelParams.m_OutputDetailsOnlyToStdOut = params.m_OutputDetailsOnlyToStdOut; for(const std::string& inputName: params.m_InputNames) { @@ -769,7 +770,9 @@ int main(int argc, const char* argv[]) return EXIT_FAILURE; } - if (ProgramOptions.m_ExNetParams.m_OutputDetailsToStdOut && !ProgramOptions.m_ExNetParams.m_EnableProfiling) + if ((ProgramOptions.m_ExNetParams.m_OutputDetailsToStdOut || + ProgramOptions.m_ExNetParams.m_OutputDetailsOnlyToStdOut) + && !ProgramOptions.m_ExNetParams.m_EnableProfiling) { ARMNN_LOG(fatal) << "You must enable profiling if you would like to output layer details"; return EXIT_FAILURE; diff --git a/tests/ExecuteNetwork/ExecuteNetworkParams.hpp b/tests/ExecuteNetwork/ExecuteNetworkParams.hpp index 97c605b0a7..e519b028a0 100644 --- a/tests/ExecuteNetwork/ExecuteNetworkParams.hpp +++ b/tests/ExecuteNetwork/ExecuteNetworkParams.hpp @@ -44,6 +44,7 @@ struct ExecuteNetworkParams std::string m_ModelPath; unsigned int m_NumberOfThreads; bool m_OutputDetailsToStdOut; + bool m_OutputDetailsOnlyToStdOut; std::vector<std::string> m_OutputNames; std::vector<std::string> m_OutputTensorFiles; std::vector<std::string> m_OutputTypes; diff --git a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp index 1fd4b3d96d..927d804725 100644 --- a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp +++ b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp @@ -410,9 +410,14 @@ ProgramOptions::ProgramOptions() : m_CxxOptions{"ExecuteNetwork", cxxopts::value<uint32_t>(m_RuntimeOptions.m_ProfilingOptions.m_CapturePeriod)->default_value("150")) ("output-network-details", - "Outputs layer tensor infos and descriptors to std out. Defaults to off.", + "Outputs layer tensor infos and descriptors to std out along with profiling events. Defaults to off.", cxxopts::value<bool>(m_ExNetParams.m_OutputDetailsToStdOut)->default_value("false") - ->implicit_value("true")); + ->implicit_value("true")) + ("output-network-details-only", + "Outputs layer tensor infos and descriptors to std out without profiling events. Defaults to off.", + cxxopts::value<bool>(m_ExNetParams.m_OutputDetailsOnlyToStdOut)->default_value("false") + ->implicit_value("true")); + } catch (const std::exception& e) { |