commit a280650509c4fbaa2508cdbc42e31f5a1805bd2a
author Mike Kelly <mike.kelly@arm.com> Thu Aug 03 10:42:11 2023 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Thu Aug 03 22:04:58 2023 +0000
tree 1b60f4a2e6c7719ae873e8bdef2a76bd82c35033
parent 7d1b1ca5b25a3aaeecebc537e8cbed2ee1ed3337

MLCE-1092 Added layerNames to opaque delegate

 * All layers added through the opaque delegate will have a name that
   includes the nodeIndex from the tflite model.
 * Added utilities to OpaqueDelegateUtils to get the names for the layers.

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Iadcc21646d0b6fcc2c524d6239211ad3af6b6577

delegate/opaque/src/Comparison.hpp

diff --git a/delegate/opaque/src/Comparison.hpp b/delegate/opaque/src/Comparison.hpp
index 8740cfb..026a43a 100644
--- a/delegate/opaque/src/Comparison.hpp
+++ b/delegate/opaque/src/Comparison.hpp
@@ -10,7 +10,7 @@
 namespace armnnOpaqueDelegate
 {
 
-std::string GetLayerName(armnn::ComparisonOperation comparisonOperation)
+std::string GetOperationName(armnn::ComparisonOperation comparisonOperation)
 {
     std::string layerName = "COMPARISON";
     switch (comparisonOperation)
@@ -123,11 +123,13 @@
 
     if (!delegateData.m_Network)
     {
-        validateFunc(outputTensorInfo, isSupported, GetLayerName(comparisonOperation));
+        validateFunc(outputTensorInfo, isSupported, GetOperationName(comparisonOperation));
         return isSupported ? kTfLiteOk : kTfLiteError;
     }
 
-    armnn::IConnectableLayer* comparisonLayer = delegateData.m_Network->AddComparisonLayer(descriptor);
+    auto layerName = GetName(descriptor.m_Operation, nodeIndex);
+    armnn::IConnectableLayer* comparisonLayer = delegateData.m_Network->AddComparisonLayer(descriptor,
+                                                                                           layerName.c_str());
     comparisonLayer->SetBackendId(setBackend);
     ARMNN_ASSERT(comparisonLayer != nullptr);
 
@@ -135,7 +137,7 @@
     outputSlot.SetTensorInfo(outputTensorInfo);
 
     // try to connect the Constant Inputs if there are any
-    if(ProcessInputs(comparisonLayer,delegateData, tfLiteContext, tfLiteNode) != kTfLiteOk )
+    if (ProcessInputs(comparisonLayer, delegateData, tfLiteContext, tfLiteNode, nodeIndex) != kTfLiteOk)
     {
         return kTfLiteError;
     }