diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2021-10-22 11:12:07 +0100 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2021-11-08 19:05:11 +0000 |
commit | 5b8093c17044e8eaaaa42d96ba4902dee5791be4 (patch) | |
tree | 7f49f91e76f171041fe51c2c078b9271aa220b48 /src/backends/reference | |
parent | d69cb904415621b066599dc20164bdb71558dc14 (diff) | |
download | armnn-5b8093c17044e8eaaaa42d96ba4902dee5791be4.tar.gz |
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
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/test/RefEndToEndTests.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp index dc4dcecd81..4444f5c361 100644 --- a/src/backends/reference/test/RefEndToEndTests.cpp +++ b/src/backends/reference/test/RefEndToEndTests.cpp @@ -133,9 +133,11 @@ TEST_CASE("Unsigned8") }; std::vector<uint8_t> outputData(5); + TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 0); + inputTensorInfo2.SetConstant(true); armnn::InputTensors inputTensors { - {0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData.data())} + {0, armnn::ConstTensor(inputTensorInfo2, inputData.data())} }; armnn::OutputTensors outputTensors { @@ -199,10 +201,12 @@ TEST_CASE("TrivialAdd") }; std::vector<float> outputData(12); + TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(netId, 0); + inputTensorInfo.SetConstant(true); InputTensors inputTensors { - {0,armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), input1Data.data())}, - {1,armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), input2Data.data())} + {0,armnn::ConstTensor(inputTensorInfo, input1Data.data())}, + {1,armnn::ConstTensor(inputTensorInfo, input2Data.data())} }; OutputTensors outputTensors { @@ -293,9 +297,11 @@ TEST_CASE("MultipleOutputs") std::vector<float> output2Data(inputData.size()); std::vector<float> output3Data(inputData.size()); + TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(netId, 0); + inputTensorInfo.SetConstant(true); InputTensors inputTensors { - {0,armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData.data())} + {0,armnn::ConstTensor(inputTensorInfo, inputData.data())} }; OutputTensors outputTensors { @@ -357,10 +363,12 @@ TEST_CASE("TrivialMin") }; std::vector<float> outputData(4); + TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(netId, 0); + inputTensorInfo.SetConstant(true); InputTensors inputTensors { - {0,armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), input1Data.data())}, - {1,armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), input2Data.data())} + {0,armnn::ConstTensor(inputTensorInfo, input1Data.data())}, + {1,armnn::ConstTensor(inputTensorInfo, input2Data.data())} }; OutputTensors outputTensors { |