diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2020-06-29 11:50:01 +0100 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2020-06-30 11:29:07 +0000 |
commit | 532a29d12d72f54549d8b71edd485c17af65698a (patch) | |
tree | 6748cc16706f52f413f7b2163a41d4807387cdf8 /src/timelineDecoder | |
parent | 3b90af6bb79639d3813f21f3c3017503ee0c66af (diff) | |
download | armnn-532a29d12d72f54549d8b71edd485c17af65698a.tar.gz |
IVGCVSW-4487 Remove boost::filesystem
* Replace filesystem::path
* Replace filesystem::exists
* Replace filesystem::is_directory
* Replace filesystem::directory_iterator
* Replace filesystem::filesystem_error exception
* Replace filesystem::temp_directory_path
* Replace filesystem::unique path
* Replace filesystem::ofstream with std::ofstream
* Replace filesystem::remove
* Replace filesystem::is_regular_file
* Replace boost::optional with armnn::Optional in touched files
* Remove some superfluous includes
* Update build guides, GlobalConfig.cmake and CMakeLists.txt
* Remove redundant armnnUtils::Filesystem::Remove function.
* Remove redundant armnnUtils::Filesystem::GetFileSize function.
Temporarily adding back Boost::filesystem to enable Boost::dll.
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: Ifa46d4a0097d2612ddacd8e9736c0b36e365fb11
Diffstat (limited to 'src/timelineDecoder')
-rw-r--r-- | src/timelineDecoder/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.cpp | 3 | ||||
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.hpp | 6 | ||||
-rw-r--r-- | src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp | 8 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt index 4702577197..695aa5cbe8 100644 --- a/src/timelineDecoder/CMakeLists.txt +++ b/src/timelineDecoder/CMakeLists.txt @@ -17,7 +17,8 @@ if(BUILD_TIMELINE_DECODER) TimelineDirectoryCaptureCommandHandler.hpp) include_directories(${PROJECT_SOURCE_DIR}/src/profiling - ${PROJECT_SOURCE_DIR}/profiling/common/include) + ${PROJECT_SOURCE_DIR}/profiling/common/include + ${PROJECT_SOURCE_DIR}/src/armnnUtils) if(BUILD_UNIT_TESTS) target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/timelineDecoder) diff --git a/src/timelineDecoder/JSONTimelineDecoder.cpp b/src/timelineDecoder/JSONTimelineDecoder.cpp index 84472d8c99..a0392149ed 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.cpp +++ b/src/timelineDecoder/JSONTimelineDecoder.cpp @@ -8,7 +8,6 @@ #include <string> #include <fstream> -#include <boost/filesystem/fstream.hpp> namespace armnn { @@ -246,7 +245,7 @@ void JSONTimelineDecoder::JSONEntity::SetParent(JSONEntity& parent) void JSONTimelineDecoder::PrintJSON(JSONTimelineDecoder::JSONEntity& rootEntity) { std::string jsonString = GetJSONString(rootEntity); - boost::filesystem::ofstream ofs{this->outputJSONFile}; + std::ofstream ofs{this->outputJSONFile}; ofs << jsonString; ofs.close(); } diff --git a/src/timelineDecoder/JSONTimelineDecoder.hpp b/src/timelineDecoder/JSONTimelineDecoder.hpp index 38d698387a..4d6fcecebd 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.hpp +++ b/src/timelineDecoder/JSONTimelineDecoder.hpp @@ -7,10 +7,9 @@ #include <armnn/profiling/ITimelineDecoder.hpp> +#include <Filesystem.hpp> #include <map> #include <vector> -#include <boost/filesystem/path.hpp> -#include <boost/filesystem.hpp> namespace armnn { @@ -65,8 +64,7 @@ public: private: Model m_Model; - boost::filesystem::path fileDir = boost::filesystem::temp_directory_path(); - boost::filesystem::path p{fileDir / boost::filesystem::unique_path("output.json")}; + fs::path p = armnnUtils::Filesystem::NamedTempFile("output.json"); std::string outputJSONFile = p.string(); diff --git a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp index 2d78564a2a..82414192f2 100644 --- a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp +++ b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp @@ -6,12 +6,12 @@ #include <JSONTimelineDecoder.hpp> #include <TimelineCaptureCommandHandler.hpp> #include <TimelineDecoder.hpp> +#include <Filesystem.hpp> #include <boost/test/test_tools.hpp> #include <boost/test/unit_test_suite.hpp> #include <fstream> -#include <boost/filesystem.hpp> BOOST_AUTO_TEST_SUITE(JSONTimelineDecoderTests) @@ -797,10 +797,8 @@ BOOST_AUTO_TEST_CASE(JSONTimelineDecoderTestJSON) timelineDecoder.PrintJSON(rootEntity); - boost::filesystem::ifstream inFile; - boost::filesystem::path fileDir = boost::filesystem::temp_directory_path(); - boost::filesystem::path p{fileDir / boost::filesystem::unique_path("output.json")}; - + fs::ifstream inFile; + fs::path p{fs::temp_directory_path() / "output.json"}; inFile.open(p); //open the input file std::stringstream strStream; |