diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/armnn/Profiling.cpp | 2 | ||||
-rw-r--r-- | src/armnn/test/CsvReaderTest.cpp | 1 | ||||
-rw-r--r-- | src/armnn/test/InferOutputTests.hpp | 1 | ||||
-rw-r--r-- | src/armnn/test/ModelAccuracyCheckerTest.cpp | 1 | ||||
-rw-r--r-- | src/armnn/test/ProfilerTests.cpp | 19 | ||||
-rw-r--r-- | src/armnn/test/UnitTests.cpp | 14 | ||||
-rw-r--r-- | src/armnnConverter/ArmnnConverter.cpp | 15 | ||||
-rw-r--r-- | src/armnnUtils/CsvReader.cpp | 4 | ||||
-rw-r--r-- | src/armnnUtils/DotSerializer.cpp | 6 | ||||
-rw-r--r-- | src/backends/backendsCommon/DynamicBackendUtils.cpp | 5 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/BackendProfilingTests.cpp | 3 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp | 26 | ||||
-rw-r--r-- | src/backends/reference/test/RefLayerSupportTests.cpp | 7 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 13 |
14 files changed, 47 insertions, 70 deletions
diff --git a/src/armnn/Profiling.cpp b/src/armnn/Profiling.cpp index 7194064c11..9a9021a391 100644 --- a/src/armnn/Profiling.cpp +++ b/src/armnn/Profiling.cpp @@ -21,8 +21,6 @@ #include <map> #include <stack> -#include <boost/algorithm/string.hpp> - namespace armnn { diff --git a/src/armnn/test/CsvReaderTest.cpp b/src/armnn/test/CsvReaderTest.cpp index ed27e57f8e..8491ad778d 100644 --- a/src/armnn/test/CsvReaderTest.cpp +++ b/src/armnn/test/CsvReaderTest.cpp @@ -4,7 +4,6 @@ // #include "CsvReader.hpp" -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> #include <iostream> diff --git a/src/armnn/test/InferOutputTests.hpp b/src/armnn/test/InferOutputTests.hpp index 70afbc9b3f..0413682dad 100644 --- a/src/armnn/test/InferOutputTests.hpp +++ b/src/armnn/test/InferOutputTests.hpp @@ -14,7 +14,6 @@ #include <layers/PreluLayer.hpp> #include <layers/StackLayer.hpp> -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> void ArgMinMaxInferOutputShapeImpl(const armnn::ArgMinMaxDescriptor descriptor, diff --git a/src/armnn/test/ModelAccuracyCheckerTest.cpp b/src/armnn/test/ModelAccuracyCheckerTest.cpp index 8bbe3d9f41..1bffa9c57c 100644 --- a/src/armnn/test/ModelAccuracyCheckerTest.cpp +++ b/src/armnn/test/ModelAccuracyCheckerTest.cpp @@ -4,7 +4,6 @@ // #include "ModelAccuracyChecker.hpp" -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> #include <boost/filesystem.hpp> diff --git a/src/armnn/test/ProfilerTests.cpp b/src/armnn/test/ProfilerTests.cpp index 40e9f470ad..7bd258e430 100644 --- a/src/armnn/test/ProfilerTests.cpp +++ b/src/armnn/test/ProfilerTests.cpp @@ -9,7 +9,6 @@ #include <boost/test/unit_test.hpp> #include <boost/test/tools/output_test_stream.hpp> -#include <boost/algorithm/string.hpp> #include <memory> #include <thread> @@ -231,21 +230,21 @@ BOOST_AUTO_TEST_CASE(WriteEventResults) BOOST_TEST(!output.is_empty(false)); // output should contain event name 'test' - BOOST_CHECK(boost::contains(output.str(), "test")); + BOOST_CHECK(output.str().find("test") != std::string::npos); // output should contain headers - BOOST_CHECK(boost::contains(output.str(), "Event Sequence - Name")); - BOOST_CHECK(boost::contains(output.str(), "Event Stats - Name")); - BOOST_CHECK(boost::contains(output.str(), "Total")); - BOOST_CHECK(boost::contains(output.str(), "Device")); + BOOST_CHECK(output.str().find("Event Sequence - Name") != std::string::npos); + BOOST_CHECK(output.str().find("Event Stats - Name") != std::string::npos); + BOOST_CHECK(output.str().find("Total") != std::string::npos); + BOOST_CHECK(output.str().find("Device") != std::string::npos); // output should contain compute device 'CpuAcc' - BOOST_CHECK(boost::contains(output.str(), "CpuAcc")); + BOOST_CHECK(output.str().find("CpuAcc") != std::string::npos); // output should not contain un-readable numbers - BOOST_CHECK(!(boost::contains(output.str(), "e+"))); + BOOST_CHECK(output.str().find("e+") == std::string::npos); // output should not contain un-readable numbers - BOOST_CHECK(!(boost::contains(output.str(), "+"))); + BOOST_CHECK(output.str().find("+") == std::string::npos); // output should not contain zero value - BOOST_CHECK(!(boost::contains(output.str(), " 0 "))); + BOOST_CHECK(output.str().find(" 0 ") == std::string::npos); } // Disable profiling here to not print out anything on stdout. diff --git a/src/armnn/test/UnitTests.cpp b/src/armnn/test/UnitTests.cpp index 7d171a8d88..071bff0ed8 100644 --- a/src/armnn/test/UnitTests.cpp +++ b/src/armnn/test/UnitTests.cpp @@ -8,8 +8,6 @@ #include "UnitTests.hpp" #include <armnn/Logging.hpp> -#include <boost/algorithm/string.hpp> - struct ConfigureLoggingFixture { ConfigureLoggingFixture() @@ -103,12 +101,12 @@ BOOST_AUTO_TEST_CASE(LoggerTest) } - BOOST_CHECK(boost::contains(ss.str(), "Trace: My trace message; -2")); - BOOST_CHECK(boost::contains(ss.str(), "Debug: My debug message; -1")); - BOOST_CHECK(boost::contains(ss.str(), "Info: My info message; 0")); - BOOST_CHECK(boost::contains(ss.str(), "Warning: My warning message; 1")); - BOOST_CHECK(boost::contains(ss.str(), "Error: My error message; 2")); - BOOST_CHECK(boost::contains(ss.str(), "Fatal: My fatal message; 3")); + BOOST_CHECK(ss.str().find("Trace: My trace message; -2") != std::string::npos); + BOOST_CHECK(ss.str().find("Debug: My debug message; -1") != std::string::npos); + BOOST_CHECK(ss.str().find("Info: My info message; 0") != std::string::npos); + BOOST_CHECK(ss.str().find("Warning: My warning message; 1") != std::string::npos); + BOOST_CHECK(ss.str().find("Error: My error message; 2") != std::string::npos); + BOOST_CHECK(ss.str().find("Fatal: My fatal message; 3") != std::string::npos); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnnConverter/ArmnnConverter.cpp b/src/armnnConverter/ArmnnConverter.cpp index e0a659dca3..6d0952ac01 100644 --- a/src/armnnConverter/ArmnnConverter.cpp +++ b/src/armnnConverter/ArmnnConverter.cpp @@ -21,10 +21,9 @@ #endif #include <HeapProfiling.hpp> +#include "armnn/utility/StringUtils.hpp" #include <boost/format.hpp> -#include <boost/algorithm/string/split.hpp> -#include <boost/algorithm/string/classification.hpp> #include <boost/program_options.hpp> #include <cstdlib> @@ -43,17 +42,7 @@ armnn::TensorShape ParseTensorShape(std::istream& stream) while (std::getline(stream, line)) { - std::vector<std::string> tokens; - try - { - // Coverity fix: boost::split() may throw an exception of type boost::bad_function_call. - boost::split(tokens, line, boost::algorithm::is_any_of(","), boost::token_compress_on); - } - catch (const std::exception& e) - { - ARMNN_LOG(error) << "An error occurred when splitting tokens: " << e.what(); - continue; - } + std::vector<std::string> tokens = armnn::stringUtils::StringTokenizer(line, ","); for (const std::string& token : tokens) { if (!token.empty()) diff --git a/src/armnnUtils/CsvReader.cpp b/src/armnnUtils/CsvReader.cpp index ba6c42c376..feee4d18c6 100644 --- a/src/armnnUtils/CsvReader.cpp +++ b/src/armnnUtils/CsvReader.cpp @@ -4,8 +4,8 @@ // #include "CsvReader.hpp" +#include "armnn/utility/StringUtils.hpp" -#include <boost/algorithm/string.hpp> #include <boost/tokenizer.hpp> #include <fstream> @@ -24,7 +24,7 @@ CsvRow ParseLine(const std::string& csvLine) for (const auto &token : tokenizer) { - entry.values.push_back(boost::trim_copy(token)); + entry.values.push_back(armnn::stringUtils::StringTrimCopy(token)); } return entry; } diff --git a/src/armnnUtils/DotSerializer.cpp b/src/armnnUtils/DotSerializer.cpp index 80043a9f90..87376e61d1 100644 --- a/src/armnnUtils/DotSerializer.cpp +++ b/src/armnnUtils/DotSerializer.cpp @@ -4,8 +4,8 @@ // #include "DotSerializer.hpp" +#include "armnn/utility/StringUtils.hpp" -#include <boost/algorithm/string/replace.hpp> #include <sstream> #include <cstring> @@ -26,8 +26,8 @@ std::string Indent(int numSpaces) std::string Escape(std::string s) { - boost::replace_all(s, "<", "\\<"); - boost::replace_all(s, ">", "\\>"); + armnn::stringUtils::StringReplaceAll(s, "<", "\\<"); + armnn::stringUtils::StringReplaceAll(s, ">", "\\>"); return s; } diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index ea0869220f..5b675ba476 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -5,9 +5,9 @@ #include <armnn/Logging.hpp> #include <backendsCommon/DynamicBackendUtils.hpp> +#include "armnn/utility/StringUtils.hpp" #include <boost/filesystem.hpp> -#include <boost/algorithm/string.hpp> #include <regex> @@ -110,11 +110,10 @@ std::vector<std::string> DynamicBackendUtils::GetBackendPathsImpl(const std::str } std::unordered_set<std::string> uniqueBackendPaths; - std::vector<std::string> tempBackendPaths; std::vector<std::string> validBackendPaths; // Split the given list of paths - boost::split(tempBackendPaths, backendPaths, boost::is_any_of(":")); + std::vector<std::string> tempBackendPaths = armnn::stringUtils::StringTokenizer(backendPaths, ":"); for (const std::string& path : tempBackendPaths) { diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 7c78e14733..9f1898aa01 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -21,7 +21,6 @@ #include <armnn/Logging.hpp> #include <armnn/profiling/ISendTimelinePacket.hpp> -#include <boost/algorithm/string.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/unit_test.hpp> #include <vector> @@ -441,7 +440,7 @@ BOOST_AUTO_TEST_CASE(TestBackendCounterLogging) periodicCounterCapture.Stop(); SetLogFilter(armnn::LogSeverity::Fatal); - BOOST_CHECK(boost::contains(ss.str(), "ActivateCounters example test error")); + BOOST_CHECK(ss.str().find("ActivateCounters example test error") != std::string::npos); } BOOST_AUTO_TEST_CASE(BackendProfilingContextGetSendTimelinePacket) diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp index 91ce150e0e..2aa713f1ed 100644 --- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp @@ -4,6 +4,7 @@ // #include "JsonPrinterTestImpl.hpp" +#include "armnn/utility/StringUtils.hpp" #include <Profiling.hpp> @@ -11,7 +12,6 @@ #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> #include <sstream> @@ -62,7 +62,7 @@ std::vector<double> ExtractMeasurements(const std::string& exp) { try { - boost::trim_if(numberString, boost::is_any_of("\t,\n")); + armnn::stringUtils::StringTrim(numberString, "\t,\n"); numbers.push_back(std::stod(numberString)); } catch (std::invalid_argument const& e) @@ -77,7 +77,7 @@ std::vector<double> ExtractMeasurements(const std::string& exp) { try { - boost::trim_if(numberString, boost::is_any_of("\t,\n")); + armnn::stringUtils::StringTrim(numberString, "\t,\n"); numbers.push_back(std::stod(numberString)); } catch (std::invalid_argument const& e) @@ -212,8 +212,9 @@ inline void ValidateProfilerJson(std::string& result) std::vector<std::string> sectionVector = ExtractSections(result); for (size_t i = 0; i < sectionVector.size(); ++i) { - if (boost::contains(sectionVector[i], "\"ArmNN\":") - || boost::contains(sectionVector[i], "\"inference_measurements\":")) + + if (sectionVector[i].find("\"ArmNN\":") != std::string::npos + || sectionVector[i].find("\"inference_measurements\":") != std::string::npos) { sectionVector.erase(sectionVector.begin() + static_cast<int>(i)); } @@ -221,10 +222,10 @@ inline void ValidateProfilerJson(std::string& result) BOOST_CHECK(!sectionVector.empty()); BOOST_CHECK(std::all_of(sectionVector.begin(), sectionVector.end(), - [](std::string i) { return boost::contains(i, "\"raw\":"); })); + [](std::string i) { return (i.find("\"raw\":") != std::string::npos); })); BOOST_CHECK(std::all_of(sectionVector.begin(), sectionVector.end(), - [](std::string i) { return boost::contains(i, "\"unit\":"); })); + [](std::string i) { return (i.find("\"unit\":") != std::string::npos); })); } // remove the time measurements as they vary from test to test @@ -234,8 +235,8 @@ inline void ValidateProfilerJson(std::string& result) result.erase(std::remove_if (result.begin(),result.end(), [](char c) { return c == '\t'; }), result.end()); - BOOST_CHECK(boost::contains(result, "ArmNN")); - BOOST_CHECK(boost::contains(result, "inference_measurements")); + BOOST_CHECK(result.find("ArmNN") != std::string::npos); + BOOST_CHECK(result.find("inference_measurements") != std::string::npos); // ensure no spare parenthesis present in print output BOOST_CHECK(AreParenthesesMatching(result)); @@ -252,12 +253,11 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector<armnn::BackendId>& back const armnn::BackendId& firstBackend = backends.at(0); if (firstBackend == armnn::Compute::GpuAcc) { - BOOST_CHECK(boost::contains(result, - "OpenClKernelTimer/: softmax_layer_max_shift_exp_sum_quantized_serial GWS[,,]")); + BOOST_CHECK(result.find("OpenClKernelTimer/: softmax_layer_max_shift_exp_sum_quantized_serial GWS[,,]") + != std::string::npos); } else if (firstBackend == armnn::Compute::CpuAcc) { - BOOST_CHECK(boost::contains(result, - "NeonKernelTimer/: NEFillBorderKernel")); + BOOST_CHECK(result.find("NeonKernelTimer/: NEFillBorderKernel") != std::string::npos); } } diff --git a/src/backends/reference/test/RefLayerSupportTests.cpp b/src/backends/reference/test/RefLayerSupportTests.cpp index f0c69f92cc..1d4b4a0f3a 100644 --- a/src/backends/reference/test/RefLayerSupportTests.cpp +++ b/src/backends/reference/test/RefLayerSupportTests.cpp @@ -14,7 +14,6 @@ #include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> #include <boost/test/unit_test.hpp> -#include <boost/algorithm/string/trim.hpp> #include <string> @@ -231,9 +230,9 @@ BOOST_AUTO_TEST_CASE(IsLayerNotSupportedMeanDimensionsReference) BOOST_CHECK(!result); - boost::algorithm::trim(reasonIfUnsupported); - BOOST_CHECK_EQUAL(reasonIfUnsupported, - "Reference Mean: Expected 4 dimensions but got 2 dimensions instead, for the 'output' tensor."); + BOOST_CHECK(reasonIfUnsupported.find( + "Reference Mean: Expected 4 dimensions but got 2 dimensions instead, for the 'output' tensor.") + != std::string::npos); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index f252579022..b3326e0173 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -37,7 +37,6 @@ #include <armnn/Utils.hpp> #include <armnn/utility/IgnoreUnused.hpp> -#include <boost/algorithm/string.hpp> #include <boost/numeric/conversion/cast.hpp> #include <cstdint> @@ -3054,7 +3053,7 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceEnabled) streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Cannot connect to stream socket: Connection refused")) + if (ss.str().find("Cannot connect to stream socket: Connection refused") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); @@ -3089,7 +3088,7 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceEnabledRuntime) streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Cannot connect to stream socket: Connection refused")) + if (ss.str().find("Cannot connect to stream socket: Connection refused") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); @@ -3152,7 +3151,7 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceBadConnectionAcknowledgedPacket) streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Functor with requested PacketId=37 and Version=4194304 does not exist")) + if (ss.str().find("Functor with requested PacketId=37 and Version=4194304 does not exist") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); @@ -3216,7 +3215,7 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceBadRequestCounterDirectoryPacket) streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Functor with requested PacketId=123 and Version=4194304 does not exist")) + if (ss.str().find("Functor with requested PacketId=123 and Version=4194304 does not exist") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); @@ -3280,7 +3279,7 @@ BOOST_AUTO_TEST_CASE(CheckProfilingServiceBadPeriodicCounterSelectionPacket) streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Functor with requested PacketId=999 and Version=4194304 does not exist")) + if (ss.str().find("Functor with requested PacketId=999 and Version=4194304 does not exist") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); @@ -3604,7 +3603,7 @@ BOOST_AUTO_TEST_CASE(CheckFileFormat) { streamRedirector.CancelRedirect(); // Check that the expected error has occurred and logged to the standard output - if (!boost::contains(ss.str(), "Unsupported profiling file format, only binary is supported")) + if (ss.str().find("Unsupported profiling file format, only binary is supported") == std::string::npos) { std::cout << ss.str(); BOOST_FAIL("Expected string not found."); |