diff options
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/backendsCommon/DynamicBackendUtils.cpp | 55 | ||||
-rw-r--r-- | src/backends/backendsCommon/OutputHandler.cpp | 1 | ||||
-rw-r--r-- | src/backends/cl/ClBackendContext.cpp | 9 | ||||
-rw-r--r-- | src/backends/cl/ClContextControl.cpp | 1 | ||||
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 1 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 1 | ||||
-rw-r--r-- | src/backends/reference/workloads/Activation.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefNormalizationWorkload.cpp | 5 |
8 files changed, 34 insertions, 41 deletions
diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index da7c3244f1..b31ce60564 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -7,7 +7,6 @@ #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> -#include <boost/log/trivial.hpp> #include <regex> @@ -84,8 +83,8 @@ std::vector<std::string> DynamicBackendUtils::GetBackendPaths(const std::string& { if (!IsPathValid(overrideBackendPath)) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: The given override path for dynamic backends \"" - << overrideBackendPath << "\" is not valid"; + ARMNN_LOG(warning) << "WARNING: The given override path for dynamic backends \"" + << overrideBackendPath << "\" is not valid"; return {}; } @@ -146,7 +145,7 @@ bool DynamicBackendUtils::IsPathValid(const std::string& path) { if (path.empty()) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: The given backend path is empty"; + ARMNN_LOG(warning) << "WARNING: The given backend path is empty"; return false; } @@ -154,19 +153,19 @@ bool DynamicBackendUtils::IsPathValid(const std::string& path) if (!boost::filesystem::exists(boostPath)) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: The given backend path \"" << path << "\" does not exist"; + ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" does not exist"; return false; } if (!boost::filesystem::is_directory(boostPath)) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: The given backend path \"" << path << "\" is not a directory"; + ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" is not a directory"; return false; } if (!boostPath.is_absolute()) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: The given backend path \"" << path << "\" is not absolute"; + ARMNN_LOG(warning) << "WARNING: The given backend path \"" << path << "\" is not absolute"; return false; } @@ -214,7 +213,7 @@ std::vector<std::string> DynamicBackendUtils::GetSharedObjects(const std::vector } catch (const filesystem_error& e) { - BOOST_LOG_TRIVIAL(warning) << "GetSharedObjects warning: " << e.what(); + ARMNN_LOG(warning) << "GetSharedObjects warning: " << e.what(); } if (canonicalPath.empty()) { @@ -235,7 +234,7 @@ std::vector<std::string> DynamicBackendUtils::GetSharedObjects(const std::vector } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(warning) << "GetSharedObjects warning: " << e.what(); + ARMNN_LOG(warning) << "GetSharedObjects warning: " << e.what(); } if (!filenameMatch) { @@ -274,13 +273,13 @@ std::vector<DynamicBackendPtr> DynamicBackendUtils::CreateDynamicBackends(const } catch (const RuntimeException& e) { - BOOST_LOG_TRIVIAL(warning) << "Cannot create a handle to the shared object file \"" - << sharedObject << "\": " << e.what(); + ARMNN_LOG(warning) << "Cannot create a handle to the shared object file \"" + << sharedObject << "\": " << e.what(); continue; } if (!sharedObjectHandle) { - BOOST_LOG_TRIVIAL(warning) << "Invalid handle to the shared object file \"" << sharedObject << "\""; + ARMNN_LOG(warning) << "Invalid handle to the shared object file \"" << sharedObject << "\""; continue; } @@ -293,14 +292,14 @@ std::vector<DynamicBackendPtr> DynamicBackendUtils::CreateDynamicBackends(const } catch (const Exception& e) { - BOOST_LOG_TRIVIAL(warning) << "Cannot create a valid dynamic backend from the shared object file \"" - << sharedObject << "\": " << e.what(); + ARMNN_LOG(warning) << "Cannot create a valid dynamic backend from the shared object file \"" + << sharedObject << "\": " << e.what(); continue; } if (!dynamicBackend) { - BOOST_LOG_TRIVIAL(warning) << "Invalid dynamic backend object for the shared object file \"" - << sharedObject << "\""; + ARMNN_LOG(warning) << "Invalid dynamic backend object for the shared object file \"" + << sharedObject << "\""; continue; } @@ -337,14 +336,14 @@ BackendIdSet DynamicBackendUtils::RegisterDynamicBackendsImpl(BackendRegistry& b } catch (const RuntimeException& e) { - BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend, " - << "an error has occurred when getting the backend id: " << e.what(); + ARMNN_LOG(warning) << "Cannot register dynamic backend, " + << "an error has occurred when getting the backend id: " << e.what(); continue; } if (dynamicBackendId.IsEmpty() || dynamicBackendId.IsUndefined()) { - BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend, invalid backend id: " << dynamicBackendId; + ARMNN_LOG(warning) << "Cannot register dynamic backend, invalid backend id: " << dynamicBackendId; continue; } @@ -352,8 +351,8 @@ BackendIdSet DynamicBackendUtils::RegisterDynamicBackendsImpl(BackendRegistry& b bool backendAlreadyRegistered = backendRegistry.IsBackendRegistered(dynamicBackendId); if (backendAlreadyRegistered) { - BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId - << "\": backend already registered"; + ARMNN_LOG(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": backend already registered"; continue; } @@ -365,15 +364,15 @@ BackendIdSet DynamicBackendUtils::RegisterDynamicBackendsImpl(BackendRegistry& b } catch (const RuntimeException& e) { - BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId - << "\": an error has occurred when getting the backend factory function: " - << e.what(); + ARMNN_LOG(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": an error has occurred when getting the backend factory function: " + << e.what(); continue; } if (dynamicBackendFactoryFunction == nullptr) { - BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId - << "\": invalid backend factory function"; + ARMNN_LOG(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": invalid backend factory function"; continue; } @@ -384,8 +383,8 @@ BackendIdSet DynamicBackendUtils::RegisterDynamicBackendsImpl(BackendRegistry& b } catch (const InvalidArgumentException& e) { - BOOST_LOG_TRIVIAL(warning) << "An error has occurred when registering the dynamic backend \"" - << dynamicBackendId << "\": " << e.what(); + ARMNN_LOG(warning) << "An error has occurred when registering the dynamic backend \"" + << dynamicBackendId << "\": " << e.what(); continue; } diff --git a/src/backends/backendsCommon/OutputHandler.cpp b/src/backends/backendsCommon/OutputHandler.cpp index e3a1b276ea..e3655b08fa 100644 --- a/src/backends/backendsCommon/OutputHandler.cpp +++ b/src/backends/backendsCommon/OutputHandler.cpp @@ -11,7 +11,6 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <boost/assert.hpp> -#include <boost/log/trivial.hpp> namespace armnn { diff --git a/src/backends/cl/ClBackendContext.cpp b/src/backends/cl/ClBackendContext.cpp index 48682b90dd..a82391cce5 100644 --- a/src/backends/cl/ClBackendContext.cpp +++ b/src/backends/cl/ClBackendContext.cpp @@ -4,14 +4,15 @@ // #include "ClBackendContext.hpp" + +#include <armnn/Logging.hpp> + #include "ClContextControl.hpp" #include <arm_compute/core/CL/OpenCL.h> #include <arm_compute/core/CL/CLKernelLibrary.h> #include <arm_compute/runtime/CL/CLScheduler.h> -#include <boost/log/trivial.hpp> - namespace armnn { @@ -34,8 +35,8 @@ struct ClBackendContext::ClContextControlWrapper } catch (const cl::Error&) { - BOOST_LOG_TRIVIAL(warning) << "WARNING: Runtime::UnloadNetwork(): an error occurred while waiting for " - "the queued CL requests to finish"; + ARMNN_LOG(warning) << "Runtime::UnloadNetwork(): an error occurred while waiting for " + "the queued CL requests to finish"; return false; } } diff --git a/src/backends/cl/ClContextControl.cpp b/src/backends/cl/ClContextControl.cpp index 7013b8a4f8..cf5ae64c78 100644 --- a/src/backends/cl/ClContextControl.cpp +++ b/src/backends/cl/ClContextControl.cpp @@ -14,7 +14,6 @@ #include <boost/assert.hpp> #include <boost/format.hpp> -#include <boost/log/trivial.hpp> #include <boost/polymorphic_cast.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 804580575e..531f3710ea 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -25,7 +25,6 @@ #include <boost/polymorphic_cast.hpp> #include <boost/format.hpp> -#include <boost/log/trivial.hpp> namespace armnn { diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 7fd93435e7..8d044eecb7 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -12,7 +12,6 @@ #include "workloads/RefWorkloads.hpp" #include "RefTensorHandle.hpp" -#include <boost/log/trivial.hpp> namespace armnn { diff --git a/src/backends/reference/workloads/Activation.cpp b/src/backends/reference/workloads/Activation.cpp index 2b0c84e226..814a0ddd13 100644 --- a/src/backends/reference/workloads/Activation.cpp +++ b/src/backends/reference/workloads/Activation.cpp @@ -5,8 +5,6 @@ #include "Activation.hpp" -#include <boost/log/trivial.hpp> - #include <cmath> namespace armnn diff --git a/src/backends/reference/workloads/RefNormalizationWorkload.cpp b/src/backends/reference/workloads/RefNormalizationWorkload.cpp index 0427baf475..adf452dde1 100644 --- a/src/backends/reference/workloads/RefNormalizationWorkload.cpp +++ b/src/backends/reference/workloads/RefNormalizationWorkload.cpp @@ -14,7 +14,6 @@ #include <Profiling.hpp> -#include <boost/log/trivial.hpp> #include <boost/numeric/conversion/cast.hpp> using namespace armnn; @@ -196,13 +195,13 @@ void RefNormalizationWorkload::Execute() const } else { - BOOST_LOG_TRIVIAL(warning) << "Illegal NORMALIZATION mode in normalization_f32"; + ARMNN_LOG(warning) << "Illegal NORMALIZATION mode in normalization_f32"; return; } } else { - BOOST_LOG_TRIVIAL(warning) << "Lcr method (Jarret 2009: Local Contrast Normalization) not supported yet."; + ARMNN_LOG(warning) << "Lcr method (Jarret 2009: Local Contrast Normalization) not supported yet."; return; } } |