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 /src/armnn | |
| 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 'src/armnn')
| -rw-r--r-- | src/armnn/NetworkQuantizer.cpp | 4 | ||||
| -rw-r--r-- | src/armnn/test/ModelAccuracyCheckerTest.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/armnn/NetworkQuantizer.cpp b/src/armnn/NetworkQuantizer.cpp index 3712c7be3a..e6becee96f 100644 --- a/src/armnn/NetworkQuantizer.cpp +++ b/src/armnn/NetworkQuantizer.cpp @@ -23,7 +23,7 @@ #include <armnnUtils/TensorUtils.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <boost/variant.hpp> +#include <mapbox/variant.hpp> #include <vector> #include <cmath> @@ -31,7 +31,7 @@ namespace armnn { -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>>; INetworkQuantizer* INetworkQuantizer::CreateRaw(INetwork* inputNetwork, const QuantizerOptions& options) { diff --git a/src/armnn/test/ModelAccuracyCheckerTest.cpp b/src/armnn/test/ModelAccuracyCheckerTest.cpp index c6c93edc3c..55ac19a406 100644 --- a/src/armnn/test/ModelAccuracyCheckerTest.cpp +++ b/src/armnn/test/ModelAccuracyCheckerTest.cpp @@ -6,7 +6,6 @@ #include <boost/test/unit_test.hpp> -#include <boost/variant.hpp> #include <iostream> #include <string> @@ -53,7 +52,7 @@ struct TestHelper BOOST_AUTO_TEST_SUITE(ModelAccuracyCheckerTest) -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>>; BOOST_FIXTURE_TEST_CASE(TestFloat32OutputTensorAccuracy, TestHelper) { |