diff options
Diffstat (limited to 'src/armnnDeserializer')
4 files changed, 19 insertions, 19 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index ed4605b2af..1f7c360d51 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -13,13 +13,13 @@ #include <armnnUtils/Permute.hpp> #include <armnnUtils/Transpose.hpp> +#include <armnn/utility/IgnoreUnused.hpp> #include <ParserHelper.hpp> #include <VerificationHelpers.hpp> #include <boost/filesystem.hpp> #include <boost/format.hpp> -#include <boost/core/ignore_unused.hpp> #include <boost/assert.hpp> #include <boost/format.hpp> #include <boost/format.hpp> @@ -743,7 +743,7 @@ INetworkPtr Deserializer::CreateNetworkFromGraph(GraphPtr graph) BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerIndex, const std::string& name) const { - boost::ignore_unused(layerIndex); + IgnoreUnused(layerIndex); for (auto inputBinding : m_InputBindings) { if (inputBinding.first == name) @@ -761,7 +761,7 @@ BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerInde BindingPointInfo Deserializer::GetNetworkOutputBindingInfo(unsigned int layerIndex, const std::string& name) const { - boost::ignore_unused(layerIndex); + IgnoreUnused(layerIndex); for (auto outputBinding : m_OutputBindings) { if (outputBinding.first == name) @@ -1805,7 +1805,7 @@ void Deserializer::ParsePermute(GraphPtr graph, unsigned int layerIndex) armnn::Pooling2dDescriptor Deserializer::GetPoolingDescriptor(Deserializer::PoolingDescriptor pooling2dDesc, unsigned int layerIndex) { - boost::ignore_unused(layerIndex); + IgnoreUnused(layerIndex); armnn::Pooling2dDescriptor desc; switch (pooling2dDesc->poolType()) @@ -2157,7 +2157,7 @@ armnn::NormalizationDescriptor Deserializer::GetNormalizationDescriptor( Deserializer::NormalizationDescriptorPtr normalizationDescriptor, unsigned int layerIndex) { - boost::ignore_unused(layerIndex); + IgnoreUnused(layerIndex); armnn::NormalizationDescriptor desc; switch (normalizationDescriptor->normChannelType()) diff --git a/src/armnnDeserializer/test/DeserializeAdd.cpp b/src/armnnDeserializer/test/DeserializeAdd.cpp index 325bb6e1c3..4f29189ccc 100644 --- a/src/armnnDeserializer/test/DeserializeAdd.cpp +++ b/src/armnnDeserializer/test/DeserializeAdd.cpp @@ -7,7 +7,7 @@ #include "ParserFlatbuffersSerializeFixture.hpp" #include "../Deserializer.hpp" -#include <boost/core/ignore_unused.hpp> +#include <armnn/utility/IgnoreUnused.hpp> #include <string> #include <iostream> @@ -22,7 +22,7 @@ struct AddFixture : public ParserFlatbuffersSerializeFixture const std::string & dataType, const std::string & activation="NONE") { - boost::ignore_unused(activation); + armnn::IgnoreUnused(activation); m_JsonString = R"( { inputIds: [0, 1], diff --git a/src/armnnDeserializer/test/DeserializeMultiplication.cpp b/src/armnnDeserializer/test/DeserializeMultiplication.cpp index c0bb13e17b..8198001f58 100644 --- a/src/armnnDeserializer/test/DeserializeMultiplication.cpp +++ b/src/armnnDeserializer/test/DeserializeMultiplication.cpp @@ -3,11 +3,12 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include "../Deserializer.hpp" -#include <boost/core/ignore_unused.hpp> +#include <armnn/utility/IgnoreUnused.hpp> + +#include <boost/test/unit_test.hpp> #include <string> #include <iostream> @@ -22,7 +23,7 @@ struct MultiplicationFixture : public ParserFlatbuffersSerializeFixture const std::string & dataType, const std::string & activation="NONE") { - boost::ignore_unused(activation); + armnn::IgnoreUnused(activation); m_JsonString = R"( { inputIds: [0, 1], diff --git a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp index de7fe5cb5e..91d07f304a 100644 --- a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp +++ b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp @@ -6,21 +6,20 @@ #pragma once #include "SchemaSerialize.hpp" +#include "test/TensorHelpers.hpp" + +#include "flatbuffers/idl.h" +#include "flatbuffers/util.h" +#include <ArmnnSchema_generated.h> #include <armnn/IRuntime.hpp> #include <armnnDeserializer/IDeserializer.hpp> +#include <armnn/utility/IgnoreUnused.hpp> +#include <ResolveType.hpp> -#include <boost/core/ignore_unused.hpp> #include <boost/assert.hpp> #include <boost/format.hpp> -#include <ResolveType.hpp> -#include "test/TensorHelpers.hpp" - -#include "flatbuffers/idl.h" -#include "flatbuffers/util.h" - -#include <ArmnnSchema_generated.h> using armnnDeserializer::IDeserializer; using TensorRawPtr = armnnSerializer::TensorInfo*; @@ -155,7 +154,7 @@ struct ParserFlatbuffersSerializeFixture armnnSerializer::TensorInfo tensorType, const std::string& name, const float scale, const int64_t zeroPoint) { - boost::ignore_unused(name); + armnn::IgnoreUnused(name); BOOST_CHECK_EQUAL(shapeSize, tensors->dimensions()->size()); BOOST_CHECK_EQUAL_COLLECTIONS(shape.begin(), shape.end(), tensors->dimensions()->begin(), tensors->dimensions()->end()); |