diff options
author | Mike Kelly <mike.kelly@arm.com> | 2023-08-03 10:42:11 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2023-08-03 22:04:58 +0000 |
commit | a280650509c4fbaa2508cdbc42e31f5a1805bd2a (patch) | |
tree | 1b60f4a2e6c7719ae873e8bdef2a76bd82c35033 /delegate/opaque/src/Pooling.hpp | |
parent | 7d1b1ca5b25a3aaeecebc537e8cbed2ee1ed3337 (diff) | |
download | armnn-a280650509c4fbaa2508cdbc42e31f5a1805bd2a.tar.gz |
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
Diffstat (limited to 'delegate/opaque/src/Pooling.hpp')
-rw-r--r-- | delegate/opaque/src/Pooling.hpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/delegate/opaque/src/Pooling.hpp b/delegate/opaque/src/Pooling.hpp index 45a10f3833..8e6500c1cb 100644 --- a/delegate/opaque/src/Pooling.hpp +++ b/delegate/opaque/src/Pooling.hpp @@ -131,7 +131,8 @@ TfLiteStatus VisitPooling2dOperator(DelegateData& delegateData, return isSupported ? kTfLiteOk : kTfLiteError; } - armnn::IConnectableLayer* poolingLayer = delegateData.m_Network->AddPooling2dLayer(descriptor); + auto layerName = GetName(armnn::LayerType::Pooling2d, nodeIndex); + armnn::IConnectableLayer* poolingLayer = delegateData.m_Network->AddPooling2dLayer(descriptor, layerName.c_str()); poolingLayer->SetBackendId(setBackend); ARMNN_ASSERT(poolingLayer != nullptr); @@ -139,18 +140,18 @@ TfLiteStatus VisitPooling2dOperator(DelegateData& delegateData, outputSlot.SetTensorInfo(outputTensorInfo); // try to connect the Constant Inputs if there are any - if(ProcessInputs(poolingLayer, delegateData, tfLiteContext, tfLiteNode) != kTfLiteOk ) + if (ProcessInputs(poolingLayer, delegateData, tfLiteContext, tfLiteNode, nodeIndex) != kTfLiteOk) { return kTfLiteError; } - if(Connect(poolingLayer, tfLiteContext, tfLiteNode, delegateData) != kTfLiteOk) + if (Connect(poolingLayer, tfLiteContext, tfLiteNode, delegateData) != kTfLiteOk) { return kTfLiteError; } // Check and create activation - return FusedActivation(tfLiteContext, tfLiteNode, activationType, poolingLayer, 0, delegateData); + return FusedActivation(tfLiteContext, tfLiteNode, activationType, poolingLayer, 0, delegateData, nodeIndex); } TfLiteStatus VisitPooling3dOperator(DelegateData& delegateData, @@ -344,7 +345,8 @@ TfLiteStatus VisitPooling3dOperator(DelegateData& delegateData, } // Create the Layer - armnn::IConnectableLayer* poolingLayer = delegateData.m_Network->AddPooling3dLayer(descriptor); + auto layerName = GetName(armnn::LayerType::Pooling3d, nodeIndex); + armnn::IConnectableLayer* poolingLayer = delegateData.m_Network->AddPooling3dLayer(descriptor, layerName.c_str()); poolingLayer->SetBackendId(setBackend); ARMNN_ASSERT(poolingLayer != nullptr); @@ -353,17 +355,17 @@ TfLiteStatus VisitPooling3dOperator(DelegateData& delegateData, outputSlot.SetTensorInfo(outputTensorInfo); // try to connect the Constant Inputs if there are any - if(ProcessInputs(poolingLayer, delegateData, tfLiteContext, tfLiteNode) != kTfLiteOk ) + if (ProcessInputs(poolingLayer, delegateData, tfLiteContext, tfLiteNode, nodeIndex) != kTfLiteOk) { return kTfLiteError; } - if(Connect(poolingLayer, tfLiteContext, tfLiteNode, delegateData) != kTfLiteOk) + if (Connect(poolingLayer, tfLiteContext, tfLiteNode, delegateData) != kTfLiteOk) { return kTfLiteError; } - return FusedActivation(tfLiteContext, tfLiteNode, activationType, poolingLayer, 0, delegateData); + return FusedActivation(tfLiteContext, tfLiteNode, activationType, poolingLayer, 0, delegateData, nodeIndex); } } // namespace armnnOpaqueDelegate |