From 532a29d12d72f54549d8b71edd485c17af65698a Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 29 Jun 2020 11:50:01 +0100 Subject: 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 Signed-off-by: Colm Donelan Change-Id: Ifa46d4a0097d2612ddacd8e9736c0b36e365fb11 --- src/backends/backendsCommon/DynamicBackendUtils.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/backends/backendsCommon/DynamicBackendUtils.cpp') diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index 5b675ba476..1abea114bd 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -6,8 +6,7 @@ #include #include #include "armnn/utility/StringUtils.hpp" - -#include +#include #include @@ -149,21 +148,21 @@ bool DynamicBackendUtils::IsPathValid(const std::string& path) return false; } - boost::filesystem::path boostPath(path); + fs::path fsPath(path); - if (!boost::filesystem::exists(boostPath)) + if (!fs::exists(fsPath)) { ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" does not exist"; return false; } - if (!boost::filesystem::is_directory(boostPath)) + if (!fs::is_directory(fsPath)) { ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" is not a directory"; return false; } - if (!boostPath.is_absolute()) + if (!fsPath.is_absolute()) { ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" is not absolute"; return false; @@ -179,7 +178,7 @@ std::vector DynamicBackendUtils::GetSharedObjects(const std::vector for (const std::string& backendPath : backendPaths) { - using namespace boost::filesystem; + using namespace fs; // Check if the path is valid. In case of error, IsValidPath will log an error message if (!IsPathValid(backendPath)) -- cgit v1.2.1