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 <matteo.martincigh@arm.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/armnn/NetworkQuantizer.hpp b/src/armnn/NetworkQuantizer.hpp
index 5543b3a444..2f7d36533c 100644
--- a/src/armnn/NetworkQuantizer.hpp
+++ b/src/armnn/NetworkQuantizer.hpp
@@ -9,6 +9,8 @@
 #include <armnn/INetworkQuantizer.hpp>
 #include <armnn/Types.hpp>
 
+#include <unordered_map>
+
 namespace armnn
 {
 
@@ -17,10 +19,17 @@ class NetworkQuantizer : public INetworkQuantizer
 public:
     NetworkQuantizer(INetwork* inputNetwork) : m_InputNetwork(inputNetwork) {}
 
+    void OverrideInputRange(LayerBindingId layerId, float min, float max) override;
     INetworkPtr ExportNetwork() override;
 
 private:
+    using MinMaxRange  = std::pair<float, float>;
+    using MinMaxRanges = std::vector<MinMaxRange>;
+
     INetwork* m_InputNetwork;
+
+    /// Mapping from Guid to an array of ranges for outputs
+    std::unordered_map<LayerGuid, MinMaxRanges> m_GuidToRangesMap;
 };
 
-} //namespace armnn
\ No newline at end of file
+} //namespace armnn