commit c9a82a24359d8d401ca499fbadd4e3b331a53564
author Kevin May <kevin.may@arm.com> Tue Sep 08 15:50:18 2020 +0100
committer Kevin May <kevin.may@arm.com> Fri Sep 11 08:24:25 2020 +0000
tree 7f0c2477d51014881408acfa4eb289573c2288d0
parent 045f6be924240a560293a3a7a0ecae49bcf0d1fa

IVGCVSW-5245 Add Quantization operator=() function

* Add unit tests to check if Quantization info copied correctly

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I7bb7bde5d97e82c57252c6d5131fbe21ad3096d2

include/armnn/Tensor.hpp

diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp
index 69ffbd9..8814d89 100644
--- a/include/armnn/Tensor.hpp
+++ b/include/armnn/Tensor.hpp
@@ -235,6 +235,17 @@
                 (m_QuantizationDim == other.m_QuantizationDim));
         }
 
+        Quantization& operator=(const Quantization& other)
+        {
+            if(!(*this == other))
+            {
+                m_Scales = other.m_Scales;
+                m_Offset = other.m_Offset;
+                m_QuantizationDim = other.m_QuantizationDim;
+            }
+            return *this;
+        }
+
         std::vector<float>     m_Scales;
         Optional<int32_t>      m_Offset;
         Optional<unsigned int> m_QuantizationDim;

src/armnn/test/TensorTest.cpp

diff --git a/src/armnn/test/TensorTest.cpp b/src/armnn/test/TensorTest.cpp
index ed39255..a0b68ac 100644
--- a/src/armnn/test/TensorTest.cpp
+++ b/src/armnn/test/TensorTest.cpp
@@ -99,6 +99,69 @@
     BOOST_TEST(copy == m_TensorInfo);
 }
 
+BOOST_AUTO_TEST_CASE(CopyNoQuantizationTensorInfo)
+{
+    TensorInfo infoA;
+    infoA.SetShape({ 5, 6, 7, 8 });
+    infoA.SetDataType(DataType::QAsymmU8);
+
+    TensorInfo infoB;
+    infoB.SetShape({ 5, 6, 7, 8 });
+    infoB.SetDataType(DataType::QAsymmU8);
+    infoB.SetQuantizationScale(10.0f);
+    infoB.SetQuantizationOffset(5);
+    infoB.SetQuantizationDim(Optional<unsigned int>(1));
+
+    BOOST_TEST((infoA.GetShape() == TensorShape({ 5, 6, 7, 8 })));
+    BOOST_TEST((infoA.GetDataType() == DataType::QAsymmU8));
+    BOOST_TEST(infoA.GetQuantizationScale() == 1);
+    BOOST_TEST(infoA.GetQuantizationOffset() == 0);
+    BOOST_CHECK(!infoA.GetQuantizationDim().has_value());
+
+    BOOST_TEST(infoA != infoB);
+    infoA = infoB;
+    BOOST_TEST(infoA == infoB);
+
+    BOOST_TEST((infoA.GetShape() == TensorShape({ 5, 6, 7, 8 })));
+    BOOST_TEST((infoA.GetDataType() == DataType::QAsymmU8));
+    BOOST_TEST(infoA.GetQuantizationScale() == 10.0f);
+    BOOST_TEST(infoA.GetQuantizationOffset() == 5);
+    BOOST_CHECK(infoA.GetQuantizationDim().value() == 1);
+}
+
+BOOST_AUTO_TEST_CASE(CopyDifferentQuantizationTensorInfo)
+{
+    TensorInfo infoA;
+    infoA.SetShape({ 5, 6, 7, 8 });
+    infoA.SetDataType(DataType::QAsymmU8);
+    infoA.SetQuantizationScale(10.0f);
+    infoA.SetQuantizationOffset(5);
+    infoA.SetQuantizationDim(Optional<unsigned int>(1));
+
+    TensorInfo infoB;
+    infoB.SetShape({ 5, 6, 7, 8 });
+    infoB.SetDataType(DataType::QAsymmU8);
+    infoB.SetQuantizationScale(11.0f);
+    infoB.SetQuantizationOffset(6);
+    infoB.SetQuantizationDim(Optional<unsigned int>(2));
+
+    BOOST_TEST((infoA.GetShape() == TensorShape({ 5, 6, 7, 8 })));
+    BOOST_TEST((infoA.GetDataType() == DataType::QAsymmU8));
+    BOOST_TEST(infoA.GetQuantizationScale() == 10.0f);
+    BOOST_TEST(infoA.GetQuantizationOffset() == 5);
+    BOOST_CHECK(infoA.GetQuantizationDim().value() == 1);
+
+    BOOST_TEST(infoA != infoB);
+    infoA = infoB;
+    BOOST_TEST(infoA == infoB);
+
+    BOOST_TEST((infoA.GetShape() == TensorShape({ 5, 6, 7, 8 })));
+    BOOST_TEST((infoA.GetDataType() == DataType::QAsymmU8));
+    BOOST_TEST(infoA.GetQuantizationScale() == 11.0f);
+    BOOST_TEST(infoA.GetQuantizationOffset() == 6);
+    BOOST_CHECK(infoA.GetQuantizationDim().value() == 2);
+}
+
 void CheckTensor(const ConstTensor& t)
 {
     t.GetInfo();