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/test/CreateWorkload.hpp | |
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/test/CreateWorkload.hpp')
-rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |