aboutsummaryrefslogtreecommitdiff
path: root/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp
diff options
context:
space:
mode:
authorCathal Corbett <cathal.corbett@arm.com>2021-10-22 11:12:07 +0100
committerDavid Monahan <david.monahan@arm.com>2021-11-08 19:05:11 +0000
commit5b8093c17044e8eaaaa42d96ba4902dee5791be4 (patch)
tree7f49f91e76f171041fe51c2c078b9271aa220b48 /src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp
parentd69cb904415621b066599dc20164bdb71558dc14 (diff)
downloadarmnn-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/InstanceNormalizationEndToEndTestImpl.cpp')
-rw-r--r--src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp
index d758137b3b..e715e6b187 100644
--- a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp
+++ b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp
@@ -36,7 +36,7 @@ armnn::INetworkPtr CreateInstanceNormalizationNetwork(const armnn::TensorShape&
// Builds up the structure of the network.
INetworkPtr net(INetwork::Create());
- TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset);
+ TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset, true);
InstanceNormalizationDescriptor instanceNormalizationDesc;
instanceNormalizationDesc.m_Gamma = gamma;
@@ -104,7 +104,7 @@ void InstanceNormalizationNhwcEndToEndTest1(const std::vector<armnn::BackendId>&
const float gamma = 1.0f;
TensorShape inputShape{2, 2, 2, 2};
- TensorInfo inputTensorInfo(inputShape, DataType::Float32);
+ TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true);
TensorShape outputShape{2, 2, 2, 2};
TensorInfo outputTensorInfo(outputShape, DataType::Float32);
@@ -174,7 +174,7 @@ void InstanceNormalizationNchwEndToEndTest1(const std::vector<armnn::BackendId>&
const float gamma = 1.0f;
TensorShape inputShape{2, 2, 2, 2};
- TensorInfo inputTensorInfo(inputShape, DataType::Float32);
+ TensorInfo inputTensorInfo(inputShape, DataType::Float32, 0.0f, 0, true);
TensorShape outputShape{2, 2, 2, 2};
TensorInfo outputTensorInfo(outputShape, DataType::Float32);
@@ -248,7 +248,7 @@ void InstanceNormalizationNhwcEndToEndTest2(const std::vector<armnn::BackendId>&
TensorShape outputShape{2, 2, 2, 2};
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>(
{
@@ -319,7 +319,7 @@ void InstanceNormalizationNchwEndToEndTest2(const std::vector<armnn::BackendId>&
TensorShape outputShape{2, 2, 2, 2};
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>(
{