Remove Logging.hpp from ArmNN.hpp

Logging.hpp is mainly useful for raising Arm NN log messages. There's
very little point in automatically including it for users of the library
via the ArmNN.hpp convenience header.

Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
Change-Id: I71fb3188dc0b30c1bbc86a31996470c707d38c19

diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index 119520b..b18f14c 100644 (file)
--- a/include/armnn/ArmNN.hpp
+++ b/include/armnn/ArmNN.hpp
@@ -9,7 +9,6 @@
 #include "Exceptions.hpp"
 #include "INetwork.hpp"
 #include "IRuntime.hpp"
-#include "Logging.hpp"
 #include "LstmParams.hpp"
 #include "Optional.hpp"
 #include "QuantizedLstmParams.hpp"

diff --git a/src/armnn/Graph.cpp b/src/armnn/Graph.cpp
index 0ba627c..8e7f75b 100644 (file)
--- a/src/armnn/Graph.cpp
+++ b/src/armnn/Graph.cpp
@@ -10,8 +10,9 @@
 #include <armnn/backends/IBackendInternal.hpp>
 
 #include <armnn/BackendId.hpp>
-#include <armnn/Utils.hpp>
+#include <armnn/Logging.hpp>
 #include <armnn/TypesUtils.hpp>
+#include <armnn/Utils.hpp>
 
 #include <boost/polymorphic_cast.hpp>
 #include <boost/assert.hpp>

diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index b830e67..2e95dd8 100644 (file)
--- a/src/armnn/LoadedNetwork.cpp
+++ b/src/armnn/LoadedNetwork.cpp
@@ -12,6 +12,7 @@
 #include "HeapProfiling.hpp"
 
 #include <armnn/BackendRegistry.hpp>
+#include <armnn/Logging.hpp>
 
 #include <backendsCommon/CpuTensorHandle.hpp>
 #include <armnn/backends/IMemoryManager.hpp>

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 554e2e2..43c79c8 100644 (file)
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -21,6 +21,7 @@
 #include <armnn/Utils.hpp>
 #include <armnn/TypesUtils.hpp>
 #include <armnn/BackendRegistry.hpp>
+#include <armnn/Logging.hpp>
 
 #include <ProfilingService.hpp>
 

diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp
index 1e3e232..2d7269a 100644 (file)
--- a/src/armnn/Runtime.cpp
+++ b/src/armnn/Runtime.cpp
@@ -6,6 +6,7 @@
 
 #include <armnn/Version.hpp>
 #include <armnn/BackendRegistry.hpp>
+#include <armnn/Logging.hpp>
 
 #include <armnn/backends/IBackendContext.hpp>
 #include <backendsCommon/DynamicBackendUtils.hpp>

diff --git a/src/armnnConverter/ArmnnConverter.cpp b/src/armnnConverter/ArmnnConverter.cpp
index 28e94a0..de1311d 100644 (file)
--- a/src/armnnConverter/ArmnnConverter.cpp
+++ b/src/armnnConverter/ArmnnConverter.cpp
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 #include <armnn/ArmNN.hpp>
+#include <armnn/Logging.hpp>
 
 #if defined(ARMNN_CAFFE_PARSER)
 #include <armnnCaffeParser/ICaffeParser.hpp>

diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp
index f893458..ea08692 100644 (file)
--- a/src/backends/backendsCommon/DynamicBackendUtils.cpp
+++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+#include <armnn/Logging.hpp>
 #include <backendsCommon/DynamicBackendUtils.hpp>
 
 #include <boost/filesystem.hpp>

diff --git a/src/backends/reference/workloads/RefNormalizationWorkload.cpp b/src/backends/reference/workloads/RefNormalizationWorkload.cpp
index adf452d..77497c4 100644 (file)
--- a/src/backends/reference/workloads/RefNormalizationWorkload.cpp
+++ b/src/backends/reference/workloads/RefNormalizationWorkload.cpp
@@ -4,18 +4,19 @@
 //
 
 #include "RefNormalizationWorkload.hpp"
-#include "RefWorkloadUtils.hpp"
-#include "Decoders.hpp"
-#include "Encoders.hpp"
 
+#include <armnn/Logging.hpp>
 #include <armnn/Tensor.hpp>
-
 #include <armnnUtils/DataLayoutIndexed.hpp>
 
 #include <Profiling.hpp>
 
 #include <boost/numeric/conversion/cast.hpp>
 
+#include "RefWorkloadUtils.hpp"
+#include "Decoders.hpp"
+#include "Encoders.hpp"
+
 using namespace armnn;
 using namespace armnnUtils;