From c374ff06b9e9f45bcf48f4af6bda054f4b243cf6 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Tue, 10 Dec 2019 21:57:35 +0000 Subject: IVGCVSW-4246 Clean build of LayerTests with -Wextra Change-Id: If3d98e45a6e2fa8e1afd19a4052334335feacf63 Signed-off-by: Derek Lamberti --- src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp | 3 +++ .../backendsCommon/test/layerTests/ActivationTestImpl.cpp | 6 ++++++ .../backendsCommon/test/layerTests/AdditionTestImpl.cpp | 5 +++++ .../backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp | 1 + .../test/layerTests/BatchNormalizationTestImpl.cpp | 4 ++++ .../test/layerTests/BatchToSpaceNdTestImpl.hpp | 2 ++ .../backendsCommon/test/layerTests/ComparisonTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/ConcatTestImpl.cpp | 12 ++++++++++++ .../backendsCommon/test/layerTests/ConstantTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/Conv2dTestImpl.cpp | 5 +++++ .../test/layerTests/ConvertFp16ToFp32TestImpl.cpp | 1 + .../test/layerTests/ConvertFp32ToFp16TestImpl.cpp | 1 + .../backendsCommon/test/layerTests/DebugTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/DequantizeTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/DivisionTestImpl.cpp | 1 + .../test/layerTests/FakeQuantizationTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/FloorTestImpl.cpp | 1 + .../test/layerTests/FullyConnectedTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/GatherTestImpl.cpp | 1 + .../test/layerTests/InstanceNormalizationTestImpl.cpp | 1 + .../test/layerTests/L2NormalizationTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp | 1 + src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp | 5 +++++ .../backendsCommon/test/layerTests/MaximumTestImpl.cpp | 1 + src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp | 2 ++ .../backendsCommon/test/layerTests/MinimumTestImpl.cpp | 1 + .../test/layerTests/MultiplicationTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/NormalizationTestImpl.cpp | 1 + src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp | 3 +++ .../backendsCommon/test/layerTests/PermuteTestImpl.hpp | 1 + .../backendsCommon/test/layerTests/Pooling2dTestImpl.cpp | 2 ++ .../backendsCommon/test/layerTests/PreluTestImpl.hpp | 2 ++ .../backendsCommon/test/layerTests/QuantizeTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/ReshapeTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/ResizeTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/RsqrtTestImpl.cpp | 2 ++ .../backendsCommon/test/layerTests/SliceTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/SoftmaxTestImpl.cpp | 1 + .../test/layerTests/SpaceToBatchNdTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/SplitterTestImpl.cpp | 2 ++ .../backendsCommon/test/layerTests/StackTestImpl.cpp | 1 + .../backendsCommon/test/layerTests/StridedSliceTestImpl.cpp | 1 + .../test/layerTests/TransposeConvolution2dTestImpl.cpp | 1 + 45 files changed, 86 insertions(+) diff --git a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp index 31d102c519..ff76a38b08 100644 --- a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp @@ -25,6 +25,7 @@ LayerTestResult Abs2dTestCommon( const std::vector& inputValues, const std::vector& expectedOutputValues) { + boost::ignore_unused(memoryManager); auto inputTensor = MakeTensor(inputTensorInfo, ConvertToDataType(inputValues,inputTensorInfo)); LayerTestResult result(outputTensorInfo); @@ -108,6 +109,8 @@ LayerTestResult Abs3dTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + const armnn::TensorShape inputShape{ 3, 1, 2 }; const armnn::TensorShape outputShape{ 3, 1, 2 }; diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp index a45c6d5500..2f2d8dbd38 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp @@ -37,6 +37,7 @@ LayerTestResult BoundedReLuTestCommon( unsigned int inputChannels, unsigned int inputBatchSize) { + boost::ignore_unused(memoryManager); unsigned int outputWidth = inputWidth; unsigned int outputHeight = inputHeight; unsigned int outputChannels = inputChannels; @@ -245,6 +246,7 @@ boost::multi_array BoundedReLuRandomInputTest( float upperBound, const armnn::ActivationDescriptor& activationDescriptor) { + boost::ignore_unused(memoryManager); const armnn::TensorInfo inputTensorInfo = BoundedReLuRandomInputTestTraits::GetInputTensorInfo(); const armnn::TensorInfo outputTensorInfo = BoundedReLuRandomInputTestTraits::GetOutputTensorInfo(); @@ -309,6 +311,7 @@ LayerTestResult ConstantLinearActivationTestCommon( float qScale = 0.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); unsigned int inputHeight = 20; unsigned int inputWidth = 17; unsigned int inputChannels = 3; @@ -400,6 +403,7 @@ LayerTestResult SimpleActivationTest( int32_t outOffset, const std::vector& outputExpectedData) { + boost::ignore_unused(memoryManager); constexpr static unsigned int inputWidth = 16u; constexpr static unsigned int inputHeight = 1u; constexpr static unsigned int inputChannels = 1u; @@ -790,6 +794,7 @@ LayerTestResult SqrtNNTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); const int inputDataSize = 120; std::vector inputData(inputDataSize); @@ -1023,6 +1028,7 @@ LayerTestResult CompareActivationTestImpl( float qScale = 0.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); unsigned int width = 17; unsigned int height = 29; unsigned int channels = 2; diff --git a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp index 247821b293..a3a21ab131 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp @@ -165,6 +165,7 @@ LayerTestResult AdditionBroadcastTestImpl( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); armnn::TensorInfo inputTensorInfo1 = armnn::TensorInfo({1, 3, 2, 1}, ArmnnType); armnn::TensorInfo inputTensorInfo2 = armnn::TensorInfo({1, 1, 2, 3}, ArmnnType); armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({1, 3, 2, 3}, ArmnnType); @@ -247,6 +248,7 @@ LayerTestResult AdditionBroadcast1ElementTestImpl( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); armnn::TensorInfo inputTensorInfo1 = armnn::TensorInfo({1, 3, 2, 3}, ArmnnType); armnn::TensorInfo inputTensorInfo2 = armnn::TensorInfo({1, 1, 1, 1}, ArmnnType); armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({1, 3, 2, 3}, ArmnnType); @@ -453,6 +455,8 @@ LayerTestResult AdditionAfterMaxPoolTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + // Create Initial Tensor // 1, 2, 3 // 4, 5, 6 @@ -559,6 +563,7 @@ LayerTestResult CompareAdditionTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { + boost::ignore_unused(memoryManager); unsigned int batchSize = 4; unsigned int channels = 1; unsigned int height = 2; diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index 18c9e54f25..2733100d6c 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -27,6 +27,7 @@ LayerTestResult ArgMinMaxTestCommon( const std::vector& outputData, int axis = 3) { + boost::ignore_unused(memoryManager); auto inputTensor = MakeTensor(inputTensorInfo, ConvertToDataType(inputData, inputTensorInfo)); LayerTestResult result(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index 8471456ab6..7857b3531b 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -37,6 +37,7 @@ LayerTestResult BatchNormTestImpl( int32_t qOffset, armnn::DataLayout dataLayout) { + boost::ignore_unused(memoryManager); armnn::TensorInfo inputTensorInfo(inputOutputTensorShape, ArmnnType); armnn::TensorInfo outputTensorInfo(inputOutputTensorShape, ArmnnType); @@ -115,6 +116,8 @@ LayerTestResult BatchNormTestNhwcImpl( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); + const unsigned int width = 2; const unsigned int height = 3; const unsigned int channels = 2; @@ -587,6 +590,7 @@ LayerTestResult CompareBatchNormTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { + boost::ignore_unused(memoryManager); const unsigned int width = 2; const unsigned int height = 3; const unsigned int channels = 5; diff --git a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp index 79462d16e4..a5016ff234 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -40,6 +40,8 @@ LayerTestResult BatchToSpaceNdHelper( float scale = 1.0f, int32_t offset = 0) { + boost::ignore_unused(memoryManager); + armnn::TensorInfo inputTensorInfo(InputDim, inputShape, ArmnnType); armnn::TensorInfo outputTensorInfo(OutputDim, outputShape, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp index 1c54b85d06..c8272f47f0 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp @@ -44,6 +44,7 @@ LayerTestResult ComparisonTestImpl( float outQuantScale, int outQuantOffset) { + boost::ignore_unused(memoryManager); BOOST_ASSERT(shape0.GetNumDimensions() == NumDims); armnn::TensorInfo inputTensorInfo0(shape0, ArmnnInType, quantScale0, quantOffset0); diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp index 53bfc20590..57ed7542d2 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -127,6 +127,7 @@ template void PermuteTensorData( const T * inputData, std::vector& outputData) { + boost::ignore_unused(memoryManager); BOOST_ASSERT_MSG(inputData != nullptr, "inputData must not be null"); if (inputData == nullptr) { @@ -178,6 +179,7 @@ template void PermuteInputsForConcat( unsigned int & concatDim, TensorInfo & outputTensorInfo) { + boost::ignore_unused(memoryManager); BOOST_ASSERT_MSG(inputTensorInfos.size() > 1, "Expecting more than one tensor to be concatenated here"); @@ -1917,6 +1919,8 @@ LayerTestResult ConcatDifferentInputOutputQParamTest( const IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool useSubtensor) { + boost::ignore_unused(memoryManager); + // Defines the tensor descriptors. TensorInfo outputTensorInfo({ 3, 6, 3 }, ArmnnType); TensorInfo inputTensorInfo1({ 3, 6, 2 }, ArmnnType); @@ -2070,6 +2074,8 @@ LayerTestResult ConcatTest( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + unsigned int outputWidth = 3; unsigned int outputHeight = 6; unsigned int outputChannels = 3; @@ -2341,6 +2347,8 @@ LayerTestResult ConcatUint8DifferentQParamsTest( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + unsigned int outputWidth = 3; unsigned int outputHeight = 6; unsigned int outputChannels = 3; @@ -2484,6 +2492,8 @@ LayerTestResult ConcatUint8Test( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + unsigned int outputWidth = 3; unsigned int outputHeight = 6; unsigned int outputChannels = 3; @@ -2620,6 +2630,8 @@ LayerTestResult ConcatUint16Test( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + unsigned int outputWidth = 3; unsigned int outputHeight = 6; unsigned int outputChannels = 3; diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index 17908197c0..cfb62637d1 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp @@ -29,6 +29,7 @@ LayerTestResult ConstantTestImpl( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); constexpr unsigned int inputWidth = 3; constexpr unsigned int inputHeight = 4; constexpr unsigned int inputChannels = 3; diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index e825fffaea..a00fda7679 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -218,6 +218,7 @@ LayerTestResult SimpleConvolution2dTestImpl( uint32_t dilationX = 1, uint32_t dilationY = 1) { + boost::ignore_unused(memoryManager); unsigned int inputHeight = boost::numeric_cast(originalInput.shape()[2]); unsigned int inputWidth = boost::numeric_cast(originalInput.shape()[3]); unsigned int inputChannels = boost::numeric_cast(originalInput.shape()[1]); @@ -381,6 +382,7 @@ LayerTestResult SimpleConvolution2dNhwcTestImpl( uint32_t strideX = 1, uint32_t strideY = 1) { + boost::ignore_unused(qScale, qOffset); unsigned int inputNum = boost::numeric_cast(input.shape()[0]); unsigned int inputChannels = boost::numeric_cast(input.shape()[3]); unsigned int inputHeight = boost::numeric_cast(input.shape()[1]); @@ -586,6 +588,7 @@ LayerTestResult SimpleConvolution2d3x3NhwcTestCommon( bool biasEnabled, armnn::DataLayout dataLayout) { + boost::ignore_unused(biasEnabled); // Use common single-batch 5x5 image. armnn::TensorInfo inputDesc({1, 3, 4, 1}, ArmnnType); @@ -638,6 +641,8 @@ LayerTestResult SimpleConvolution2d3x3Stride2x2TestCommon( bool biasEnabled, const armnn::DataLayout& dataLayout) { + boost::ignore_unused(biasEnabled); + // Input is a single-batch, 1 channel, 5x5 image. armnn::TensorInfo inputDesc({1, 5, 5, 1}, ArmnnType); boost::multi_array input = MakeTensor(inputDesc, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp index 61eb03a6dd..5fe644ed1d 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp @@ -18,6 +18,7 @@ LayerTestResult SimpleConvertFp16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); using namespace half_float::literal; const armnn::TensorInfo inputTensorInfo({1, 3, 2, 3}, armnn::DataType::Float16); diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp index e5184e0c07..f758f4bcce 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp @@ -16,6 +16,7 @@ LayerTestResult SimpleConvertFp32ToFp16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); using namespace half_float::literal; const armnn::TensorInfo inputTensorInfo({1, 3, 2, 3}, armnn::DataType::Float32); diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp index 023bbaedd1..a4db5686b6 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp @@ -31,6 +31,7 @@ LayerTestResult DebugTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); if(armnn::IsQuantizedType()) { inputTensorInfo.SetQuantizationScale(qScale); diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp index 4e8c938823..5e5cba349e 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp @@ -30,6 +30,7 @@ LayerTestResult DepthToSpaceTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); if (descriptor.m_Parameters.m_DataLayout == armnn::DataLayout::NCHW) { PermuteTensorNhwcToNchw(inputInfo, inputData); diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp index 844b1090ce..fb225aeb54 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp @@ -27,6 +27,7 @@ LayerTestResult DequantizeTestImpl( const std::vector& expectedOutputData, armnn::DequantizeQueueDescriptor descriptor) { + boost::ignore_unused(memoryManager); boost::multi_array input = MakeTensor(inputTensorInfo, inputData); LayerTestResult ret(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp index 9a110a3d34..b908f96e9f 100644 --- a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp @@ -20,6 +20,7 @@ LayerTestResult DivisionByZeroTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); const unsigned int width = 2u; const unsigned int height = 2u; const unsigned int channelCount = 2u; diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp index 1ce9d2dac7..d25673b18b 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp @@ -18,6 +18,7 @@ LayerTestResult FakeQuantizationTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); constexpr unsigned int width = 2; constexpr unsigned int height = 3; diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp index 40ed8a20a8..a3d29dac71 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp @@ -16,6 +16,7 @@ LayerTestResult SimpleFloorTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); armnn::TensorInfo inputTensorInfo({1, 3, 2, 3}, ArmnnType); inputTensorInfo.SetQuantizationScale(0.1f); diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp index cf101eeee1..a3fe8582c8 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp @@ -35,6 +35,7 @@ LayerTestResult SimpleFullyConnectedTestImpl( bool biasEnabled, bool transposeWeights) { + boost::ignore_unused(memoryManager); std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp index 5e38e48191..1ccf51c7d2 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp @@ -32,6 +32,7 @@ LayerTestResult GatherTestImpl( const std::vector& indicesData, const std::vector& outputData) { + boost::ignore_unused(memoryManager); auto params = MakeTensor(paramsInfo, paramsData); auto indices = MakeTensor(indicesInfo, indicesData); diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp index c734a2d053..468a34dd62 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -35,6 +35,7 @@ LayerTestResult InstanceNormTestImpl( float qScale = 0.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); auto inputTensor = MakeTensor(inputTensorInfo, armnnUtils::QuantizedVector(inputValues, qScale, qOffset)); diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index d67f7b64aa..4b16921990 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -33,6 +33,7 @@ LayerTestResult L2NormalizationTestImpl( const armnn::DataLayout layout, float epsilon = 1e-12f) { + boost::ignore_unused(memoryManager); const armnn::TensorInfo inputTensorInfo(inputOutputTensorShape, ArmnnType, scale, offset); const armnn::TensorInfo outputTensorInfo(inputOutputTensorShape, ArmnnType, outScale, outOffset); diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp index 3a2f39aea6..dab8e49509 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -37,6 +37,7 @@ LayerTestResult LogSoftmaxTestImpl( float qScale = 1.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); LayerTestResult result(outputInfo); result.outputExpected = MakeTensor(outputInfo, armnnUtils::QuantizedVector(expectedOutputValues, qScale, qOffset)); diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp index 6cea777a25..e755aa54cb 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp @@ -143,6 +143,7 @@ LstmNoCifgNoPeepholeNoProjectionTestImpl( int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { + boost::ignore_unused(memoryManager); unsigned int batchSize = boost::numeric_cast(input.shape()[0]); unsigned int inputSize = boost::numeric_cast(input.shape()[1]); unsigned int outputSize = boost::numeric_cast(outputExpected.shape()[1]); @@ -345,6 +346,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workl int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { + boost::ignore_unused(memoryManager); unsigned int batchSize = 2; unsigned int outputSize = 16; unsigned int inputSize = 5; @@ -1059,6 +1061,7 @@ LayerTestResult LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { + boost::ignore_unused(memoryManager); bool cifgEnabled = true; bool peepholeEnabled = true; bool projectionEnabled = false; @@ -1283,6 +1286,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionWithLayerNormTestImpl(armnn::IWorkloadF int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { + boost::ignore_unused(memoryManager); unsigned int batchSize = 2; unsigned int outputSize = 3; unsigned int inputSize = 5; @@ -1549,6 +1553,7 @@ LayerTestResult QuantizedLstmTestImpl( const boost::multi_array& input, const boost::multi_array& outputExpected) { + boost::ignore_unused(memoryManager); auto numBatches = boost::numeric_cast(input.shape()[0]); auto inputSize = boost::numeric_cast(input.shape()[1]); auto outputSize = boost::numeric_cast(outputExpected.shape()[1]); diff --git a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp index 07e2befd66..0218697038 100644 --- a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp @@ -19,6 +19,7 @@ std::unique_ptr CreateWorkload( LayerTestResult MaximumSimpleTest(armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); const unsigned int width = 2u; const unsigned int height = 2u; const unsigned int channelCount = 2u; diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index bab7337ba7..b8eae1c93e 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -28,6 +28,8 @@ LayerTestResult MeanTestHelper( float scale = 1.0f, int32_t offset = 0) { + boost::ignore_unused(memoryManager); + armnn::TensorInfo inputTensorInfo(InputDim, inputShape, ArmnnType); armnn::TensorInfo outputTensorInfo(OutputDim, outputShape, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp index bf66950686..ed12c7fa2c 100644 --- a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp @@ -20,6 +20,7 @@ LayerTestResult MinimumBroadcast1ElementTest1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); unsigned int shape0[] = { 1, 2, 2, 2 }; unsigned int shape1[] = { 1, 1, 1, 1 }; diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp index 99b1b18c50..a39e6bd827 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp @@ -401,6 +401,7 @@ LayerTestResult CompareMultiplicationTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { + boost::ignore_unused(memoryManager); const unsigned int width = 16; const unsigned int height = 32; const unsigned int channelCount = 2; diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp index f65960fc86..ef828555fa 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp @@ -24,6 +24,7 @@ LayerTestResult SimpleNormalizationTestImpl( armnn::NormalizationAlgorithmChannel normChannel, armnn::NormalizationAlgorithmMethod normMethod) { + boost::ignore_unused(memoryManager); const unsigned int inputHeight = 2; const unsigned int inputWidth = 2; const unsigned int inputChannels = 1; diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp index 0f9a30e76a..3a8d2b7bbf 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp @@ -24,6 +24,7 @@ LayerTestResult Pad2dTestCommon( int32_t qOffset, const float customPaddingValue) { + boost::ignore_unused(memoryManager); const armnn::TensorShape inputShape{ 3, 3 }; const armnn::TensorShape outputShape{ 7, 7 }; @@ -95,6 +96,7 @@ LayerTestResult Pad3dTestCommon( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); const armnn::TensorShape inputShape{ 2, 2, 2 }; const armnn::TensorShape outputShape{ 3, 5, 6 }; @@ -178,6 +180,7 @@ LayerTestResult Pad4dTestCommon( float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); const armnn::TensorShape inputShape{ 2, 2, 3, 2 }; const armnn::TensorShape outputShape{ 4, 5, 7, 4 }; diff --git a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp index c5039a1202..83746f324f 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -26,6 +26,7 @@ LayerTestResult SimplePermuteTestImpl( const std::vector& inputData, const std::vector& outputExpectedData) { + boost::ignore_unused(memoryManager); auto input = MakeTensor(inputTensorInfo, inputData); LayerTestResult ret(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 2012dfd602..160e6582d5 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -38,6 +38,7 @@ LayerTestResult SimplePooling2dTestImpl( const boost::multi_array& input, const boost::multi_array& outputExpected) { + boost::ignore_unused(memoryManager); const armnn::DataLayout dataLayout = descriptor.m_DataLayout; const armnnUtils::DataLayoutIndexed dimensionIndices = dataLayout; auto heightIndex = dimensionIndices.GetHeightIndex(); @@ -739,6 +740,7 @@ LayerTestResult ComparePooling2dTestCommon( float qScale = 1.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); const unsigned int inputWidth = 16; const unsigned int inputHeight = 32; const unsigned int channelCount = 2; diff --git a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp index 99f3cd12dd..202134939b 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -25,6 +25,8 @@ LayerTestResult PreluTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); + armnn::TensorInfo inputTensorInfo ({ 1, 2, 2, 3 }, ArmnnType); armnn::TensorInfo alphaTensorInfo ({ 1, 1, 1, 3 }, ArmnnType); armnn::TensorInfo outputTensorInfo({ 1, 2, 2, 3 }, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index 481f6813b6..e23f92a5a9 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp @@ -30,6 +30,7 @@ LayerTestResult QuantizeTestImpl( const std::vector& expectedOutputData, armnn::QuantizeQueueDescriptor descriptor) { + boost::ignore_unused(memoryManager); boost::multi_array input = MakeTensor(inputTensorInfo, inputData); LayerTestResult ret(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp index bce24f06bc..485e7eab80 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp @@ -23,6 +23,7 @@ LayerTestResult SimpleReshapeTestImpl( const std::vector& inputData, const std::vector& outputExpectedData) { + boost::ignore_unused(memoryManager); auto input = MakeTensor(inputTensorInfo, inputData); LayerTestResult ret(outputTensorInfo); diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index 198c60a9ad..080155eebf 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -74,6 +74,7 @@ LayerTestResult ResizeTestImpl( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const ResizeTestParams& params) { + boost::ignore_unused(memoryManager); armnn::TensorInfo inputInfo(params.m_InputShape, ArmnnType); armnn::TensorInfo outputInfo(params.m_OutputShape, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.cpp index 3adb797bfc..24a3b21e96 100644 --- a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.cpp @@ -25,6 +25,7 @@ LayerTestResult Rsqrt2dTestCommon( const std::vector& inputValues, const std::vector& expectedOutputValues) { + boost::ignore_unused(memoryManager); auto inputTensor = MakeTensor(inputTensorInfo, ConvertToDataType(inputValues,inputTensorInfo)); LayerTestResult result(outputTensorInfo); @@ -97,6 +98,7 @@ LayerTestResult Rsqrt3dTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { + boost::ignore_unused(memoryManager); const armnn::TensorShape inputShape{ 3, 1, 2 }; const armnn::TensorShape outputShape{ 3, 1, 2 }; diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp index a60b1898ad..65b17164f3 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp @@ -30,6 +30,7 @@ LayerTestResult SliceTestImpl( const float qScale = 1.0f, const int qOffset = 0) { + boost::ignore_unused(memoryManager); if(armnn::IsQuantizedType()) { inputInfo.SetQuantizationScale(qScale); diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp index a5f6477a28..2a1aa76fce 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp @@ -66,6 +66,7 @@ LayerTestResult SimpleSoftmaxBaseTestImpl( const std::vector& inputData, int axis = 1) { + boost::ignore_unused(memoryManager); using std::exp; const float qScale = 1.f / 256.f; diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp index ea2130d325..2793875c5b 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp @@ -32,6 +32,7 @@ LayerTestResult SpaceToBatchNdTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); const armnn::PermutationVector NCHWToNHWC = {0, 3, 1, 2}; if (descriptor.m_Parameters.m_DataLayout == armnn::DataLayout::NHWC) { diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp index c4b11a7213..b6bf530da3 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp @@ -32,6 +32,7 @@ LayerTestResult SpaceToDepthTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); const armnn::PermutationVector NHWCToNCHW = {0, 2, 3, 1}; if (descriptor.m_Parameters.m_DataLayout == armnn::DataLayout::NCHW) diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp index 7aebdd0596..c8c2f9c7d1 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp @@ -25,6 +25,7 @@ std::vector> SplitterTestCommon( float qScale = 0.0f, int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); unsigned int inputWidth = 5; unsigned int inputHeight = 6; unsigned int inputChannels = 3; @@ -257,6 +258,7 @@ LayerTestResult CopyViaSplitterTestImpl( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, float qScale, int32_t qOffset) { + boost::ignore_unused(memoryManager); const armnn::TensorInfo tensorInfo({ 3, 6, 5 }, ArmnnType, qScale, qOffset); auto input = MakeTensor( tensorInfo, diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp index db9038ea13..1bf496750b 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -31,6 +31,7 @@ LayerTestResult StackTestHelper( const std::vector>& inputData, const std::vector& outputExpectedData) { + boost::ignore_unused(memoryManager); unsigned int numInputs = static_cast(inputData.size()); std::vector> inputs; for (unsigned int i = 0; i < numInputs; ++i) diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp index 8082be4d98..23f5df0df9 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp @@ -30,6 +30,7 @@ LayerTestResult StridedSliceTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { + boost::ignore_unused(memoryManager); if(armnn::IsQuantizedType()) { inputTensorInfo.SetQuantizationScale(qScale); diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index 71b08aa159..4b4894f4d2 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -52,6 +52,7 @@ void TransposeConvolution2dTestImpl(armnn::IWorkloadFactory& workloadFactory, const TensorData& weights, const armnn::Optional>& biases) { + boost::ignore_unused(memoryManager); using namespace armnn; VerifyInputTensorData(input, "input"); -- cgit v1.2.1