commit 4914d0c1f4cbb01fe276a7093af4cff13270b74a
author Keith Davis <keith.davis@arm.com> Wed Aug 18 17:14:05 2021 +0100
committer Nikhil Raj Arm <nikhil.raj@arm.com> Fri Aug 20 09:10:22 2021 +0000
tree ce6c4364bb596803148833af535215aa6ab6de90
parent e369dbddae66c58f4b444c4b25871c10af19ed9d

IVGCVSW-6249 Add ProfilingDetails Macros to all workloads in Ref, Neon, CL

 * Add functionality to only output network details in ExNet

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I0c45e67193f308ce7b86f1bb1a918a266fefba2e

tests/ExecuteNetwork/ExecuteNetwork.cpp

diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index 64296d3..9a48645 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -325,6 +325,7 @@
         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 @@
         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;

tests/ExecuteNetwork/ExecuteNetworkParams.hpp

diff --git a/tests/ExecuteNetwork/ExecuteNetworkParams.hpp b/tests/ExecuteNetwork/ExecuteNetworkParams.hpp
index 97c605b..e519b02 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkParams.hpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkParams.hpp
@@ -44,6 +44,7 @@
     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;

tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp

diff --git a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
index 1fd4b3d..927d804 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
@@ -410,9 +410,14 @@
                  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)
     {