diff options
| author | James Ward <james.ward@arm.com> | 2020-09-28 11:56:35 +0100 |
|---|---|---|
| committer | James Ward <james.ward@arm.com> | 2020-09-30 17:13:58 +0000 |
| commit | 6d9f5c57fe80b3b3c08294ddd52062e107151a15 (patch) | |
| tree | a5aeca515a6f81545d82939ca4031df8677aed12 /tests/NetworkExecutionUtils | |
| parent | 156113cee2b869810092b42579c31c3b1fd910c5 (diff) | |
| download | armnn-6d9f5c57fe80b3b3c08294ddd52062e107151a15.tar.gz | |
IVGCVSW-4519 Remove Boost Variant and apply_visitor variant
* replace boost::variant with mapbox::util::variant
* replace boost::apply_visitor with mapbox::util::apply_visitor
* replace boost::get with mapbox::util::get
Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: I38460cabbcd5e56d4d61151bfe3dcb5681ce696e
Diffstat (limited to 'tests/NetworkExecutionUtils')
| -rw-r--r-- | tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp index b5652df37f..f79d630291 100644 --- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp +++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp @@ -29,7 +29,7 @@ #include <ResolveType.hpp> #include <boost/program_options.hpp> -#include <boost/variant.hpp> +#include <mapbox/variant.hpp> #include <iostream> #include <fstream> @@ -186,7 +186,7 @@ void RemoveDuplicateDevices(std::vector<armnn::BackendId>& computeDevices) computeDevices.end()); } -struct TensorPrinter : public boost::static_visitor<> +struct TensorPrinter { TensorPrinter(const std::string& binding, const armnn::TensorInfo& info, @@ -286,7 +286,7 @@ std::vector<T> GenerateDummyTensorData(unsigned int numElements) return std::vector<T>(numElements, static_cast<T>(0)); } -using TContainer = boost::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; +using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; using QuantizationParams = std::pair<float, int32_t>; void PopulateTensorWithData(TContainer& tensorData, @@ -385,7 +385,7 @@ int MainImpl(const ExecuteNetworkParams& params, const std::shared_ptr<armnn::IRuntime>& runtime = nullptr, size_t iterations = 1) { - using TContainer = boost::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; + using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; std::vector<TContainer> inputDataContainers; @@ -501,7 +501,7 @@ int MainImpl(const ExecuteNetworkParams& params, infoOut, outputTensorFile, params.m_DequantizeOutput); - boost::apply_visitor(printer, outputDataContainers[i]); + mapbox::util::apply_visitor(printer, outputDataContainers[i]); } ARMNN_LOG(info) << "\nInference time: " << std::setprecision(2) |