aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/NetworkQuantizerUtils.cpp
diff options
context:
space:
mode:
authorFerran Balaguer <ferran.balaguer@arm.com>2019-02-27 09:42:06 +0000
committerFerran Balaguer <ferran.balaguer@arm.com>2019-02-27 09:42:06 +0000
commitb2845655b7814470c2a52cd7d0bee01031615bfc (patch)
tree9bf986bc681100734ce3de60b1f5dde4c4f3702f /src/armnn/NetworkQuantizerUtils.cpp
parent7733c57b9bde599d133d8edab49cd7a9069db878 (diff)
downloadarmnn-b2845655b7814470c2a52cd7d0bee01031615bfc.tar.gz
IVGCVSW-2632 Fix RefMerger from QAsymm8 types with different quantization parameters
Change-Id: Ie67ce4966c5e5fef618876b027292da429de1485 Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Diffstat (limited to 'src/armnn/NetworkQuantizerUtils.cpp')
-rw-r--r--src/armnn/NetworkQuantizerUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/armnn/NetworkQuantizerUtils.cpp b/src/armnn/NetworkQuantizerUtils.cpp
index 1bec63b58c..551760f362 100644
--- a/src/armnn/NetworkQuantizerUtils.cpp
+++ b/src/armnn/NetworkQuantizerUtils.cpp
@@ -12,7 +12,7 @@
namespace armnn
{
-std::pair<int, float> ComputeQAsymmParams(int numBits, double min, double max)
+std::pair<float, int> ComputeQAsymmParams(int numBits, double min, double max)
{
BOOST_ASSERT_MSG(min < max, "min >= max will result in invalid quantization.");
double highest = (1 << numBits) - 1;
@@ -27,7 +27,7 @@ std::pair<int, float> ComputeQAsymmParams(int numBits, double min, double max)
// Clamp offset [0-highest]
offset = std::max(0.0, std::min(highest, offset));
- return std::make_pair(static_cast<int>(std::round(offset)), static_cast<float>(scale));
+ return std::make_pair(static_cast<float>(scale), static_cast<int>(std::round(offset)));
}
ConstTensor CreateQuantizedConst(const ConstTensor& tensor, std::vector<uint8_t>& backing)