diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-28 16:22:22 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-12-05 11:03:35 +0000 |
| commit | 2135015779092e259ad5d5df185eda0c34b56359 (patch) | |
| tree | 744a46d8f6036ac13fc40ab5001ad2ad05fb4525 /src/armnn | |
| parent | 24df822711e14cd3099a926272d863ed139ed4d7 (diff) | |
| download | armnn-2135015779092e259ad5d5df185eda0c34b56359.tar.gz | |
IVGCVSW-2264 Move DataLayoutIndexed to armnnUtils
* Since DataLayoutIndexed is now required in the TF parser, this
changes move it to the armnnUtils library so that it'll be
accessible by the armnnTfParser
* Modified CMake files and Android.mk files accordingly
Change-Id: Ie2620359ef288aeff64cb9e9bec068a466eee0e9
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/layers/BatchToSpaceNdLayer.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/layers/Convolution2dLayer.cpp | 5 | ||||
| -rw-r--r-- | src/armnn/layers/DepthwiseConvolution2dLayer.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/layers/Pooling2dLayer.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/layers/ResizeBilinearLayer.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/layers/SpaceToBatchNdLayer.cpp | 5 | ||||
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 4 |
7 files changed, 30 insertions, 8 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 { diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 349c6a765a..3dc18b9e18 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -8,12 +8,12 @@ #include <boost/cast.hpp> -#include <backendsCommon/DataLayoutIndexed.hpp> #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <Graph.hpp> +#include <DataLayoutIndexed.hpp> #include <utility> @@ -861,7 +861,7 @@ std::unique_ptr<ResizeBilinearWorkload> CreateResizeBilinearWorkloadTest(armnn:: // Creates the layer we're testing. ResizeBilinearDescriptor resizeDesc; - DataLayoutIndexed dimensionIndices = dataLayout; + armnnUtils::DataLayoutIndexed dimensionIndices = dataLayout; resizeDesc.m_TargetWidth = outputShape[dimensionIndices.GetWidthIndex()]; resizeDesc.m_TargetHeight = outputShape[dimensionIndices.GetHeightIndex()]; resizeDesc.m_DataLayout = dataLayout; |