From 3fec1ea7e35420ef87de8a98aed0437570251969 Mon Sep 17 00:00:00 2001 From: janeil01 Date: Thu, 7 Nov 2019 09:47:20 +0000 Subject: IVGCVSW-4067 Change LayerGuid to use ProfilingGuid * Refactoring to enable ProfilingGuid * Add profiling includes to Android.mk Signed-off-by: Jan Eilers Change-Id: Ieb25e15e3dc302eb42817d824ad8411ac76dcfe8 --- src/armnnSerializer/Serializer.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/armnnSerializer/Serializer.cpp') diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 81091bca85..5d06958054 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -61,18 +61,17 @@ serializer::ArgMinMaxFunction GetFlatBufferArgMinMaxFunction(armnn::ArgMinMaxFun } } -uint32_t SerializerVisitor::GetSerializedId(unsigned int guid) +uint32_t SerializerVisitor::GetSerializedId(armnn::LayerGuid guid) { - std::pair guidPair(guid, m_layerId); - if (m_guidMap.empty()) { - m_guidMap.insert(guidPair); + m_guidMap.insert(std::make_pair(guid, m_layerId)); } else if (m_guidMap.find(guid) == m_guidMap.end()) { - guidPair.second = ++m_layerId; - m_guidMap.insert(guidPair); + ++m_layerId; + m_guidMap.insert(std::make_pair(guid, m_layerId)); + return m_layerId; } return m_guidMap[guid]; @@ -88,7 +87,7 @@ void SerializerVisitor::VisitInputLayer(const armnn::IConnectableLayer* layer, L auto flatBufferInputBindableBaseLayer = serializer::CreateBindableLayerBase(m_flatBufferBuilder, flatBufferInputBaseLayer, id); - // Push layer Guid to outputIds. + // Push layer index to outputIds. m_inputIds.push_back(GetSerializedId(layer->GetGuid())); // Create the FlatBuffer InputLayer @@ -108,7 +107,7 @@ void SerializerVisitor::VisitOutputLayer(const armnn::IConnectableLayer* layer, auto flatBufferOutputBindableBaseLayer = serializer::CreateBindableLayerBase(m_flatBufferBuilder, flatBufferOutputBaseLayer, id); - // Push layer Guid to outputIds. + // Push layer index to outputIds. m_outputIds.push_back(GetSerializedId(layer->GetGuid())); // Create the FlatBuffer OutputLayer -- cgit v1.2.1