From 08d9a1c4c9cbea4e743feefdd310ff038a6c4588 Mon Sep 17 00:00:00 2001
From: Colm Donelan <Colm.Donelan@arm.com>
Date: Wed, 9 Sep 2020 17:56:55 +0100
Subject: IVGCVSW-5298 Remove boost::format from Android-nn-driver

* Replaced with stringstream, string or filesystem::path

Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: I2aa80d88cc0eaff5de4dc6a121370ebf41dcb0a8
---
 test/Android.mk     | 10 ++++++++++
 test/UtilsTests.cpp | 11 +++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/Android.mk b/test/Android.mk
index ca940f5b..5e40f0a1 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PATH := $(call my-dir)
 OPENCL_HEADER_PATH := $(LOCAL_PATH)/../../mali/product/khronos/original
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/../armnn/include
+ARMNN_THIRD_PARTY_PATH   := $(LOCAL_PATH)/../armnn/third-party
+ARMNN_UTILS_HEADER_PATH := $(LOCAL_PATH)/../armnn/src/armnnUtils
 ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/..
 
 ##########################
@@ -33,6 +35,8 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
+        $(ARMNN_UTILS_HEADER_PATH) \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
@@ -145,6 +149,8 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
+        $(ARMNN_UTILS_HEADER_PATH) \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
@@ -253,6 +259,8 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
+        $(ARMNN_UTILS_HEADER_PATH) \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
@@ -356,6 +364,8 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_THIRD_PARTY_PATH) \
+        $(ARMNN_UTILS_HEADER_PATH) \
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
diff --git a/test/UtilsTests.cpp b/test/UtilsTests.cpp
index a11c8274..054c0719 100644
--- a/test/UtilsTests.cpp
+++ b/test/UtilsTests.cpp
@@ -11,9 +11,10 @@
 
 #include <fstream>
 #include <iomanip>
-#include <boost/format.hpp>
 #include <armnn/INetwork.hpp>
 
+#include <Filesystem.hpp>
+
 BOOST_AUTO_TEST_SUITE(UtilsTests)
 
 using namespace android;
@@ -42,9 +43,7 @@ public:
         // NOTE: the export now uses a time stamp to name the file so we
         //       can't predict ahead of time what the file name will be.
         std::string timestamp = "dummy";
-        m_FileName = boost::str(boost::format("%1%/%2%_networkgraph.dot")
-                                % m_RequestInputsAndOutputsDumpDir
-                                % timestamp);
+        m_FileName = m_RequestInputsAndOutputsDumpDir / (timestamp + "_networkgraph.dot");
     }
 
     // Teardown: delete the dump file regardless of the outcome of the tests.
@@ -96,8 +95,8 @@ public:
                            (std::istreambuf_iterator<char>()));
     }
 
-    std::string m_RequestInputsAndOutputsDumpDir;
-    std::string m_FileName;
+    fs::path m_RequestInputsAndOutputsDumpDir;
+    fs::path m_FileName;
 
 private:
     std::ifstream m_FileStream;
-- 
cgit v1.2.1