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/reference/workloads/ArgMinMax.cpp | 2 +- src/backends/reference/workloads/BaseIterator.hpp | 5 ++--- src/backends/reference/workloads/Dequantize.cpp | 5 +++-- src/backends/reference/workloads/DetectionPostProcess.cpp | 2 +- src/backends/reference/workloads/Gather.cpp | 4 ++-- src/backends/reference/workloads/LogSoftmax.cpp | 4 ++-- src/backends/reference/workloads/RefStridedSliceWorkload.cpp | 2 +- src/backends/reference/workloads/Slice.cpp | 5 +++-- 8 files changed, 15 insertions(+), 14 deletions(-) (limited to 'src/backends/reference/workloads') diff --git a/src/backends/reference/workloads/ArgMinMax.cpp b/src/backends/reference/workloads/ArgMinMax.cpp index db85b958e9..637aa17013 100644 --- a/src/backends/reference/workloads/ArgMinMax.cpp +++ b/src/backends/reference/workloads/ArgMinMax.cpp @@ -15,7 +15,7 @@ namespace armnn void ArgMinMax(Decoder& in, int32_t* out, const TensorInfo& inputTensorInfo, const TensorInfo& outputTensorInfo, ArgMinMaxFunction function, int axis) { - boost::ignore_unused(outputTensorInfo); + IgnoreUnused(outputTensorInfo); unsigned int uAxis = armnnUtils::GetUnsignedAxis(inputTensorInfo.GetNumDimensions(), axis); diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp index 3f0144670f..5cae5bda83 100644 --- a/src/backends/reference/workloads/BaseIterator.hpp +++ b/src/backends/reference/workloads/BaseIterator.hpp @@ -5,14 +5,13 @@ #pragma once - +#include #include #include #include #include -#include namespace armnn { @@ -107,7 +106,7 @@ public: TypedIterator& SetIndex(unsigned int index, unsigned int axisIndex = 0) override { - boost::ignore_unused(axisIndex); + IgnoreUnused(axisIndex); BOOST_ASSERT(m_Iterator); m_Iterator = m_Start + index; return *this; diff --git a/src/backends/reference/workloads/Dequantize.cpp b/src/backends/reference/workloads/Dequantize.cpp index 4025e8d7fa..63c0405efe 100644 --- a/src/backends/reference/workloads/Dequantize.cpp +++ b/src/backends/reference/workloads/Dequantize.cpp @@ -5,7 +5,8 @@ #include "Dequantize.hpp" -#include +#include + namespace armnn { @@ -14,7 +15,7 @@ void Dequantize(Decoder& inputDecoder, const TensorInfo& inputInfo, const TensorInfo& outputInfo) { - boost::ignore_unused(outputInfo); + IgnoreUnused(outputInfo); BOOST_ASSERT(inputInfo.GetNumElements() == outputInfo.GetNumElements()); for (unsigned int i = 0; i < inputInfo.GetNumElements(); i++) { diff --git a/src/backends/reference/workloads/DetectionPostProcess.cpp b/src/backends/reference/workloads/DetectionPostProcess.cpp index 96e57803a1..57cf01e4a1 100644 --- a/src/backends/reference/workloads/DetectionPostProcess.cpp +++ b/src/backends/reference/workloads/DetectionPostProcess.cpp @@ -154,7 +154,7 @@ void DetectionPostProcess(const TensorInfo& boxEncodingsInfo, float* detectionScores, float* numDetections) { - boost::ignore_unused(anchorsInfo, detectionClassesInfo, detectionScoresInfo, numDetectionsInfo); + IgnoreUnused(anchorsInfo, detectionClassesInfo, detectionScoresInfo, numDetectionsInfo); // Transform center-size format which is (ycenter, xcenter, height, width) to box-corner format, // which represents the lower left corner and the upper right corner (ymin, xmin, ymax, xmax) diff --git a/src/backends/reference/workloads/Gather.cpp b/src/backends/reference/workloads/Gather.cpp index 5416855f48..4cf3a142a0 100644 --- a/src/backends/reference/workloads/Gather.cpp +++ b/src/backends/reference/workloads/Gather.cpp @@ -8,8 +8,8 @@ #include "RefWorkloadUtils.hpp" #include +#include -#include #include namespace armnn @@ -22,7 +22,7 @@ void Gather(const TensorInfo& paramsInfo, const int32_t* indices, Encoder& output) { - boost::ignore_unused(outputInfo); + IgnoreUnused(outputInfo); const TensorShape& paramsShape = paramsInfo.GetShape(); unsigned int paramsProduct = 1; diff --git a/src/backends/reference/workloads/LogSoftmax.cpp b/src/backends/reference/workloads/LogSoftmax.cpp index ddf5674fb8..103d62a8df 100644 --- a/src/backends/reference/workloads/LogSoftmax.cpp +++ b/src/backends/reference/workloads/LogSoftmax.cpp @@ -6,11 +6,11 @@ #include "LogSoftmax.hpp" #include +#include #include #include -#include #include namespace @@ -37,7 +37,7 @@ void LogSoftmax(Decoder& input, bool axisIsValid = ValidateAxis(descriptor.m_Axis, numDimensions); BOOST_ASSERT_MSG(axisIsValid, "Axis index is not in range [-numDimensions, numDimensions)."); - boost::ignore_unused(axisIsValid); + IgnoreUnused(axisIsValid); unsigned int uAxis = descriptor.m_Axis < 0 ? numDimensions - boost::numeric_cast(std::abs(descriptor.m_Axis)) : diff --git a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp index 8bb1670a48..bfd3c284ae 100644 --- a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp +++ b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp @@ -28,7 +28,7 @@ void RefStridedSliceWorkload::Execute() const DataType outputDataType = outputInfo.GetDataType(); BOOST_ASSERT(inputDataType == outputDataType); - boost::ignore_unused(outputDataType); + IgnoreUnused(outputDataType); StridedSlice(inputInfo, m_Data.m_Parameters, diff --git a/src/backends/reference/workloads/Slice.cpp b/src/backends/reference/workloads/Slice.cpp index c7ca3b156e..0223cdc56a 100644 --- a/src/backends/reference/workloads/Slice.cpp +++ b/src/backends/reference/workloads/Slice.cpp @@ -5,8 +5,9 @@ #include "Slice.hpp" +#include + #include -#include #include namespace armnn @@ -72,7 +73,7 @@ void Slice(const TensorInfo& inputInfo, const unsigned char* input = reinterpret_cast(inputData); unsigned char* output = reinterpret_cast(outputData); - boost::ignore_unused(dim0); + IgnoreUnused(dim0); for (unsigned int idx0 = begin0; idx0 < begin0 + size0; ++idx0) { for (unsigned int idx1 = begin1; idx1 < begin1 + size1; ++idx1) -- cgit v1.2.1