From a8d572dc48f47e66cd7abd6ad9b2d3a0f40ea94b Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Thu, 7 Feb 2019 17:51:09 +0000 Subject: IVGCVSW-2607 Implement Input range override mechanism * Added the OverrideInputRange method to the Quantizer API * Created OverrideInputRangeVisitor to implement the override mechanism * Moved the quantizer utility functions to the new NetworkQuantizerUtils files * Moved the map of quantization ranges out of the StaticRangeVisitor and into the NetworkQuantizer * Added unit tests * Code refactoring and cleanup Change-Id: I9c1d006c1b6a35fbc04584a832fbe489f8f9276d Signed-off-by: Matteo Martincigh --- src/armnn/StaticRangeVisitor.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src/armnn/StaticRangeVisitor.cpp') diff --git a/src/armnn/StaticRangeVisitor.cpp b/src/armnn/StaticRangeVisitor.cpp index 1986e427f2..258d499279 100644 --- a/src/armnn/StaticRangeVisitor.cpp +++ b/src/armnn/StaticRangeVisitor.cpp @@ -12,6 +12,20 @@ namespace armnn { +StaticRangeVisitor::StaticRangeVisitor(std::unordered_map& guidToRangesMap) + : m_GuidToRangesMap(guidToRangesMap) +{} + +StaticRangeVisitor::MinMaxRange StaticRangeVisitor::GetRange(LayerGuid guid, unsigned int idx) const +{ + auto search = m_GuidToRangesMap.find(guid); + if (search == m_GuidToRangesMap.end()) + { + return DefaultRange(); + } + return search->second.at(idx); +} + void StaticRangeVisitor::SetRange(const IConnectableLayer* layer, unsigned int outputIdx, float min, float max) { auto& ranges = m_GuidToRangesMap[layer->GetGuid()]; @@ -23,20 +37,10 @@ void StaticRangeVisitor::SetRange(const IConnectableLayer* layer, unsigned int o ranges[outputIdx] = std::make_pair(min, max); } -StaticRangeVisitor::MinMaxRange StaticRangeVisitor::GetRange(LayerGuid guid, unsigned int idx) const -{ - auto found = m_GuidToRangesMap.find(guid); - if (found != m_GuidToRangesMap.end()) - { - return found->second.at(idx); - } - return DefaultRange(); -} - -void StaticRangeVisitor::VisitAdditionLayer(const IConnectableLayer *layer, const char *name) +void StaticRangeVisitor::VisitAdditionLayer(const IConnectableLayer* layer, const char* name) { SetRange(layer, 0, -20.f, 20.f); -}; +} void StaticRangeVisitor::VisitBatchNormalizationLayer(const IConnectableLayer* layer, const BatchNormalizationDescriptor& desc, @@ -55,9 +59,9 @@ void StaticRangeVisitor::VisitBatchNormalizationLayer(const IConnectableLayer* l SetRange(layer, 0, -15.0f, 15.0f); } -void StaticRangeVisitor::VisitActivationLayer(const IConnectableLayer *layer, +void StaticRangeVisitor::VisitActivationLayer(const IConnectableLayer* layer, const ActivationDescriptor& activationDescriptor, - const char *name) + const char* name) { switch (activationDescriptor.m_Function) { @@ -83,4 +87,4 @@ void StaticRangeVisitor::VisitActivationLayer(const IConnectableLayer *layer, } } -} //namespace armnn \ No newline at end of file +} //namespace armnn -- cgit v1.2.1