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/profiling/test | |
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/profiling/test')
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 8 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.cpp | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index 0d6f8422fc..a96de66ecd 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -90,9 +90,11 @@ TEST_CASE("TestFileOnlyProfiling") outputData[i] = 3.0; } + 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 { @@ -213,9 +215,11 @@ TEST_CASE("DumpOutgoingValidFileEndToEnd") outputData[i] = 3.0; } + 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 { diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 79b8ea41da..e0d3dd717c 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -381,8 +381,8 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) // Convolution details TensorInfo inputInfo({ 1, 2, 5, 1 }, DataType::Float32); - TensorInfo weightInfo({ 3, 2, 3, 1 }, DataType::Float32); - TensorInfo biasInfo({ 3 }, DataType::Float32); + TensorInfo weightInfo({ 3, 2, 3, 1 }, DataType::Float32, 0.0f, 0, true); + TensorInfo biasInfo({ 3 }, DataType::Float32, 0.0f, 0, true); TensorInfo outputInfo({ 1, 3, 7, 1 }, DataType::Float32); std::vector<float> weightsData{ 1.0f, 0.0f, 0.0f, @@ -742,9 +742,11 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) std::vector<float> inputData(inputInfo.GetNumElements()); std::vector<float> outputData(outputInfo.GetNumElements()); + 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 { |