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/backends/backendsCommon/test | |
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/backends/backendsCommon/test')
-rw-r--r-- | src/backends/backendsCommon/test/BatchNormTestImpl.hpp | 6 | ||||
-rwxr-xr-x | src/backends/backendsCommon/test/Conv2dTestImpl.hpp | 17 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/Pooling2dTestImpl.hpp | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp index 6325130218..d63f0b5610 100644 --- a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp +++ b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp @@ -16,6 +16,8 @@ #include <test/TensorHelpers.hpp> +#include <DataLayoutIndexed.hpp> + template<typename T> LayerTestResult<T, 4> BatchNormTestImpl( armnn::IWorkloadFactory& workloadFactory, @@ -30,7 +32,7 @@ LayerTestResult<T, 4> BatchNormTestImpl( armnn::TensorInfo inputTensorInfo(inputOutputTensorShape, armnn::GetDataType<T>()); armnn::TensorInfo outputTensorInfo(inputOutputTensorShape, armnn::GetDataType<T>()); - armnn::DataLayoutIndexed dataLayoutIndexed(dataLayout); + armnnUtils::DataLayoutIndexed dataLayoutIndexed(dataLayout); armnn::TensorInfo tensorInfo({ inputOutputTensorShape[dataLayoutIndexed.GetChannelsIndex()] }, armnn::GetDataType<T>()); @@ -188,4 +190,4 @@ LayerTestResult<T,4> BatchNormTestNhwcImpl( CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); return ret; -}
\ No newline at end of file +} diff --git a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp index d137c8082a..0ba8d7552c 100755 --- a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp @@ -7,21 +7,24 @@ #include "WorkloadTestUtils.hpp" #include "TensorUtils.hpp" -#include <string> +#include <Permute.hpp> +#include <DataLayoutIndexed.hpp> + +#include <test/TensorHelpers.hpp> + #include <armnn/ArmNN.hpp> #include <armnn/Tensor.hpp> #include <armnn/TypesUtils.hpp> -#include <test/TensorHelpers.hpp> -#include "QuantizeHelper.hpp" - -#include <backendsCommon/DataLayoutIndexed.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include "Permute.hpp" +#include <backendsCommon/test/QuantizeHelper.hpp> + #include <boost/numeric/conversion/cast.hpp> +#include <string> + // Mapping from input type to bias type for fully connected layers. // float => float, uint8_t => int32_t template<typename T> @@ -1141,7 +1144,7 @@ LayerTestResult<T, 4> CompareDepthwiseConvolution2dTestImpl( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::IWorkloadFactory& refWorkloadFactory, - const armnn::DataLayoutIndexed& layout) + const armnnUtils::DataLayoutIndexed& layout) { unsigned int inputHeight = 8; unsigned int inputWidth = 16; diff --git a/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp index 0f33ac01a5..f5e3386fed 100644 --- a/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp @@ -20,6 +20,8 @@ #include <test/TensorHelpers.hpp> +#include <DataLayoutIndexed.hpp> + #include <boost/numeric/conversion/cast.hpp> #include <algorithm> @@ -36,7 +38,7 @@ LayerTestResult<T, 4> SimplePooling2dTestImpl( const boost::multi_array<T, 4>& outputExpected) { const armnn::DataLayout dataLayout = descriptor.m_DataLayout; - const armnn::DataLayoutIndexed dimensionIndices = dataLayout; + const armnnUtils::DataLayoutIndexed dimensionIndices = dataLayout; auto heightIndex = dimensionIndices.GetHeightIndex(); auto widthIndex = dimensionIndices.GetWidthIndex(); auto channelsIndex = dimensionIndices.GetChannelsIndex(); |