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/armnn/test/RuntimeTests.cpp | |
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/armnn/test/RuntimeTests.cpp')
-rw-r--r-- | src/armnn/test/RuntimeTests.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index 397a545878..f055f2368b 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -97,8 +97,8 @@ TEST_CASE("RuntimePreImportInputs") std::vector<int> inputData2(4, 20); std::vector<int> output(4); - ConstTensor inputTensor1({{4}, armnn::DataType::Signed32}, inputData1.data()); - ConstTensor inputTensor2({{4}, armnn::DataType::Signed32}, inputData2.data()); + ConstTensor inputTensor1({{4}, armnn::DataType::Signed32, 0.0f, 0, true}, inputData1.data()); + ConstTensor inputTensor2({{4}, armnn::DataType::Signed32, 0.0f, 0, true}, inputData2.data()); Tensor outputTensor({{4}, armnn::DataType::Signed32}, output.data()); auto importedInputVec1 = runtime->ImportInputs(networkId, {{0, inputTensor1}}); @@ -177,7 +177,7 @@ TEST_CASE("RuntimePreImportOutputs") armnn::NetworkId networkId = 1; armnn::INetworkPtr testNetwork(armnn::INetwork::Create()); - TensorInfo tensorInfo{{4}, armnn::DataType::Float32}; + TensorInfo tensorInfo{{4}, armnn::DataType::Float32, 0.0f, 0, true}; auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer"); inputLayer1->GetOutputSlot(0).SetTensorInfo(tensorInfo); @@ -902,9 +902,11 @@ TEST_CASE("ProfilingEnableCpuRef") std::vector<float> inputData(16); std::vector<float> outputData(16); + TensorInfo inputTensorInfo = runtime.GetInputTensorInfo(netId, 0); + inputTensorInfo.SetConstant(true); InputTensors inputTensors { - {0, ConstTensor(runtime.GetInputTensorInfo(netId, 0), inputData.data())} + {0, ConstTensor(inputTensorInfo, inputData.data())} }; OutputTensors outputTensors { |