From 5b8093c17044e8eaaaa42d96ba4902dee5791be4 Mon Sep 17 00:00:00 2001 From: Cathal Corbett 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. * 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 Change-Id: I44e440dd0422c366d31bbdbc77ad2b4db0bde148 --- src/backends/backendsCommon/test/OptimizedNetworkTests.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/backends/backendsCommon/test/OptimizedNetworkTests.cpp') diff --git a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp index b0ee9bee32..6eecaabf55 100644 --- a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp +++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp @@ -370,8 +370,8 @@ TEST_CASE("OptimizeNetworkCopy") const armnn::TensorInfo inputInfo ({ 1, 5, 5, 1 }, armnn::DataType::Float32); const armnn::TensorInfo outputInfo({ 1, 2, 2, 1 }, armnn::DataType::Float32); - const armnn::TensorInfo weightsInfo({ 1, 3, 3, 1 }, armnn::DataType::Float32); - const armnn::TensorInfo biasesInfo ({ 1 }, armnn::DataType::Float32); + const armnn::TensorInfo weightsInfo({ 1, 3, 3, 1 }, armnn::DataType::Float32, 0.0f, 0, true); + const armnn::TensorInfo biasesInfo ({ 1 }, armnn::DataType::Float32, 0.0f, 0, true); std::vector weightsData = GenerateRandomData(weightsInfo.GetNumElements()); armnn::ConstTensor weights(weightsInfo, weightsData); @@ -443,10 +443,12 @@ TEST_CASE("OptimizeNetworkCopy") std::vector inputData = GenerateRandomData(runtime->GetInputTensorInfo(optNetId, 0).GetNumElements()); std::vector outputData(runtime->GetOutputTensorInfo(optNetId, 0).GetNumElements()); + armnn::TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(optNetId, 0); + inputTensorInfo.SetConstant(true); armnn::InputTensors inputTensors { { - 0 ,armnn::ConstTensor(runtime->GetInputTensorInfo(optNetId, 0), inputData.data()) + 0, armnn::ConstTensor(inputTensorInfo, inputData.data()) } }; armnn::OutputTensors outputTensors @@ -464,10 +466,12 @@ TEST_CASE("OptimizeNetworkCopy") armnn::NetworkId netId = networkIds[i]; std::vector copyOutputData(runtime->GetOutputTensorInfo(netId, 0).GetNumElements()); + armnn::TensorInfo inputTensorInfo2 = runtime->GetInputTensorInfo(netId, 0); + inputTensorInfo2.SetConstant(true); armnn::InputTensors copyInputTensors { { - 0, armnn::ConstTensor(runtime->GetInputTensorInfo(netId, 0), inputData.data()) + 0, armnn::ConstTensor(inputTensorInfo2, inputData.data()) } }; armnn::OutputTensors copyOutputTensors -- cgit v1.2.1