diff options
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Layer.cpp | 12 | ||||
| -rw-r--r-- | src/armnn/QuantizerVisitor.cpp | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index dbeda22ca0..1efe7e412f 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.cpp @@ -5,6 +5,7 @@ #include "Layer.hpp" #include "Graph.hpp" +#include <ProfilingService.hpp> #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/CpuTensorHandle.hpp> @@ -184,15 +185,6 @@ EdgeStrategy OutputSlot::GetEdgeStrategyForConnection(unsigned int connectionIdx return m_EdgeStrategies[connectionIdx]; } -namespace { -LayerGuid GenerateLayerGuid() -{ - // Note: Not thread safe. - static LayerGuid newGuid=0; - return newGuid++; -} -} // namespace - Layer::Layer(unsigned int numInputSlots, unsigned int numOutputSlots, LayerType type, @@ -202,7 +194,7 @@ Layer::Layer(unsigned int numInputSlots, , m_LayerName(name ? name : "") , m_Type(type) , m_BackendId() -, m_Guid(GenerateLayerGuid()) +, m_Guid(profiling::ProfilingService::Instance().NextGuid()) { m_InputSlots.reserve(numInputSlots); for (unsigned int i = 0; i < numInputSlots; ++i) diff --git a/src/armnn/QuantizerVisitor.cpp b/src/armnn/QuantizerVisitor.cpp index 8a3d4f2990..4b80b02e34 100644 --- a/src/armnn/QuantizerVisitor.cpp +++ b/src/armnn/QuantizerVisitor.cpp @@ -109,8 +109,8 @@ ConstTensor QuantizerVisitor::CreateQuantizedBias(const IConnectableLayer* srcLa void QuantizerVisitor::RecordLayer(const IConnectableLayer* srcLayer, IConnectableLayer* quantizedLayer) { - m_OriginalToQuantizedGuidMap[srcLayer->GetGuid()] = quantizedLayer->GetGuid(); - m_QuantizedGuidToLayerMap[quantizedLayer->GetGuid()] = quantizedLayer; + m_OriginalToQuantizedGuidMap.insert(std::make_pair(srcLayer->GetGuid(), quantizedLayer->GetGuid())); + m_QuantizedGuidToLayerMap.insert(std::make_pair(quantizedLayer->GetGuid(), quantizedLayer)); } void QuantizerVisitor::VisitAbsLayer(const IConnectableLayer* layer, const char* name) |