diff options
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" |