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/armnn/test/CsvReaderTest.cpp | |
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/armnn/test/CsvReaderTest.cpp')
-rw-r--r-- | src/armnn/test/CsvReaderTest.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/armnn/test/CsvReaderTest.cpp b/src/armnn/test/CsvReaderTest.cpp index 8491ad778d..96185c8408 100644 --- a/src/armnn/test/CsvReaderTest.cpp +++ b/src/armnn/test/CsvReaderTest.cpp @@ -3,13 +3,13 @@ // SPDX-License-Identifier: MIT // #include "CsvReader.hpp" +#include "armnn/Optional.hpp" +#include <Filesystem.hpp> #include <boost/test/unit_test.hpp> #include <iostream> #include <string> -#include <boost/filesystem.hpp> -#include <boost/optional.hpp> using namespace armnnUtils; @@ -29,11 +29,10 @@ struct TestHelper { std::string CreateTempCsvFile() { - boost::filesystem::path fileDir = boost::filesystem::temp_directory_path(); - boost::filesystem::path p{fileDir / boost::filesystem::unique_path("%%%%-%%%%-%%%%.csv")}; + fs::path p = armnnUtils::Filesystem::NamedTempFile("Armnn-CreateTempCsvFileTest-TempFile.csv"); try { - boost::filesystem::ofstream ofs{p}; + std::ofstream ofs{p}; ofs << "airplane, bicycle , bird , \"m,o,n,k,e,y\"\n"; ofs << "banana, shoe, \"ice\""; ofs.close(); @@ -63,17 +62,17 @@ struct TestHelper { { try { - boost::filesystem::remove(*m_CsvFile); + fs::remove(m_CsvFile.value()); } catch (std::exception &e) { - std::cerr << "Unable to delete file [" << *m_CsvFile << "] : " << e.what() << std::endl; + std::cerr << "Unable to delete file [" << m_CsvFile.value() << "] : " << e.what() << std::endl; BOOST_TEST(false); } } } - boost::optional<boost::filesystem::path> m_CsvFile; + armnn::Optional<fs::path> m_CsvFile; }; } |