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

diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp
index c6fbfff..881023e 100644 (file)
--- 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 668b634..373f999 100644 (file)
--- 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
 {
 

diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp
index cf28fcf..782c181 100644 (file)
--- a/src/armnnUtils/ParserPrototxtFixture.hpp
+++ b/src/armnnUtils/ParserPrototxtFixture.hpp
@@ -11,7 +11,6 @@
 #include <Network.hpp>
 #include <VerificationHelpers.hpp>
 
-#include <boost/format.hpp>
 #include <fmt/format.h>
 
 #include <iomanip>

diff --git a/src/armnnUtils/PrototxtConversions.cpp b/src/armnnUtils/PrototxtConversions.cpp
index 8681da1..c3ba289 100644 (file)
--- a/src/armnnUtils/PrototxtConversions.cpp
+++ b/src/armnnUtils/PrototxtConversions.cpp
@@ -6,8 +6,6 @@
 #include "PrototxtConversions.hpp"
 #include "armnn/Tensor.hpp"
 
-#include <boost/format.hpp>
-
 #include <iomanip>
 #include <sstream>
 #include <string>

diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp
index f6650dc..cb4aa92 100644 (file)
--- a/src/backends/cl/ClWorkloadFactory.cpp
+++ b/src/backends/cl/ClWorkloadFactory.cpp
@@ -27,8 +27,6 @@
 #include <arm_compute/runtime/CL/CLBufferAllocator.h>
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
-#include <boost/format.hpp>
-
 namespace armnn
 {
 

diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp
index 6e9d2c8..68a356a 100644 (file)
--- a/src/backends/cl/test/OpenClTimerTest.cpp
+++ b/src/backends/cl/test/OpenClTimerTest.cpp
@@ -21,7 +21,6 @@
 
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
-#include <boost/format.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <iostream>

diff --git a/src/backends/neon/NeonTimer.cpp b/src/backends/neon/NeonTimer.cpp
index 1079a0d..5cce051 100644 (file)
--- a/src/backends/neon/NeonTimer.cpp
+++ b/src/backends/neon/NeonTimer.cpp
@@ -10,8 +10,6 @@
 
 #include <memory>
 
-#include <boost/format.hpp>
-
 namespace armnn
 {
 namespace

diff --git a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
index e994a09..6a29439 100644 (file)
--- a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
+++ b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp
@@ -7,8 +7,6 @@
 #include "RefWorkloadUtils.hpp"
 #include "StridedSlice.hpp"
 
-#include <boost/format.hpp>
-
 namespace armnn
 {
 

diff --git a/src/profiling/SendThread.cpp b/src/profiling/SendThread.cpp
index 16ef239..1a0e359 100644 (file)
--- a/src/profiling/SendThread.cpp
+++ b/src/profiling/SendThread.cpp
@@ -12,8 +12,6 @@
 
 #include <Processes.hpp>
 
-#include <boost/format.hpp>
-
 #include <cstring>
 
 namespace armnn

diff --git a/tests/CaffePreprocessor.cpp b/tests/CaffePreprocessor.cpp
index e531a31..54ce833 100644 (file)
--- a/tests/CaffePreprocessor.cpp
+++ b/tests/CaffePreprocessor.cpp
@@ -7,8 +7,6 @@
 
 #include <armnn/utility/NumericCast.hpp>
 
-#include <boost/format.hpp>
-
 #include <iostream>
 #include <fcntl.h>
 #include <array>

diff --git a/tests/ImagePreprocessor.cpp b/tests/ImagePreprocessor.cpp
index 4557cad..e6dbfb5 100644 (file)
--- a/tests/ImagePreprocessor.cpp
+++ b/tests/ImagePreprocessor.cpp
@@ -11,8 +11,6 @@
 #include <armnnUtils/Permute.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
-#include <boost/format.hpp>
-
 #include <iostream>
 #include <fcntl.h>
 #include <array>

diff --git a/tests/InferenceTest.cpp b/tests/InferenceTest.cpp
index 6420544..b3b38d1 100644 (file)
--- a/tests/InferenceTest.cpp
+++ b/tests/InferenceTest.cpp
@@ -8,7 +8,6 @@
 #include <Filesystem.hpp>
 
 #include "../src/armnn/Profiling.hpp"
-#include <boost/format.hpp>
 #include <boost/program_options.hpp>
 
 #include <fstream>

diff --git a/tests/YoloDatabase.cpp b/tests/YoloDatabase.cpp
index 8b2c630..fe7410b 100644 (file)
--- a/tests/YoloDatabase.cpp
+++ b/tests/YoloDatabase.cpp
@@ -14,8 +14,6 @@
 #include <tuple>
 #include <utility>
 
-#include <boost/format.hpp>
-
 #include "InferenceTestImage.hpp"
 
 namespace