diff options
| -rw-r--r-- | ConversionUtils.cpp | 2 | ||||
| -rw-r--r-- | ConversionUtils.hpp | 2 | ||||
| -rw-r--r-- | test/1.2/Capabilities.cpp | 1 | ||||
| -rw-r--r-- | test/Dilation.hpp | 18 | ||||
| -rw-r--r-- | test/Lstm.hpp | 4 |
5 files changed, 14 insertions, 13 deletions
diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp index 56e72a3c..09e51598 100644 --- a/ConversionUtils.cpp +++ b/ConversionUtils.cpp @@ -52,7 +52,7 @@ ConstTensorPin::ConstTensorPin(const armnn::TensorInfo& tensorInfo, uint32_t numBytes, const armnn::PermutationVector& mappings) { - boost::ignore_unused(numBytes); + armnn::IgnoreUnused(numBytes); assert(tensorInfo.GetNumBytes() == numBytes); const bool needsSwizzling = (mappings.GetSize() > 0); diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 997c9cc2..d4ca4345 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -10,6 +10,7 @@ #include <armnn/ArmNN.hpp> #include <armnn/ILayerSupport.hpp> #include <armnn/BackendHelper.hpp> +#include <armnn/utility/IgnoreUnused.hpp> #include <armnnUtils/DataLayoutIndexed.hpp> #include <armnnUtils/Transpose.hpp> @@ -21,7 +22,6 @@ #include <OperationsUtils.h> #include <boost/assert.hpp> -#include <boost/core/ignore_unused.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/tools/floating_point_comparison.hpp> diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp index 2bbd7bed..5f817591 100644 --- a/test/1.2/Capabilities.cpp +++ b/test/1.2/Capabilities.cpp @@ -8,7 +8,6 @@ #include "Utils.h" #include <boost/test/unit_test.hpp> -#include <boost/core/ignore_unused.hpp> #include <sys/system_properties.h> diff --git a/test/Dilation.hpp b/test/Dilation.hpp index adc9947d..d0189c96 100644 --- a/test/Dilation.hpp +++ b/test/Dilation.hpp @@ -8,8 +8,8 @@ #include "DriverTestHelpers.hpp" #include <armnn/LayerVisitorBase.hpp> +#include <armnn/utility/IgnoreUnused.hpp> -#include <boost/core/ignore_unused.hpp> #include <boost/test/unit_test.hpp> #include <numeric> @@ -53,10 +53,10 @@ public: const Optional<ConstTensor>& biases, const char *name = nullptr) override { - ignore_unused(layer); - ignore_unused(weights); - ignore_unused(biases); - ignore_unused(name); + IgnoreUnused(layer); + IgnoreUnused(weights); + IgnoreUnused(biases); + IgnoreUnused(name); CheckDilationParams(descriptor); } @@ -67,10 +67,10 @@ public: const Optional<ConstTensor>& biases, const char *name = nullptr) override { - ignore_unused(layer); - ignore_unused(weights); - ignore_unused(biases); - ignore_unused(name); + IgnoreUnused(layer); + IgnoreUnused(weights); + IgnoreUnused(biases); + IgnoreUnused(name); CheckDilationParams(descriptor); } diff --git a/test/Lstm.hpp b/test/Lstm.hpp index d3e03d75..3ac095dc 100644 --- a/test/Lstm.hpp +++ b/test/Lstm.hpp @@ -7,6 +7,8 @@ #include "DriverTestHelpers.hpp" +#include <armnn/utility/IgnoreUnused.hpp> + #include <boost/array.hpp> #include <boost/math/special_functions/relative_difference.hpp> @@ -2371,7 +2373,7 @@ void LstmCifgPeepholeProjectionNoClippingLayerNorm(armnn::Compute compute) template <typename HalPolicy> void QuantizedLstm(armnn::Compute compute) { - boost::ignore_unused(compute); + armnn::IgnoreUnused(compute); // This replicates android/frameworks/ml/nn/runtime/test/generated/vts_models/quantized_lstm.model.cpp // with values from android/frameworks/ml/nn/runtime/test/generated/examples/quantized_lstm.example.cpp // and weights, biases and scalars passed as CONSTANT_COPY tensors (instead of MODEL_INPUT tensors). |