From b3021435ad91e494af01ca0778915877dc0780c0 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Wed, 13 Jan 2021 15:56:51 +0000 Subject: IVGCVSW-4417 'Serialise ArmNN Model on android-nn-driver' * Implemented serialization of the network on android-nn-driver !armnn:4850 Signed-off-by: Sadik Armagan Change-Id: I3caf07bd4d1d2a3068c58f0b344303c4cf977ca6 --- ModelToINetworkConverter.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ModelToINetworkConverter.cpp') diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp index e8cf8a8b..c205a575 100644 --- a/ModelToINetworkConverter.cpp +++ b/ModelToINetworkConverter.cpp @@ -87,8 +87,9 @@ void ModelToINetworkConverter::Convert() const HalOperand& operand = getMainModel(m_Model).operands[inputIndex]; ALOGV("ModelToINetworkConverter::Convert(): GetTensorInfoForOperand(operand)"); const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand); - ALOGV("ModelToINetworkConverter::Convert(): m_Data.m_Network->AddInputLayer(i)"); - armnn::IConnectableLayer* layer = m_Data.m_Network->AddInputLayer(i); + const std::string layerName = "Input_" + std::to_string(i); + ALOGV("ModelToINetworkConverter::Convert(): m_Data.m_Network->AddInputLayer(i, layerName.c_str())"); + armnn::IConnectableLayer* layer = m_Data.m_Network->AddInputLayer(i, layerName.c_str()); ALOGV("ModelToINetworkConverter::Convert(): layer->GetOutputSlot(0)"); armnn::IOutputSlot& outputSlot = layer->GetOutputSlot(0); @@ -184,7 +185,8 @@ void ModelToINetworkConverter::Convert() uint32_t outputIndex = getMainModel(m_Model).outputIndexes[i]; const HalOperand& operand = getMainModel(m_Model).operands[outputIndex]; const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand); - armnn::IConnectableLayer* layer = m_Data.m_Network->AddOutputLayer(i); + const std::string layerName = "Output_" + std::to_string(i); + armnn::IConnectableLayer* layer = m_Data.m_Network->AddOutputLayer(i, layerName.c_str()); assert(m_Data.m_OutputSlotForOperand[outputIndex]); m_Data.m_OutputSlotForOperand[outputIndex]->Connect(layer->GetInputSlot(0)); -- cgit v1.2.1