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/backendsCommon/test/SpaceToDepthEndToEndTestImpl.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/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp index 4e5baade27..e3b016ee94 100644 --- a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp @@ -34,7 +34,7 @@ armnn::INetworkPtr CreateSpaceToDepthNetwork(const armnn::TensorShape& inputShap // Builds up the structure of the network. INetworkPtr net(INetwork::Create()); - TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset); + TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset, true); armnnUtils::DataLayoutIndexed dimensionIndices(dataLayout); if (inputShape[dimensionIndices.GetHeightIndex()] % blockSize!=0 @@ -102,7 +102,7 @@ void SpaceToDepthNhwcEndToEndTest1(const std::vector<armnn::BackendId>& defaultB const unsigned int blockSize = 2; TensorShape inputShape{1, 2, 2, 1}; - TensorInfo inputTensorInfo(inputShape, DataType::Float32); + TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true); TensorShape outputShape{1, 1, 1, 4}; TensorInfo outputTensorInfo(outputShape, DataType::Float32); @@ -133,7 +133,7 @@ void SpaceToDepthNchwEndToEndTest1(const std::vector<armnn::BackendId>& defaultB const unsigned int blockSize = 2; TensorShape inputShape{1, 2, 2, 1}; - TensorInfo inputTensorInfo(inputShape, DataType::Float32); + TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true); TensorShape outputShape{1, 1, 1, 4}; TensorInfo outputTensorInfo(outputShape, DataType::Float32); @@ -167,7 +167,7 @@ void SpaceToDepthNhwcEndToEndTest2(const std::vector<armnn::BackendId>& defaultB TensorShape outputShape{1, 1, 1, 8}; TensorInfo outputTensorInfo(outputShape, DataType::Float32); - TensorInfo inputTensorInfo(inputShape, DataType::Float32); + TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true); std::vector<float> inputData = std::vector<float>( { @@ -197,7 +197,7 @@ void SpaceToDepthNchwEndToEndTest2(const std::vector<armnn::BackendId>& defaultB TensorShape inputShape{1, 2, 2, 2}; TensorShape outputShape{1, 1, 1, 8}; - TensorInfo inputTensorInfo(inputShape, DataType::Float32); + TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true); TensorInfo outputTensorInfo(outputShape, DataType::Float32); |