diff options
Diffstat (limited to 'src/backends/backendsCommon/test')
15 files changed, 42 insertions, 32 deletions
diff --git a/src/backends/backendsCommon/test/DataLayoutUtils.hpp b/src/backends/backendsCommon/test/DataLayoutUtils.hpp index f89325829e..9411212f4f 100644 --- a/src/backends/backendsCommon/test/DataLayoutUtils.hpp +++ b/src/backends/backendsCommon/test/DataLayoutUtils.hpp @@ -5,11 +5,11 @@ #pragma once -#include <Permute.hpp> - #include <armnn/Tensor.hpp> #include <armnn/Types.hpp> +#include <armnnUtils/Permute.hpp> + template<typename T> void PermuteTensorNchwToNhwc(armnn::TensorInfo& tensorInfo, std::vector<T>& tensorData) { diff --git a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp index 0ba2a74895..a3dd88c893 100644 --- a/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/InstanceNormalizationEndToEndTestImpl.cpp @@ -4,12 +4,11 @@ // #include "InstanceNormalizationEndToEndTestImpl.hpp" - -#include "DataLayoutIndexed.hpp" #include "EndToEndTestImpl.hpp" #include "ResolveType.hpp" -#include <Permute.hpp> +#include <armnnUtils/Permute.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> #include <armnn/INetwork.hpp> @@ -377,4 +376,4 @@ void InstanceNormalizationNchwEndToEndTest2(const std::vector<armnn::BackendId>& gamma, beta, eps); -}
\ No newline at end of file +} diff --git a/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp index 1eeb944805..8cc3a26bd8 100644 --- a/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/ResizeEndToEndTestImpl.hpp @@ -8,7 +8,8 @@ #include <armnn/ArmNN.hpp> -#include <Permute.hpp> +#include <armnnUtils/Permute.hpp> + #include <QuantizeHelper.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp index 8eb1c97350..6d1a7b0556 100644 --- a/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp +++ b/src/backends/backendsCommon/test/SpaceToDepthEndToEndTestImpl.cpp @@ -4,15 +4,14 @@ // #include "SpaceToDepthEndToEndTestImpl.hpp" - #include "ResolveType.hpp" -#include "DataLayoutIndexed.hpp" #include "EndToEndTestImpl.hpp" -#include <Permute.hpp> - #include <armnn/INetwork.hpp> +#include <armnnUtils/Permute.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/test/DataLayoutUtils.hpp> #include <test/TestUtils.hpp> diff --git a/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp index 4935a18b51..970c44d0d9 100644 --- a/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp @@ -8,7 +8,8 @@ #include <armnn/ArmNN.hpp> -#include <Permute.hpp> +#include <armnnUtils/Permute.hpp> + #include <QuantizeHelper.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index 68cda7ccf3..a92ff03753 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -5,12 +5,13 @@ #include "BatchNormalizationTestImpl.hpp" -#include <DataLayoutIndexed.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp index e9932c81ef..53bfc20590 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -5,12 +5,13 @@ #include "ConcatTestImpl.hpp" -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/test/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index 3f22c31c7d..17908197c0 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp @@ -5,12 +5,13 @@ #include "ConstantTestImpl.hpp" -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index 22e7e29db7..e825fffaea 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -5,13 +5,14 @@ #include "Conv2dTestImpl.hpp" -#include <DataLayoutIndexed.hpp> -#include <Permute.hpp> #include <QuantizeHelper.hpp> -#include <TensorUtils.hpp> +#include <armnnUtils/TensorUtils.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/test/DataLayoutUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index 569f5af227..d67f7b64aa 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -5,10 +5,11 @@ #include "L2NormalizationTestImpl.hpp" -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <TensorUtils.hpp> + +#include <armnnUtils/TensorUtils.hpp> +#include <armnnUtils/Permute.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index a7fbfefcb0..2012dfd602 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -5,13 +5,14 @@ #include "Pooling2dTestImpl.hpp" -#include <armnn/LayerSupport.hpp> - -#include <DataLayoutIndexed.hpp> -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <TensorUtils.hpp> + +#include <armnn/LayerSupport.hpp> + +#include <armnnUtils/TensorUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> +#include <armnnUtils/Permute.hpp> #include <backendsCommon/WorkloadInfo.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index 895afe06af..198c60a9ad 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -5,13 +5,14 @@ #include "ResizeTestImpl.hpp" -#include <DataLayoutIndexed.hpp> -#include <Permute.hpp> #include <QuantizeHelper.hpp> -#include <TensorUtils.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/TensorUtils.hpp> +#include <armnnUtils/DataLayoutIndexed.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/test/DataLayoutUtils.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp index f815604aaa..ea2130d325 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp @@ -5,12 +5,13 @@ #include "SpaceToBatchNdTestImpl.hpp" -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/test/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp index 05413230dd..c4b11a7213 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp @@ -5,12 +5,13 @@ #include "SpaceToDepthTestImpl.hpp" -#include <Permute.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> #include <armnn/ArmNN.hpp> +#include <armnnUtils/Permute.hpp> + #include <backendsCommon/test/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index 53c1e9d1b7..71b08aa159 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -5,10 +5,11 @@ #include "TransposeConvolution2dTestImpl.hpp" +#include <QuantizeHelper.hpp> + #include <armnn/ArmNN.hpp> -#include <Permute.hpp> -#include <QuantizeHelper.hpp> +#include <armnnUtils/Permute.hpp> #include <backendsCommon/CpuTensorHandle.hpp> |