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/profiling/test | |
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/profiling/test')
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 29 | ||||
-rw-r--r-- | src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp | 10 |
2 files changed, 11 insertions, 28 deletions
diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index e968d67cf5..79da17a1af 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -11,7 +11,6 @@ #include <Runtime.hpp> #include "TestTimelinePacketHandler.hpp" -#include <boost/filesystem.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/unit_test.hpp> @@ -37,18 +36,6 @@ class FileOnlyHelperService : public ProfilingService BOOST_AUTO_TEST_SUITE(FileOnlyProfilingDecoratorTests) -std::string UniqueFileName() -{ - std::time_t t = std::time(nullptr); - char mbstr[100]; - std::strftime(mbstr, sizeof(mbstr), "%Y_%m_%d_%H_%M_%S_", std::localtime(&t)); - std::stringstream ss; - ss << mbstr; - ss << t; - ss << ".bin"; - return ss.str(); -} - BOOST_AUTO_TEST_CASE(TestFileOnlyProfiling) { // This test requires at least one backend registry to be enabled @@ -58,10 +45,8 @@ BOOST_AUTO_TEST_CASE(TestFileOnlyProfiling) return; } - // Create a temporary file name. - fs::path tempPath = fs::temp_directory_path(); - fs::path tempFile = UniqueFileName(); - tempPath = tempPath / tempFile; + // Enable m_FileOnly but also provide ILocalPacketHandler which should consume the packets. + // This won't dump anything to file. armnn::Runtime::CreationOptions creationOptions; creationOptions.m_ProfilingOptions.m_EnableProfiling = true; creationOptions.m_ProfilingOptions.m_FileOnly = true; @@ -180,9 +165,7 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFileEndToEnd) } // Create a temporary file name. - fs::path tempPath = fs::temp_directory_path(); - fs::path tempFile = UniqueFileName(); - tempPath = tempPath / tempFile; + fs::path tempPath = armnnUtils::Filesystem::NamedTempFile("DumpOutgoingValidFileEndToEnd_CaptureFile.txt"); armnn::Runtime::CreationOptions options; options.m_ProfilingOptions.m_EnableProfiling = true; options.m_ProfilingOptions.m_FileOnly = true; @@ -195,7 +178,7 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFileEndToEnd) options.m_ProfilingOptions.m_LocalPacketHandlers.push_back(localPacketHandlerPtr); // Make sure the file does not exist at this point - BOOST_CHECK(armnnUtils::Filesystem::GetFileSize(tempPath.string().c_str()) == -1); + BOOST_CHECK(!fs::exists(tempPath)); armnn::Runtime runtime(options); // ensure the GUID generator is reset to zero @@ -255,12 +238,12 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFileEndToEnd) GetProfilingService(&runtime).ResetExternalProfilingOptions(options.m_ProfilingOptions, true); // The output file size should be greater than 0. - BOOST_CHECK(armnnUtils::Filesystem::GetFileSize(tempPath.string().c_str()) > 0); + BOOST_CHECK(fs::file_size(tempPath) > 0); // NOTE: would be an interesting exercise to take this file and decode it // Delete the tmp file. - BOOST_CHECK(armnnUtils::Filesystem::Remove(tempPath.string().c_str())); + BOOST_CHECK(fs::remove(tempPath)); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index c36867815f..6784ddabcb 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -4,13 +4,13 @@ // #include "../ProfilingConnectionDumpToFileDecorator.hpp" +#include <Filesystem.hpp> #include <Runtime.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <fstream> #include <sstream> -#include <boost/filesystem.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/unit_test.hpp> @@ -96,8 +96,7 @@ BOOST_AUTO_TEST_CASE(DumpIncomingInvalidFileIgnoreErrors) BOOST_AUTO_TEST_CASE(DumpIncomingValidFile) { - boost::filesystem::path fileName = - boost::filesystem::temp_directory_path() / boost::filesystem::unique_path(); + fs::path fileName = armnnUtils::Filesystem::NamedTempFile("Armnn-DumpIncomingValidFileTest-TempFile"); armnn::Runtime::CreationOptions::ExternalProfilingOptions options; options.m_IncomingCaptureFile = fileName.string(); @@ -118,6 +117,7 @@ BOOST_AUTO_TEST_CASE(DumpIncomingValidFile) constexpr unsigned int bytesToSkip = 2u * sizeof(uint32_t); // skip header and packet length int diff = std::strncmp(data.data() + bytesToSkip, packetData, g_DataLength); BOOST_CHECK(diff == 0); + fs::remove(fileName); } BOOST_AUTO_TEST_CASE(DumpOutgoingInvalidFile) @@ -144,8 +144,7 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingInvalidFileIgnoreErrors) BOOST_AUTO_TEST_CASE(DumpOutgoingValidFile) { - boost::filesystem::path fileName = - boost::filesystem::temp_directory_path() / boost::filesystem::unique_path(); + fs::path fileName = armnnUtils::Filesystem::NamedTempFile("Armnn-DumpOutgoingValidFileTest-TempFile"); armnn::Runtime::CreationOptions::ExternalProfilingOptions options; options.m_IncomingCaptureFile = ""; @@ -164,6 +163,7 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFile) // check if the data read back from the dump file matches the original int diff = std::strncmp(data.data(), g_Data.data(), g_DataLength); BOOST_CHECK(diff == 0); + fs::remove(fileName); } BOOST_AUTO_TEST_SUITE_END() |