From 8eb256065f0e75ecf8e427d56955e2bac117c2d7 Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Mon, 9 Mar 2020 12:13:48 +0000 Subject: IVGCVSW-4482 Remove boost::ignore_unused !referencetests:229377 Signed-off-by: Jan Eilers Change-Id: Ia9b360b4a057fe7bbce5b268092627c09a0dba82 --- src/backends/backendsCommon/test/BackendProfilingTests.cpp | 7 ++++--- .../backendsCommon/test/IsLayerSupportedTestImpl.hpp | 12 ++++++------ src/backends/backendsCommon/test/MockBackend.cpp | 2 +- src/backends/backendsCommon/test/TestDynamicBackend.cpp | 4 ++-- .../backendsCommon/test/layerTests/ActivationTestImpl.cpp | 12 ++++++------ .../backendsCommon/test/layerTests/AdditionTestImpl.cpp | 8 ++++---- .../backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp | 2 +- .../test/layerTests/BatchNormalizationTestImpl.cpp | 8 ++++---- .../test/layerTests/BatchToSpaceNdTestImpl.hpp | 2 +- .../backendsCommon/test/layerTests/ComparisonTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/ConcatTestImpl.cpp | 14 +++++++------- .../backendsCommon/test/layerTests/ConstantTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/Conv2dTestImpl.cpp | 10 +++++----- .../test/layerTests/ConvertFp16ToFp32TestImpl.cpp | 2 +- .../test/layerTests/ConvertFp32ToFp16TestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/DebugTestImpl.cpp | 2 +- .../test/layerTests/DepthToSpaceTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/DequantizeTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/DivisionTestImpl.cpp | 2 +- .../test/layerTests/FakeQuantizationTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/FloorTestImpl.cpp | 2 +- .../test/layerTests/FullyConnectedTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/GatherTestImpl.cpp | 2 +- .../test/layerTests/InstanceNormalizationTestImpl.cpp | 2 +- .../test/layerTests/L2NormalizationTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/LstmTestImpl.cpp | 10 +++++----- .../backendsCommon/test/layerTests/MaximumTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/MeanTestImpl.hpp | 2 +- .../backendsCommon/test/layerTests/MinimumTestImpl.cpp | 2 +- .../test/layerTests/MultiplicationTestImpl.cpp | 2 +- .../test/layerTests/NormalizationTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/PadTestImpl.cpp | 6 +++--- .../backendsCommon/test/layerTests/PermuteTestImpl.hpp | 2 +- .../backendsCommon/test/layerTests/Pooling2dTestImpl.cpp | 6 ++++-- .../backendsCommon/test/layerTests/PreluTestImpl.hpp | 2 +- .../backendsCommon/test/layerTests/QuantizeTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/ReshapeTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/ResizeTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/SliceTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/SoftmaxTestImpl.cpp | 2 +- .../test/layerTests/SpaceToBatchNdTestImpl.cpp | 2 +- .../test/layerTests/SpaceToDepthTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/SplitterTestImpl.cpp | 4 ++-- .../backendsCommon/test/layerTests/StackTestImpl.cpp | 2 +- .../test/layerTests/StridedSliceTestImpl.cpp | 2 +- .../test/layerTests/TransposeConvolution2dTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/TransposeTestImpl.hpp | 2 +- 48 files changed, 88 insertions(+), 85 deletions(-) (limited to 'src/backends/backendsCommon/test') diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 455533699d..b9e0e45c0a 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -14,6 +14,7 @@ #include "ProfilingUtils.hpp" #include "RequestCounterDirectoryCommandHandler.hpp" +#include #include #include #include @@ -56,7 +57,7 @@ public: /// Create and write a CounterDirectoryPacket from the parameters to the buffer. virtual void SendCounterDirectoryPacket(const ICounterDirectory& counterDirectory) { - boost::ignore_unused(counterDirectory); + armnn::IgnoreUnused(counterDirectory); } /// Create and write a PeriodicCounterCapturePacket from the parameters to the buffer. @@ -69,8 +70,8 @@ public: virtual void SendPeriodicCounterSelectionPacket(uint32_t capturePeriod, const std::vector& selectedCounterIds) { - boost::ignore_unused(capturePeriod); - boost::ignore_unused(selectedCounterIds); + armnn::IgnoreUnused(capturePeriod); + armnn::IgnoreUnused(selectedCounterIds); } std::vector GetTimestamps() diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 395a63d6e6..15608ccdd8 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -8,7 +8,7 @@ #include -#include +#include namespace { @@ -414,7 +414,7 @@ struct LayerTypePolicy \ static std::unique_ptr MakeDummyWorkload(armnn::IWorkloadFactory *factory, \ unsigned int nIn, unsigned int nOut) \ { \ - boost::ignore_unused(factory, nIn, nOut); \ + IgnoreUnused(factory, nIn, nOut); \ return std::unique_ptr(); \ } \ }; @@ -559,7 +559,7 @@ unsigned int GetNumOutputs(const armnn::Layer& layer) template<> unsigned int GetNumInputs(const armnn::Layer& layer) { - boost::ignore_unused(layer); + IgnoreUnused(layer); return 2; } @@ -613,7 +613,7 @@ bool IsLayerSupportedTest(FactoryType *factory, Tag) } catch(const armnn::InvalidArgumentException& e) { - boost::ignore_unused(e); + IgnoreUnused(e); // This is ok since we throw InvalidArgumentException when creating the dummy workload. return true; } @@ -644,12 +644,12 @@ bool IsLayerSupportedTest(FactoryType *factory, Tag) // InvalidArgumentException or UnimplementedException. catch(const armnn::InvalidArgumentException& e) { - boost::ignore_unused(e); + IgnoreUnused(e); return true; } catch(const armnn::UnimplementedException& e) { - boost::ignore_unused(e); + IgnoreUnused(e); return true; } catch(const std::exception& e) diff --git a/src/backends/backendsCommon/test/MockBackend.cpp b/src/backends/backendsCommon/test/MockBackend.cpp index b2388cf45a..8d40117741 100644 --- a/src/backends/backendsCommon/test/MockBackend.cpp +++ b/src/backends/backendsCommon/test/MockBackend.cpp @@ -108,7 +108,7 @@ IBackendInternal::IBackendContextPtr MockBackend::CreateBackendContext(const IRu IBackendInternal::IBackendProfilingContextPtr MockBackend::CreateBackendProfilingContext( const IRuntime::CreationOptions& options, IBackendProfilingPtr& backendProfiling) { - boost::ignore_unused(options); + IgnoreUnused(options); std::shared_ptr context = std::make_shared(backendProfiling); MockBackendProfilingService::Instance().SetProfilingContextPtr(context); diff --git a/src/backends/backendsCommon/test/TestDynamicBackend.cpp b/src/backends/backendsCommon/test/TestDynamicBackend.cpp index cbfe09377e..5018b4459d 100644 --- a/src/backends/backendsCommon/test/TestDynamicBackend.cpp +++ b/src/backends/backendsCommon/test/TestDynamicBackend.cpp @@ -7,7 +7,7 @@ #include -#include +#include constexpr const char* TestDynamicBackendId() { @@ -65,7 +65,7 @@ public: } IWorkloadFactoryPtr CreateWorkloadFactory(const IMemoryManagerSharedPtr& memoryManager) const override { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); return IWorkloadFactoryPtr{}; } ILayerSupportSharedPtr GetLayerSupport() const override diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp index 6993b9e9b1..319434e093 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp @@ -36,7 +36,7 @@ LayerTestResult BoundedReLuTestCommon( unsigned int inputChannels, unsigned int inputBatchSize) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int outputWidth = inputWidth; unsigned int outputHeight = inputHeight; unsigned int outputChannels = inputChannels; @@ -245,7 +245,7 @@ boost::multi_array BoundedReLuRandomInputTest( float upperBound, const armnn::ActivationDescriptor& activationDescriptor) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const armnn::TensorInfo inputTensorInfo = BoundedReLuRandomInputTestTraits::GetInputTensorInfo(); const armnn::TensorInfo outputTensorInfo = BoundedReLuRandomInputTestTraits::GetOutputTensorInfo(); @@ -310,7 +310,7 @@ LayerTestResult ConstantLinearActivationTestCommon( float qScale = 0.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int inputHeight = 20; unsigned int inputWidth = 17; unsigned int inputChannels = 3; @@ -402,7 +402,7 @@ LayerTestResult SimpleActivationTest( int32_t outOffset, const std::vector& outputExpectedData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); constexpr static unsigned int inputWidth = 16u; constexpr static unsigned int inputHeight = 1u; constexpr static unsigned int inputChannels = 1u; @@ -793,7 +793,7 @@ LayerTestResult SqrtNNTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const int inputDataSize = 120; std::vector inputData(inputDataSize); @@ -1148,7 +1148,7 @@ LayerTestResult CompareActivationTestImpl( float qScale = 0.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 82dc59b66b..bfe0282dc4 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp @@ -165,7 +165,7 @@ LayerTestResult AdditionBroadcastTestImpl( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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); @@ -248,7 +248,7 @@ LayerTestResult AdditionBroadcast1ElementTestImpl( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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); @@ -455,7 +455,7 @@ LayerTestResult AdditionAfterMaxPoolTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); // Create Initial Tensor // 1, 2, 3 @@ -563,7 +563,7 @@ LayerTestResult CompareAdditionTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 7bfccd64d2..20dcef5dd4 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -26,7 +26,7 @@ LayerTestResult ArgMinMaxTestCommon( const std::vector& outputData, int axis = 3) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 f64b06d84b..48f7257a2e 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -8,7 +8,7 @@ #include #include - +#include #include #include @@ -36,7 +36,7 @@ LayerTestResult BatchNormTestImpl( int32_t qOffset, armnn::DataLayout dataLayout) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); armnn::TensorInfo inputTensorInfo(inputOutputTensorShape, ArmnnType); armnn::TensorInfo outputTensorInfo(inputOutputTensorShape, ArmnnType); @@ -115,7 +115,7 @@ LayerTestResult BatchNormTestNhwcImpl( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const unsigned int width = 2; const unsigned int height = 3; @@ -589,7 +589,7 @@ LayerTestResult CompareBatchNormTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 12413667b9..2ba3a0c68c 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -39,7 +39,7 @@ LayerTestResult BatchToSpaceNdHelper( float scale = 1.0f, int32_t offset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 9f9944d6db..2156b0ee9e 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp @@ -43,7 +43,7 @@ LayerTestResult ComparisonTestImpl( float outQuantScale, int outQuantOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 9d590e3feb..f6f4b09f6a 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -126,7 +126,7 @@ template void PermuteTensorData( const T * inputData, std::vector& outputData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); BOOST_ASSERT_MSG(inputData != nullptr, "inputData must not be null"); if (inputData == nullptr) { @@ -178,7 +178,7 @@ template void PermuteInputsForConcat( unsigned int & concatDim, TensorInfo & outputTensorInfo) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); BOOST_ASSERT_MSG(inputTensorInfos.size() > 1, "Expecting more than one tensor to be concatenated here"); @@ -1918,7 +1918,7 @@ LayerTestResult ConcatDifferentInputOutputQParamTest( const IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool useSubtensor) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); // Defines the tensor descriptors. TensorInfo outputTensorInfo({ 3, 6, 3 }, ArmnnType); @@ -2073,7 +2073,7 @@ LayerTestResult ConcatTest( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int outputWidth = 3; unsigned int outputHeight = 6; @@ -2346,7 +2346,7 @@ LayerTestResult ConcatUint8DifferentQParamsTest( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int outputWidth = 3; unsigned int outputHeight = 6; @@ -2491,7 +2491,7 @@ LayerTestResult ConcatUint8Test( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int outputWidth = 3; unsigned int outputHeight = 6; @@ -2629,7 +2629,7 @@ LayerTestResult ConcatUint16Test( IWorkloadFactory& workloadFactory, const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int outputWidth = 3; unsigned int outputHeight = 6; diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index d11004c069..7a8aac4686 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp @@ -28,7 +28,7 @@ LayerTestResult ConstantTestImpl( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 669398fb54..89cdd96e37 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -8,7 +8,7 @@ #include #include - +#include #include #include @@ -217,7 +217,7 @@ LayerTestResult SimpleConvolution2dTestImpl( uint32_t dilationX = 1, uint32_t dilationY = 1) { - boost::ignore_unused(memoryManager); + armnn::IgnoreUnused(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,7 +381,7 @@ LayerTestResult SimpleConvolution2dNhwcTestImpl( uint32_t strideX = 1, uint32_t strideY = 1) { - boost::ignore_unused(qScale, qOffset); + armnn::IgnoreUnused(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]); @@ -587,7 +587,7 @@ LayerTestResult SimpleConvolution2d3x3NhwcTestCommon( bool biasEnabled, armnn::DataLayout dataLayout) { - boost::ignore_unused(biasEnabled); + armnn::IgnoreUnused(biasEnabled); // Use common single-batch 5x5 image. armnn::TensorInfo inputDesc({1, 3, 4, 1}, ArmnnType); @@ -640,7 +640,7 @@ LayerTestResult SimpleConvolution2d3x3Stride2x2TestCommon( bool biasEnabled, const armnn::DataLayout& dataLayout) { - boost::ignore_unused(biasEnabled); + armnn::IgnoreUnused(biasEnabled); // Input is a single-batch, 1 channel, 5x5 image. armnn::TensorInfo inputDesc({1, 5, 5, 1}, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp index cea6efb549..8b3bbd82e2 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp @@ -17,7 +17,7 @@ LayerTestResult SimpleConvertFp16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 9f4eecac2e..1e604719e7 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp @@ -15,7 +15,7 @@ LayerTestResult SimpleConvertFp32ToFp16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 92c5d92fcc..149779b9ef 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp @@ -30,7 +30,7 @@ LayerTestResult DebugTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 4ddfb3089f..4d4a6bc156 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp @@ -29,7 +29,7 @@ LayerTestResult DepthToSpaceTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 91d56bb492..0a4bdb8124 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp @@ -26,7 +26,7 @@ LayerTestResult DequantizeTestImpl( const std::vector& expectedOutputData, armnn::DequantizeQueueDescriptor descriptor) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 223beb49e8..2359f777b8 100644 --- a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.cpp @@ -20,7 +20,7 @@ LayerTestResult DivisionByZeroTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 d905bde7a0..905f97b968 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp @@ -17,7 +17,7 @@ LayerTestResult FakeQuantizationTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 ebad7fc91c..444809f69b 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp @@ -16,7 +16,7 @@ LayerTestResult SimpleFloorTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 7c6122e5fa..43bcfb1d76 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp @@ -34,7 +34,7 @@ LayerTestResult SimpleFullyConnectedTestImpl( bool biasEnabled, bool transposeWeights) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 68410559f7..47adb22fe7 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp @@ -31,7 +31,7 @@ LayerTestResult GatherTestImpl( const std::vector& indicesData, const std::vector& outputData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 ae28bc03f3..a13198b2f9 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -34,7 +34,7 @@ LayerTestResult InstanceNormTestImpl( float qScale = 0.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 e500a126f6..4d98e236d3 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -33,7 +33,7 @@ LayerTestResult L2NormalizationTestImpl( const armnn::DataLayout layout, float epsilon = 1e-12f) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 392983c311..208bed24a5 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -36,7 +36,7 @@ LayerTestResult LogSoftmaxTestImpl( float qScale = 1.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 b12df8a2b9..50ef5c9758 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp @@ -142,7 +142,7 @@ LstmNoCifgNoPeepholeNoProjectionTestImpl( int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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,7 +345,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workl int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int batchSize = 2; unsigned int outputSize = 16; unsigned int inputSize = 5; @@ -1060,7 +1060,7 @@ LayerTestResult LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); bool cifgEnabled = true; bool peepholeEnabled = true; bool projectionEnabled = false; @@ -1285,7 +1285,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionWithLayerNormTestImpl(armnn::IWorkloadF int32_t qOffset = 0, armnn::DataType constantDataType = armnn::DataType::Float32) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int batchSize = 2; unsigned int outputSize = 3; unsigned int inputSize = 5; @@ -1552,7 +1552,7 @@ LayerTestResult QuantizedLstmTestImpl( const boost::multi_array& input, const boost::multi_array& outputExpected) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 5147cffddb..0e66d9fecd 100644 --- a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.cpp @@ -19,7 +19,7 @@ std::unique_ptr CreateWorkload( LayerTestResult MaximumSimpleTest(armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 b8eae1c93e..cd7b22ea42 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -28,7 +28,7 @@ LayerTestResult MeanTestHelper( float scale = 1.0f, int32_t offset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 a0a4029115..ae54746ad8 100644 --- a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.cpp @@ -20,7 +20,7 @@ LayerTestResult MinimumBroadcast1ElementTest1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 d32e0cf89b..1a9cf5b173 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp @@ -401,7 +401,7 @@ LayerTestResult CompareMultiplicationTest( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 ef828555fa..ef3a45b391 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp @@ -24,7 +24,7 @@ LayerTestResult SimpleNormalizationTestImpl( armnn::NormalizationAlgorithmChannel normChannel, armnn::NormalizationAlgorithmMethod normMethod) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 9239c665eb..69c651b5cd 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp @@ -24,7 +24,7 @@ LayerTestResult Pad2dTestCommon( int32_t qOffset, const float customPaddingValue) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const armnn::TensorShape inputShape{ 3, 3 }; const armnn::TensorShape outputShape{ 7, 7 }; @@ -96,7 +96,7 @@ LayerTestResult Pad3dTestCommon( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const armnn::TensorShape inputShape{ 2, 2, 2 }; const armnn::TensorShape outputShape{ 3, 5, 6 }; @@ -180,7 +180,7 @@ LayerTestResult Pad4dTestCommon( float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 9460592888..71e15334e7 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -25,7 +25,7 @@ LayerTestResult SimplePermuteTestImpl( const std::vector& inputData, const std::vector& outputExpectedData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 b58e9826b8..89e46fbdb1 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include #include @@ -38,7 +40,7 @@ LayerTestResult SimplePooling2dTestImpl( const boost::multi_array& input, const boost::multi_array& outputExpected) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); const armnn::DataLayout dataLayout = descriptor.m_DataLayout; const armnnUtils::DataLayoutIndexed dimensionIndices = dataLayout; auto heightIndex = dimensionIndices.GetHeightIndex(); @@ -740,7 +742,7 @@ LayerTestResult ComparePooling2dTestCommon( float qScale = 1.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 7138b46f88..3b6c2d8412 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -24,7 +24,7 @@ LayerTestResult PreluTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); armnn::TensorInfo inputTensorInfo ({ 1, 2, 2, 3 }, ArmnnType); armnn::TensorInfo alphaTensorInfo ({ 1, 1, 1, 3 }, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index e8996d4a51..673bfef678 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp @@ -29,7 +29,7 @@ LayerTestResult QuantizeTestImpl( const std::vector& expectedOutputData, armnn::QuantizeQueueDescriptor descriptor) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 894ece65a5..5ed947d8c3 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp @@ -23,7 +23,7 @@ LayerTestResult SimpleReshapeTestImpl( const std::vector& inputData, const std::vector& outputExpectedData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 a6e0ca19a5..e95f18b7a5 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -73,7 +73,7 @@ LayerTestResult ResizeTestImpl( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const ResizeTestParams& params) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); armnn::TensorInfo inputInfo(params.m_InputShape, ArmnnType); armnn::TensorInfo outputInfo(params.m_OutputShape, ArmnnType); diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp index 09f15c022e..df3b6238c5 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp @@ -29,7 +29,7 @@ LayerTestResult SliceTestImpl( const float qScale = 1.0f, const int qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 044589b9d2..772ae2ccc7 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp @@ -65,7 +65,7 @@ LayerTestResult SimpleSoftmaxBaseTestImpl( const std::vector& inputData, int axis = 1) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 ed35413e1e..d1bc2a950f 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp @@ -31,7 +31,7 @@ LayerTestResult SpaceToBatchNdTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 bf2f48ca61..c6a5bbed0e 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp @@ -31,7 +31,7 @@ LayerTestResult SpaceToDepthTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 f55aca1baa..88b18b9732 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp @@ -24,7 +24,7 @@ std::vector> SplitterTestCommon( float qScale = 0.0f, int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); unsigned int inputWidth = 5; unsigned int inputHeight = 6; unsigned int inputChannels = 3; @@ -257,7 +257,7 @@ LayerTestResult CopyViaSplitterTestImpl( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, float qScale, int32_t qOffset) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 45dff96ea7..eeaa846972 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -30,7 +30,7 @@ LayerTestResult StackTestHelper( const std::vector>& inputData, const std::vector& outputExpectedData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 63a95b1008..b857a1b23b 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp @@ -29,7 +29,7 @@ LayerTestResult StridedSliceTestImpl( const float qScale = 1.0f, const int32_t qOffset = 0) { - boost::ignore_unused(memoryManager); + IgnoreUnused(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 378ec46bd1..07f52584ca 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -51,7 +51,7 @@ void TransposeConvolution2dTestImpl(armnn::IWorkloadFactory& workloadFactory, const TensorData& weights, const armnn::Optional>& biases) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); using namespace armnn; VerifyInputTensorData(input, "input"); diff --git a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp index 3949dcc142..0e0f317a3e 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp @@ -25,7 +25,7 @@ LayerTestResult SimpleTransposeTestImpl( const std::vector& inputData, const std::vector& outputExpectedData) { - boost::ignore_unused(memoryManager); + IgnoreUnused(memoryManager); auto input = MakeTensor(inputTensorInfo, inputData); LayerTestResult ret(outputTensorInfo); -- cgit v1.2.1