Bug Fixes for refactor of the ExecuteNetwork.

* dot file to be generated when -v is given. It was only being generated when using the delegate as executor
* output name read from m_Params.m_OutputNames instead of m_TfLiteInterpreter
* typo: "delage" instead of "delegate"
* QAsymmS8 templated as int8, instead of uint8


Change-Id: Ie13ae0f7e6395c0ebcb5ecda32e72082dee8aa6c

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Iac97a23927ba42290ebeb3446bbd36da15045e07

1 files changed, 10 insertions, 1 deletions

diff --git a/tests/ExecuteNetwork/ArmNNExecutor.cpp b/tests/ExecuteNetwork/ArmNNExecutor.cpp
index 5be3383061..d1892f9d42 100644
--- a/tests/ExecuteNetwork/ArmNNExecutor.cpp
+++ b/tests/ExecuteNetwork/ArmNNExecutor.cpp
@@ -533,6 +533,15 @@ armnn::IOptimizedNetworkPtr ArmNNExecutor::OptimizeNetwork(armnn::INetwork* netw
         LogAndThrow("Optimize returned nullptr");
     }
 
+    // If v,visualize-optimized-model is enabled then construct a file name for the dot file.
+    if (m_Params.m_EnableLayerDetails)
+    {
+        fs::path filename = m_Params.m_ModelPath;
+        filename.replace_extension("dot");
+        std::fstream file(filename.c_str(), std::ios_base::out);
+        optNet->SerializeToDot(file);
+    }
+
     return optNet;
 }
 
@@ -683,12 +692,12 @@ void ArmNNExecutor::CompareAndPrintResult(std::vector<const void*> otherOutput)
                     break;
                 }
                 case armnn::DataType::QSymmS8:
+                case armnn::DataType::QAsymmS8:
                 {
                     result = ComputeRMSE<int8_t>(outputTensor.second.GetMemoryArea(), otherOutput[index++], size);
                     break;
                 }
                 case armnn::DataType::QAsymmU8:
-                case armnn::DataType::QAsymmS8:
                 {
                     result = ComputeRMSE<uint8_t>(outputTensor.second.GetMemoryArea(), otherOutput[index++], size);
                     break;