From f48afc6c385cda14e34b0121e02adcb853dedc87 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <Matthew.Bentham@arm.com>
Date: Wed, 15 Jan 2020 17:55:08 +0000
Subject: 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
---
 include/armnn/ArmNN.hpp                                       | 1 -
 src/armnn/Graph.cpp                                           | 3 ++-
 src/armnn/LoadedNetwork.cpp                                   | 1 +
 src/armnn/Network.cpp                                         | 1 +
 src/armnn/Runtime.cpp                                         | 1 +
 src/armnnConverter/ArmnnConverter.cpp                         | 1 +
 src/backends/backendsCommon/DynamicBackendUtils.cpp           | 1 +
 src/backends/reference/workloads/RefNormalizationWorkload.cpp | 9 +++++----
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index 119520b7c9..b18f14c8b7 100644
--- 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 0ba627ca82..8e7f75b2b8 100644
--- 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 b830e6742e..2e95dd8d6c 100644
--- 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 554e2e26a5..43c79c8479 100644
--- 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 1e3e232046..2d7269a09c 100644
--- 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 28e94a07c5..de1311d825 100644
--- 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 f893458b88..ea0869220f 100644
--- 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 adf452dde1..77497c4458 100644
--- 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;
 
-- 
cgit v1.2.1