aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/layers
diff options
context:
space:
mode:
Diffstat (limited to 'src/armnn/layers')
-rw-r--r--src/armnn/layers/BatchToSpaceNdLayer.cpp6
-rw-r--r--src/armnn/layers/Convolution2dLayer.cpp5
-rw-r--r--src/armnn/layers/DepthwiseConvolution2dLayer.cpp6
-rw-r--r--src/armnn/layers/Pooling2dLayer.cpp6
-rw-r--r--src/armnn/layers/ResizeBilinearLayer.cpp6
-rw-r--r--src/armnn/layers/SpaceToBatchNdLayer.cpp5
6 files changed, 28 insertions, 6 deletions
diff --git a/src/armnn/layers/BatchToSpaceNdLayer.cpp b/src/armnn/layers/BatchToSpaceNdLayer.cpp
index e1b78b21df..8ac4cb95bb 100644
--- a/src/armnn/layers/BatchToSpaceNdLayer.cpp
+++ b/src/armnn/layers/BatchToSpaceNdLayer.cpp
@@ -9,11 +9,15 @@
#include "BatchToSpaceNdLayer.hpp"
#include <armnn/TypesUtils.hpp>
+
#include <backendsCommon/CpuTensorHandle.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
#include <backendsCommon/WorkloadData.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
+
namespace armnn
{
diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp
index 4d3553f0cc..4756e1daae 100644
--- a/src/armnn/layers/Convolution2dLayer.cpp
+++ b/src/armnn/layers/Convolution2dLayer.cpp
@@ -8,9 +8,12 @@
#include <armnn/TypesUtils.hpp>
#include <backendsCommon/CpuTensorHandle.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
+
namespace armnn
{
diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp
index 6ad32a756a..95d4690d4f 100644
--- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp
+++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp
@@ -7,10 +7,14 @@
#include "LayerCloneBase.hpp"
#include <armnn/TypesUtils.hpp>
+
#include <backendsCommon/CpuTensorHandle.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
+
namespace armnn
{
diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp
index 24b7a69c49..d4af056217 100644
--- a/src/armnn/layers/Pooling2dLayer.cpp
+++ b/src/armnn/layers/Pooling2dLayer.cpp
@@ -7,10 +7,14 @@
#include "LayerCloneBase.hpp"
#include <armnn/TypesUtils.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
+
#include <backendsCommon/WorkloadData.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
+
namespace armnn
{
diff --git a/src/armnn/layers/ResizeBilinearLayer.cpp b/src/armnn/layers/ResizeBilinearLayer.cpp
index f72ccfce90..c7c92d7394 100644
--- a/src/armnn/layers/ResizeBilinearLayer.cpp
+++ b/src/armnn/layers/ResizeBilinearLayer.cpp
@@ -7,10 +7,14 @@
#include "LayerCloneBase.hpp"
#include <armnn/TypesUtils.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
+
#include <backendsCommon/WorkloadData.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
+
namespace armnn
{
diff --git a/src/armnn/layers/SpaceToBatchNdLayer.cpp b/src/armnn/layers/SpaceToBatchNdLayer.cpp
index 658945ef08..38540d522d 100644
--- a/src/armnn/layers/SpaceToBatchNdLayer.cpp
+++ b/src/armnn/layers/SpaceToBatchNdLayer.cpp
@@ -9,12 +9,15 @@
#include <armnn/TypesUtils.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
#include <backendsCommon/WorkloadData.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
+#include <DataLayoutIndexed.hpp>
+
#include <numeric>
+using namespace armnnUtils;
+
namespace armnn
{