diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/armnn/NetworkQuantizer.cpp | 4 | ||||
| -rw-r--r-- | src/armnn/test/ModelAccuracyCheckerTest.cpp | 3 | ||||
| -rw-r--r-- | src/armnnUtils/ModelAccuracyChecker.hpp | 4 | ||||
| -rw-r--r-- | src/armnnUtils/TensorIOUtils.hpp | 6 |
4 files changed, 8 insertions, 9 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) { diff --git a/src/armnnUtils/ModelAccuracyChecker.hpp b/src/armnnUtils/ModelAccuracyChecker.hpp index 6595a52a98..64409d6904 100644 --- a/src/armnnUtils/ModelAccuracyChecker.hpp +++ b/src/armnnUtils/ModelAccuracyChecker.hpp @@ -8,7 +8,7 @@ #include <algorithm> #include <armnn/Types.hpp> #include <armnn/utility/Assert.hpp> -#include <boost/variant/apply_visitor.hpp> +#include <mapbox/variant.hpp> #include <cstddef> #include <functional> #include <iostream> @@ -79,7 +79,7 @@ public: auto& output = outputTensor[0]; // Create a map of all predictions - boost::apply_visitor([&confidenceMap](auto && value) + mapbox::util::apply_visitor([&confidenceMap](auto && value) { int index = 0; for (const auto & o : value) diff --git a/src/armnnUtils/TensorIOUtils.hpp b/src/armnnUtils/TensorIOUtils.hpp index 1dc7f21857..098b4dadec 100644 --- a/src/armnnUtils/TensorIOUtils.hpp +++ b/src/armnnUtils/TensorIOUtils.hpp @@ -8,7 +8,7 @@ #include <armnn/Tensor.hpp> #include <boost/format.hpp> -#include <boost/variant/apply_visitor.hpp> +#include <mapbox/variant.hpp> namespace armnnUtils { @@ -33,7 +33,7 @@ inline armnn::InputTensors MakeInputTensors(const std::vector<armnn::BindingPoin const armnn::BindingPointInfo& inputBinding = inputBindings[i]; const TContainer& inputData = inputDataContainers[i]; - boost::apply_visitor([&](auto&& value) + mapbox::util::apply_visitor([&](auto&& value) { if (value.size() != inputBinding.second.GetNumElements()) { @@ -72,7 +72,7 @@ inline armnn::OutputTensors MakeOutputTensors(const std::vector<armnn::BindingPo const armnn::BindingPointInfo& outputBinding = outputBindings[i]; TContainer& outputData = outputDataContainers[i]; - boost::apply_visitor([&](auto&& value) + mapbox::util::apply_visitor([&](auto&& value) { if (value.size() != outputBinding.second.GetNumElements()) { |