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/neon/test/NeonTensorHandleTests.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/backends/neon/test/NeonTensorHandleTests.cpp') diff --git a/src/backends/neon/test/NeonTensorHandleTests.cpp b/src/backends/neon/test/NeonTensorHandleTests.cpp index eabf3c8e9a..2e6854a331 100644 --- a/src/backends/neon/test/NeonTensorHandleTests.cpp +++ b/src/backends/neon/test/NeonTensorHandleTests.cpp @@ -419,8 +419,10 @@ TEST_CASE("SplitteronXorYNoPaddingRequiredTest") inputTensors.reserve(inputTensorData.size()); for (auto&& it : inputTensorData) { + TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(networkIdentifier, it.first); + inputTensorInfo.SetConstant(true); inputTensors.push_back({it.first, - ConstTensor(runtime->GetInputTensorInfo(networkIdentifier, it.first), it.second.data())}); + ConstTensor(inputTensorInfo, it.second.data())}); } OutputTensors outputTensors; outputTensors.reserve(expectedOutputData.size()); @@ -594,8 +596,10 @@ TEST_CASE("SplitteronXorYPaddingRequiredTest") inputTensors.reserve(inputTensorData.size()); for (auto&& it : inputTensorData) { + TensorInfo inputTensorInfo = runtime->GetInputTensorInfo(networkIdentifier, it.first); + inputTensorInfo.SetConstant(true); inputTensors.push_back({it.first, - ConstTensor(runtime->GetInputTensorInfo(networkIdentifier, it.first), it.second.data())}); + ConstTensor(inputTensorInfo, it.second.data())}); } OutputTensors outputTensors; outputTensors.reserve(expectedOutputData.size()); -- cgit v1.2.1