From 44f4fb590ac980e68b5bd7f78c41454c97378180 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Wed, 18 May 2022 09:21:15 +0100
Subject: Tidy up some code in the reference backend

Make some things private that don't need to be public in RefElementwiseWorkload.

Remove non-workload header files from RefWorkloads.hpp - the non-workload header
files are implementation detail of individual workloads, whereas RefWorloads.hpp
should only contain the workload definitions, needed for RefWorkloadFactory.

Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Change-Id: I4c28963a027162a6560e56cf84b6c0063283e48f
---
 .../reference/workloads/RefElementwiseWorkload.hpp        |  8 ++++----
 src/backends/reference/workloads/RefWorkloads.hpp         | 15 ---------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/backends/reference/workloads/RefElementwiseWorkload.hpp b/src/backends/reference/workloads/RefElementwiseWorkload.hpp
index 065a7833d7..579e5def34 100644
--- a/src/backends/reference/workloads/RefElementwiseWorkload.hpp
+++ b/src/backends/reference/workloads/RefElementwiseWorkload.hpp
@@ -21,15 +21,15 @@ template <typename Functor, typename ParentDescriptor, typename armnn::StringMap
 class RefElementwiseWorkload : public RefBaseWorkload<ParentDescriptor>
 {
 public:
-    using InType = typename ElementwiseBinaryFunction<Functor>::InType;
-    using OutType = typename ElementwiseBinaryFunction<Functor>::OutType;
-    using RefBaseWorkload<ParentDescriptor>::m_Data;
-
     RefElementwiseWorkload(const ParentDescriptor& descriptor, const WorkloadInfo& info);
     void Execute() const override;
     void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor)  override;
 
 private:
+    using InType = typename ElementwiseBinaryFunction<Functor>::InType;
+    using OutType = typename ElementwiseBinaryFunction<Functor>::OutType;
+    using RefBaseWorkload<ParentDescriptor>::m_Data;
+
     void Execute(std::vector<ITensorHandle*> inputs, std::vector<ITensorHandle*> outputs) const;
 };
 
diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp
index 3e83304616..b9c7a2a1fb 100644
--- a/src/backends/reference/workloads/RefWorkloads.hpp
+++ b/src/backends/reference/workloads/RefWorkloads.hpp
@@ -5,16 +5,6 @@
 
 #pragma once
 
-#include "Activation.hpp"
-#include "ArgMinMax.hpp"
-#include "BatchNormImpl.hpp"
-#include "ConvImpl.hpp"
-#include "Concatenate.hpp"
-#include "ElementwiseFunction.hpp"
-#include "FullyConnected.hpp"
-#include "Gather.hpp"
-#include "Pooling2d.hpp"
-#include "Pooling3d.hpp"
 #include "RefActivationWorkload.hpp"
 #include "RefArgMinMaxWorkload.hpp"
 #include "RefBatchNormalizationWorkload.hpp"
@@ -74,8 +64,3 @@
 #include "RefTransposeConvolution2dWorkload.hpp"
 #include "RefTransposeWorkload.hpp"
 #include "RefUnidirectionalSequenceLstmWorkload.hpp"
-#include "RefWorkloadUtils.hpp"
-#include "Resize.hpp"
-#include "Softmax.hpp"
-#include "Splitter.hpp"
-#include "TensorBufferArrayView.hpp"
-- 
cgit v1.2.1