From 5b8093c17044e8eaaaa42d96ba4902dee5791be4 Mon Sep 17 00:00:00 2001
From: Cathal Corbett <cathal.corbett@arm.com>
Date: Fri, 22 Oct 2021 11:12:07 +0100
Subject: IVGCVSW-6420: Constant flag in tensor info is not set correctly

!android-nn-driver:6532
!armnn-internal-tests:372451

  * Made fix to 2 out of 3 ConstTensor() constructors in Tensor.hpp to
    throw InvalidArgumentException when TensorInfo isConstant parameter
    is false.
  * Added new ConstTensor() constructor in Tensor.cpp to accept vector<>.data()
    using template<typename MemoryType>.
  * Fixed runtime->GetOutputTensorInfo()/GetInputTensorInfo() methods and
    called submethods to return TensorInfo& rather than TensorInfo.
  * Fixed all failing unit tests for CpuRef/CpuAcc/GpuAcc to ensure any
    ConstTensor created has it's TensorInfo isConstant set to true.
  * Added unit tests in TensorTest.cpp to ensure ConstTensor constructors
    throw InvalidArgumentException when TensorInfo isConstat parameter is
    false.
  * Added unit test to ensure an empty ConstTensor constructor will set
    TensorInfo isConatant to true.
  * Indentation fixes.
  * Fix to arm_tensor.i to add isConstant parameter to TensorInfo
    constructor. Added methods IsConstant() and SetConstant().
  * Fix to const_tensor.py to throw ValueError when TensorInfo
    isConstant is set to false when constructing a ConstTensor.
  * Fixed PyArmnn unit tests to set TensorInfo isConstant to
    True when ConstTensor is used.
  * Added unit tests in test_const_tensor.py to ensure ConstTensor
    constructors throw ValueError when TensorInfo isConstat parameter
    is false.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I44e440dd0422c366d31bbdbc77ad2b4db0bde148
---
 include/armnn/Tensor.hpp | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'include/armnn/Tensor.hpp')

diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp
index 6f6abe187b..0095a03e52 100644
--- a/include/armnn/Tensor.hpp
+++ b/include/armnn/Tensor.hpp
@@ -334,27 +334,59 @@ public:
         this->GetInfo().SetConstant();
     }
 
-    /// Can be implicitly constructed from non-const Tensor.
+    /// ConstTensor implicitly constructed from non-const Tensor.
+    ///
+    /// @param other - reference to a constant Tensor.
+    ///
+    /// @throws InvalidArgumentException when Tensor parameter TensorInfo is non-constant.
     ConstTensor(const Tensor& other) : BaseTensor<const void*>(other.GetInfo(), other.GetMemoryArea())
     {
-        this->GetInfo().SetConstant();
+        if (!this->GetInfo().IsConstant())
+        {
+            throw InvalidArgumentException("Invalid attempt to construct ConstTensor "
+                                           "from Tensor due to non-constant TensorInfo");
+        }
     }
 
     /// Constructor from a backing container.
+    ///
     /// @param container - An stl-like container type which implements data() and size() methods.
     /// Presence of data() and size() is a strong indicator of the continuous memory layout of the container,
     /// which is a requirement for Tensor data. Tensor instances do not claim ownership of referenced memory regions,
     /// that is, no attempt will be made by ArmNN to free these memory regions automatically.
+    ///
+    /// @throws InvalidArgumentException when isConstant parameter of input TensorInfo is false.
     template < template<typename, typename...> class ContainerType, typename T, typename...ContainerArgs >
     ConstTensor(const TensorInfo& info, const ContainerType<T, ContainerArgs...>& container)
         : BaseTensor<const void*>(info, container.data())
     {
-        this->GetInfo().SetConstant();
+        if (!this->GetInfo().IsConstant())
+        {
+            throw InvalidArgumentException("Invalid attempt to construct ConstTensor from non-constant TensorInfo.");
+        }
         if (container.size() * sizeof(T) != info.GetNumBytes())
         {
             throw InvalidArgumentException("Container size is not correct");
         }
     }
+
+    /// ConstTensor constructed from TensorInfo and MemoryType template (a raw memory pointer).
+    ///
+    /// @param info - reference to a constant TensorInfo.
+    /// @param memoryArea - Region of CPU-addressable memory where tensor data will be stored. Must be valid while
+    /// workloads are on the fly. Tensor instances do not claim ownership of referenced memory regions, that is,
+    /// no attempt will be made by ArmNN to free these memory regions automatically.
+    ///
+    /// @throws InvalidArgumentException when TensorInfo isConstant parameter is false.
+    template<typename MemoryType>
+    ConstTensor(const TensorInfo& info, MemoryType memoryArea)
+        : BaseTensor<const void*>(info, memoryArea)
+    {
+        if (!this->GetInfo().IsConstant())
+        {
+            throw InvalidArgumentException("Invalid attempt to construct ConstTensor from non-constant TensorInfo.");
+        }
+    }
 };
 
 using InputTensors = std::vector<std::pair<LayerBindingId, class ConstTensor>>;
-- 
cgit v1.2.1