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, 84 insertions, 25 deletions

diff --git a/src/backends/neon/test/NeonFallbackTests.cpp b/src/backends/neon/test/NeonFallbackTests.cpp
index e7a56a4848..ae6cfae3fa 100644
--- a/src/backends/neon/test/NeonFallbackTests.cpp
+++ b/src/backends/neon/test/NeonFallbackTests.cpp
@@ -107,11 +107,18 @@ TEST_CASE("FallbackImportToCpuAcc")
         11.0f, 9.0f, 7.0f, 5.0f, 3.0f, 1.0f, -1.0f, -3.0f, -5.0f, -7.0f, -9.0f, -11.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), inputData2.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, inputData2.data()) }
     };
     OutputTensors outputTensors
     {
@@ -238,10 +245,15 @@ TEST_CASE("FallbackPaddingCopyToCpuAcc")
         6.0f, 12.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) }
     };
     OutputTensors outputTensors
     {
@@ -374,11 +386,18 @@ TEST_CASE("FallbackImportFromCpuAcc")
         13.0f, 11.0f, 11.0f, 9.0f, 7.0f, 7.0f, 7.0f, 5.0f, 5.0f, 3.0f, 3.0f, -5.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), inputData2.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, inputData2.data()) }
     };
     OutputTensors outputTensors
     {
@@ -505,10 +524,15 @@ TEST_CASE("FallbackPaddingCopyFromCpuAcc")
         5.0f, 15.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) }
     };
     OutputTensors outputTensors
     {
@@ -639,11 +663,18 @@ TEST_CASE("FallbackDisableImportFromCpuAcc")
         13.0f, 11.0f, 11.0f, 9.0f, 7.0f, 7.0f, 7.0f, 5.0f, 5.0f, 3.0f, 3.0f, -5.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), inputData2.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, inputData2.data()) }
     };
     OutputTensors outputTensors
     {
@@ -784,11 +815,18 @@ TEST_CASE("NeonImportEnabledFallbackToCl")
     auto* intputPtr = reinterpret_cast<float*>(alignedInputPtr);
     std::copy(inputData2.begin(), inputData2.end(), intputPtr);
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), alignedInputPtr) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, alignedInputPtr) }
     };
     OutputTensors outputTensors
     {
@@ -910,11 +948,18 @@ TEST_CASE("NeonImportDisabledFallbackToCl")
         11.0f, 9.0f, 7.0f, 5.0f, 3.0f, 1.0f, -1.0f, -3.0f, -5.0f, -7.0f, -9.0f, -11.0f
     };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), inputData2.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, inputData2.data()) }
     };
     OutputTensors outputTensors
     {
@@ -1061,11 +1106,18 @@ TEST_CASE("NeonImportEnabledFallbackSubgraphToCl")
     auto* intputPtr = reinterpret_cast<float*>(alignedInputPtr);
     std::copy(inputData2.begin(), inputData2.end(), intputPtr);
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), alignedInputPtr) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, alignedInputPtr) }
     };
     OutputTensors outputTensors
     {
@@ -1200,11 +1252,18 @@ TEST_CASE("NeonImportDisableFallbackSubgraphToCl")
 
     std::vector<float> expectedOutput{ 11.0f, -1.0f };
 
+    armnn::TensorInfo inputTensorInfo0 = runtime->GetInputTensorInfo(netId, 0);
+    armnn::TensorInfo inputTensorInfo1 = runtime->GetInputTensorInfo(netId, 1);
+    armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 2);
+    inputTensorInfo0.SetConstant(true);
+    inputTensorInfo1.SetConstant(true);
+    inputTensorInfo2.SetConstant(true);
+
     InputTensors inputTensors
     {
-        { 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData0.data()) },
-        { 1, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 1), inputData1.data()) },
-        { 2, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 2), inputData2.data()) }
+        { 0, armnn::ConstTensor(inputTensorInfo0, inputData0.data()) },
+        { 1, armnn::ConstTensor(inputTensorInfo1, inputData1.data()) },
+        { 2, armnn::ConstTensor(inputTensorInfo2, inputData2.data()) }
     };
     OutputTensors outputTensors
     {