IVGCVSW-4018 Move QuantizeHelper.hpp to armnnUtils

* Moved QuntizeHelper.hpp to armnnUtils
* Reordered parameters for QuantizedVector and added default
  values for qScale and qOffset to make life easier when
  using the function for non-quantized types such as Float16

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I28c263dfa425f1316feccb4116839a84f5d568e5

1 files changed, 8 insertions, 6 deletions

diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp
index 90fd5e90dd..3f57ce83b2 100644
--- a/src/armnn/test/QuantizerTest.cpp
+++ b/src/armnn/test/QuantizerTest.cpp
@@ -4,17 +4,19 @@
 //
 
 #include <armnn/INetwork.hpp>
+#include <armnn/LayerVisitorBase.hpp>
 #include <armnn/Tensor.hpp>
-#include <armnnQuantizer/INetworkQuantizer.hpp>
 #include <armnn/Types.hpp>
 
-#include "armnn/LayerVisitorBase.hpp"
+#include <armnnQuantizer/INetworkQuantizer.hpp>
+
+#include <QuantizeHelper.hpp>
+
 #include "../Graph.hpp"
 #include "../Network.hpp"
 #include "../NetworkQuantizerUtils.hpp"
 #include "../OverrideInputRangeVisitor.hpp"
 #include "../RangeTracker.hpp"
-#include "../backends/backendsCommon/test/QuantizeHelper.hpp"
 #include "../../armnnQuantizer/CommandLineProcessor.hpp"
 
 #include <boost/test/unit_test.hpp>
@@ -2294,9 +2296,9 @@ std::vector<uint8_t> SetupQuantize(float value)
     std::vector<float> input({ value, 0.0f, 0.0f, 1.0f });
     const std::vector<float> &inputRef = input;
 
-    auto output = QuantizedVector<uint8_t>(inputInfo.GetQuantizationScale(),
-                                           inputInfo.GetQuantizationOffset(),
-                                           inputRef);
+    auto output = armnnUtils::QuantizedVector<uint8_t>(inputRef,
+                                                       inputInfo.GetQuantizationScale(),
+                                                       inputInfo.GetQuantizationOffset());
 
     return output;
 }