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/armnnTfLiteParser | |
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/armnnTfLiteParser')
-rwxr-xr-x | src/armnnTfLiteParser/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/armnnTfLiteParser/TfLiteParser.cpp | 8 | ||||
-rw-r--r-- | src/armnnTfLiteParser/test/LoadModel.cpp | 6 | ||||
-rw-r--r-- | src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp | 1 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt index 97c55a1d08..d14cb75c49 100755 --- a/src/armnnTfLiteParser/CMakeLists.txt +++ b/src/armnnTfLiteParser/CMakeLists.txt @@ -18,7 +18,7 @@ if(BUILD_TF_LITE_PARSER) target_include_directories(armnnTfLiteParser PRIVATE ../armnnUtils) target_include_directories(armnnTfLiteParser SYSTEM PRIVATE "${TF_LITE_SCHEMA_INCLUDE_PATH}") - target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) + target_link_libraries(armnnTfLiteParser ${Boost_THREAD_LIBRARY}) # If user has explicitly specified flatbuffers lib then use that, # otherwise search for it based on FLATBUFFERS_BUILD_DIR diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index 7f68199368..bad2504f18 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -15,6 +15,7 @@ // armnnUtils: #include <armnnUtils/Permute.hpp> +#include <Filesystem.hpp> #include <ParserHelper.hpp> #include <VerificationHelpers.hpp> @@ -26,7 +27,6 @@ #include <boost/format.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <boost/filesystem.hpp> #include <fstream> #include <algorithm> @@ -2868,9 +2868,9 @@ TfLiteParser::ModelPtr TfLiteParser::LoadModelFromFile(const char * fileName) throw InvalidArgumentException(boost::str(boost::format("Invalid (null) file name %1%") % CHECK_LOCATION().AsString())); } - boost::system::error_code errorCode; - boost::filesystem::path pathToFile(fileName); - if (!boost::filesystem::exists(pathToFile, errorCode)) + std::error_code errorCode; + fs::path pathToFile(fileName); + if (!fs::exists(pathToFile, errorCode)) { std::string locationString = CHECK_LOCATION().AsString(); std::string msg = boost::str(boost::format("Cannot find the file (%1%) errorCode: %2% %3%") % diff --git a/src/armnnTfLiteParser/test/LoadModel.cpp b/src/armnnTfLiteParser/test/LoadModel.cpp index 9ae3412a11..9777333495 100644 --- a/src/armnnTfLiteParser/test/LoadModel.cpp +++ b/src/armnnTfLiteParser/test/LoadModel.cpp @@ -6,6 +6,8 @@ #include "ParserFlatbuffersFixture.hpp" #include "../TfLiteParser.hpp" +#include <Filesystem.hpp> + using armnnTfLiteParser::TfLiteParser; using ModelPtr = TfLiteParser::ModelPtr; using SubgraphPtr = TfLiteParser::SubgraphPtr; @@ -196,8 +198,8 @@ BOOST_FIXTURE_TEST_CASE(LoadModelFromBinary, LoadModelFixture) BOOST_FIXTURE_TEST_CASE(LoadModelFromFile, LoadModelFixture) { - using namespace boost::filesystem; - std::string fname = unique_path(temp_directory_path() / "%%%%-%%%%-%%%%.tflite").string(); + using namespace fs; + fs::path fname = armnnUtils::Filesystem::NamedTempFile("Armnn-tfLite-LoadModelFromFile-TempFile.csv"); bool saved = flatbuffers::SaveFile(fname.c_str(), reinterpret_cast<char *>(m_GraphBinary.data()), m_GraphBinary.size(), true); diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index 56811b5b6d..891e0be499 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -19,7 +19,6 @@ #include <test/TensorHelpers.hpp> -#include <boost/filesystem.hpp> #include <boost/format.hpp> #include "flatbuffers/idl.h" |