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

1 files changed, 23 insertions, 1 deletions

diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_tensor.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_tensor.i
index 0edf67d618..d8ef37d762 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_tensor.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_tensor.i
@@ -111,7 +111,8 @@ public:
     TensorInfo(const TensorInfo& other);
 
     TensorInfo(const TensorShape& shape, DataType dataType,
-        float quantizationScale = 0.0f, int32_t quantizationOffset = 0);
+        float quantizationScale = 0.0f, int32_t quantizationOffset = 0,
+        bool isConstant = False);
 
     %feature("docstring",
     "
@@ -223,6 +224,26 @@ public:
     ") IsQuantized;
     bool IsQuantized() const;
 
+    %feature("docstring",
+    "
+    Returns true if the tensor info is constant.
+
+    Returns:
+        bool: True if the tensor info is constant.
+
+    ") IsConstant;
+    bool IsConstant() const;
+
+    %feature("docstring",
+    "
+    Sets the tensor info to be constant.
+    
+    Args:
+        IsConstant (bool): Sets tensor info to constant.
+
+    ") SetConstant;
+    void SetConstant(const bool IsConstant = True);
+
 
 
     %feature("docstring",
@@ -254,6 +275,7 @@ public:
                         + ", IsQuantized: " + std::to_string($self->IsQuantized())
                         + ", QuantizationScale: " + std::to_string( $self->GetQuantizationScale())
                         + ", QuantizationOffset: " + std::to_string($self->GetQuantizationOffset())
+                        + ", IsConstant: " + std::to_string($self->IsConstant())
                         + ", NumDimensions: " + std::to_string($self->GetNumDimensions())
                         + ", NumElements: " + std::to_string($self->GetNumElements()) + "}";
         return tmp;