diff options
| author | Matthew Sloyan <matthew.sloyan@arm.com> | 2020-10-12 15:03:01 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-10-13 08:30:07 +0000 |
| commit | f290d88d34991c2478e5b22ef119f8537d923d77 (patch) | |
| tree | 50ccca837c8139acf08147eebf17e90c8fd3f034 /src/armnn | |
| parent | 55c87b7c3957affab255b0f5d6a7b7601bdd77df (diff) | |
| download | armnn-f290d88d34991c2478e5b22ef119f8537d923d77.tar.gz | |
IVGCVSW-4489 Remove remaining occurrence of boost::format
* Replaced with fmt::format in Descriptors.cpp.
* Removed remaining boost/format headers in ArmNN codebase.
* Removed additional boost header in Network.cpp
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ib98b83bf4ec99ef98ce7a3635ec0dd478c3e43e1
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Descriptors.cpp | 18 | ||||
| -rw-r--r-- | src/armnn/Network.cpp | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp index c6fbfff9f4..881023e968 100644 --- a/src/armnn/Descriptors.cpp +++ b/src/armnn/Descriptors.cpp @@ -12,7 +12,7 @@ #include <array> #include <vector> -#include <boost/format.hpp> +#include <fmt/format.h> namespace armnn { @@ -23,9 +23,11 @@ PermutationVector::PermutationVector(const ValueType *dimMappings, const SizeTyp if (numDimMappings > MaxNumOfTensorDimensions) { - boost::format fmt("The number of mappings (%1%) cannot be greater " - "than the maximum number of dimensions supported (%2%)"); - throw InvalidArgumentException(boost::str(fmt % numDimMappings % MaxNumOfTensorDimensions)); + throw InvalidArgumentException( + fmt::format("The number of mappings ({0}) cannot be greater " + "than the maximum number of dimensions supported ({1})", + numDimMappings, + MaxNumOfTensorDimensions)); } if ((dimMappings == nullptr) && (numDimMappings != 0)) @@ -38,8 +40,12 @@ PermutationVector::PermutationVector(const ValueType *dimMappings, const SizeTyp const ValueType dstIndex = dimMappings[i]; if (dstIndex >= numDimMappings) { - boost::format fmt("Dimension mapping at index %1% is invalid: %2% is outside of the valid range [0,%3%]"); - throw InvalidArgumentException(boost::str(fmt % i % dstIndex % (numDimMappings - 1))); + throw InvalidArgumentException( + fmt::format("Dimension mapping at index {0} is invalid: " + "{1} is outside of the valid range [0,{2}]", + i, + dstIndex, + (numDimMappings - 1))); } } diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 668b634bc7..373f9992b4 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -35,9 +35,6 @@ #include <vector> #include <algorithm> -#include <boost/format.hpp> -#include <boost/numeric/conversion/converter_policies.hpp> - namespace armnn { |