From 39ef3e595b8e0158875c0346855af5af679d78ad Mon Sep 17 00:00:00 2001
From: Matthew Bentham <Matthew.Bentham@arm.com>
Date: Mon, 20 Jan 2020 10:09:09 +0000
Subject: Remove use of ArmNN.hpp where it is unnecessary.

Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
Change-Id: I6c90eab1c6bad76d5c7b3bf094998fa4b454bcd1
---
 src/armnn/LayerSupport.cpp                                | 1 -
 src/armnn/Profiling.hpp                                   | 1 -
 src/armnn/layers/LstmLayer.cpp                            | 1 +
 src/armnn/layers/QuantizedLstmLayer.cpp                   | 1 +
 src/armnn/test/ProfilerTests.cpp                          | 4 +++-
 src/armnnConverter/ArmnnConverter.cpp                     | 1 -
 src/armnnOnnxParser/OnnxParser.cpp                        | 2 +-
 src/armnnTfLiteParser/TfLiteParser.cpp                    | 2 +-
 src/backends/cl/test/ClOptimizedNetworkTests.cpp          | 3 +--
 src/backends/cl/test/Fp16SupportTest.cpp                  | 1 -
 src/backends/cl/workloads/ClLstmFloatWorkload.hpp         | 2 ++
 src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp     | 3 ++-
 src/backends/neon/workloads/NeonLstmFloatWorkload.hpp     | 2 ++
 src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp | 1 +
 14 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp
index 2749d7bd7a..dac88385b1 100644
--- a/src/armnn/LayerSupport.cpp
+++ b/src/armnn/LayerSupport.cpp
@@ -15,7 +15,6 @@
 #include <cstring>
 #include <algorithm>
 #include <unordered_map>
-#include <armnn/ArmNN.hpp>
 
 namespace
 {
diff --git a/src/armnn/Profiling.hpp b/src/armnn/Profiling.hpp
index d52bbb0aec..4afd6911c2 100644
--- a/src/armnn/Profiling.hpp
+++ b/src/armnn/Profiling.hpp
@@ -6,7 +6,6 @@
 
 #include "ProfilingEvent.hpp"
 
-#include "armnn/ArmNN.hpp"
 #include "armnn/IProfiler.hpp"
 
 #include "WallClockTimer.hpp"
diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp
index 1aa10ea030..581ba45c5f 100644
--- a/src/armnn/layers/LstmLayer.cpp
+++ b/src/armnn/layers/LstmLayer.cpp
@@ -6,6 +6,7 @@
 
 #include "LayerCloneBase.hpp"
 
+#include <armnn/LstmParams.hpp>
 #include <armnn/TypesUtils.hpp>
 #include <backendsCommon/CpuTensorHandle.hpp>
 #include <backendsCommon/WorkloadFactory.hpp>
diff --git a/src/armnn/layers/QuantizedLstmLayer.cpp b/src/armnn/layers/QuantizedLstmLayer.cpp
index 1c22ab4c92..8717041a53 100644
--- a/src/armnn/layers/QuantizedLstmLayer.cpp
+++ b/src/armnn/layers/QuantizedLstmLayer.cpp
@@ -6,6 +6,7 @@
 
 #include "LayerCloneBase.hpp"
 
+#include <armnn/QuantizedLstmParams.hpp>
 #include <armnn/TypesUtils.hpp>
 #include <backendsCommon/CpuTensorHandle.hpp>
 #include <backendsCommon/WorkloadFactory.hpp>
diff --git a/src/armnn/test/ProfilerTests.cpp b/src/armnn/test/ProfilerTests.cpp
index b4720f2902..a052862bdd 100644
--- a/src/armnn/test/ProfilerTests.cpp
+++ b/src/armnn/test/ProfilerTests.cpp
@@ -3,6 +3,9 @@
 // SPDX-License-Identifier: MIT
 //
 
+#include <armnn/IRuntime.hpp>
+#include <armnn/TypesUtils.hpp>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/algorithm/string.hpp>
@@ -11,7 +14,6 @@
 #include <thread>
 #include <ostream>
 
-#include <armnn/TypesUtils.hpp>
 #include <Profiling.hpp>
 
 namespace armnn
diff --git a/src/armnnConverter/ArmnnConverter.cpp b/src/armnnConverter/ArmnnConverter.cpp
index de1311d825..70df2c3a5a 100644
--- a/src/armnnConverter/ArmnnConverter.cpp
+++ b/src/armnnConverter/ArmnnConverter.cpp
@@ -2,7 +2,6 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
-#include <armnn/ArmNN.hpp>
 #include <armnn/Logging.hpp>
 
 #if defined(ARMNN_CAFFE_PARSER)
diff --git a/src/armnnOnnxParser/OnnxParser.cpp b/src/armnnOnnxParser/OnnxParser.cpp
index 42bc427638..89be4289d6 100644
--- a/src/armnnOnnxParser/OnnxParser.cpp
+++ b/src/armnnOnnxParser/OnnxParser.cpp
@@ -4,7 +4,7 @@
 //
 #include "OnnxParser.hpp"
 
-#include <armnn/ArmNN.hpp>
+#include <armnn/Descriptors.hpp>
 #include <armnn/Utils.hpp>
 #include <VerificationHelpers.hpp>
 
diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 69bd59a21f..17c0781740 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -5,7 +5,7 @@
 
 #include "TfLiteParser.hpp"
 
-#include <armnn/ArmNN.hpp>
+#include <armnn/Descriptors.hpp>
 #include <armnn/Exceptions.hpp>
 #include <armnn/Logging.hpp>
 #include <armnn/TypesUtils.hpp>
diff --git a/src/backends/cl/test/ClOptimizedNetworkTests.cpp b/src/backends/cl/test/ClOptimizedNetworkTests.cpp
index 824375ef86..c2a8005e8a 100644
--- a/src/backends/cl/test/ClOptimizedNetworkTests.cpp
+++ b/src/backends/cl/test/ClOptimizedNetworkTests.cpp
@@ -5,7 +5,6 @@
 
 #include "ClWorkloadFactoryHelper.hpp"
 
-#include <armnn/ArmNN.hpp>
 #include <Network.hpp>
 
 #include <test/GraphUtils.hpp>
@@ -101,4 +100,4 @@ BOOST_AUTO_TEST_CASE(FP16TurboModeTestOnGpuAcc)
     BOOST_TEST(GraphHasNamedLayer(graph, "output layer"));
 }
 
-BOOST_AUTO_TEST_SUITE_END();
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END();
diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp
index f117c92e49..ee5163f668 100644
--- a/src/backends/cl/test/Fp16SupportTest.cpp
+++ b/src/backends/cl/test/Fp16SupportTest.cpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <armnn/ArmNN.hpp>
 #include <armnn/Descriptors.hpp>
 #include <armnn/IRuntime.hpp>
 #include <armnn/INetwork.hpp>
diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp
index 5bd67c256f..ae42d6ecc3 100644
--- a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp
+++ b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <armnn/Descriptors.hpp>
+#include <armnn/LstmParams.hpp>
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
 
diff --git a/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp b/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp
index c7d83755c7..580db490d6 100644
--- a/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp
+++ b/src/backends/cl/workloads/ClQuantizedLstmWorkload.hpp
@@ -5,10 +5,11 @@
 
 #pragma once
 
+#include <armnn/QuantizedLstmParams.hpp>
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
 
-#include <arm_compute/runtime/CL/CLFunctions.h>
+#include <arm_compute/runtime/CL/functions/CLLSTMLayerQuantized.h>
 
 namespace armnn
 {
diff --git a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp
index c116cdd967..9a9a878574 100644
--- a/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp
+++ b/src/backends/neon/workloads/NeonLstmFloatWorkload.hpp
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <armnn/Descriptors.hpp>
+#include <armnn/LstmParams.hpp>
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
 
diff --git a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp
index c3bcf785ad..740cb4a316 100644
--- a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp
+++ b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.hpp
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <armnn/QuantizedLstmParams.hpp>
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
 
-- 
cgit v1.2.1