diff options
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests')
118 files changed, 255 insertions, 305 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp index 44dd9cea9d..7f2d1be972 100644 --- a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp index 54052073a9..5ec8e13430 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp @@ -9,13 +9,13 @@ #include <ResolveType.hpp> #include <backendsCommon/test/ActivationFixture.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/test/RefWorkloadFactoryHelper.hpp> #include <armnn/utility/NumericCast.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp index a65d97cdce..9e8b3a2b29 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp index b6d6e4ad43..a66d474f22 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index 34b2539c32..4f82b599f2 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -6,11 +6,11 @@ #include "ArgMinMaxTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp index 2e7a54b6af..941470590a 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index 4311faff4e..90bc8d76c1 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -16,10 +16,10 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <reference/test/RefWorkloadFactoryHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp index f57c061f57..11bc2973a2 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp index 3669281d48..19d472bb0f 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -5,19 +5,16 @@ #pragma once -#include "LayerTestResult.hpp" - #include <ResolveType.hpp> - #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> - -#include <test/TensorHelpers.hpp> +#include <armnnTestUtils/LayerTestResult.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <DataTypeUtils.hpp> +#include <TensorHelpers.hpp> +#include <WorkloadTestUtils.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp index bf8d5a4e24..556909860e 100644 --- a/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/CastTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp index b026b4e7e0..598f205694 100644 --- a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.cpp @@ -5,9 +5,9 @@ #include "ChannelShuffleTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp index 3500e72ae7..9c5f40d550 100644 --- a/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ChannelShuffleTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp index 68bc588860..5eccd011f6 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp @@ -13,10 +13,10 @@ #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp index 301241785b..8a920e5f5f 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/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 3eca27364d..52387298c6 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> using namespace armnn; using namespace armnnUtils; diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp index 64e0c0a722..c91ee86cf9 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index bb827ef359..dd339badb2 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp @@ -13,10 +13,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp index 71aacb5e62..34491b1c76 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index 99f1436c98..61e000a891 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -15,11 +15,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <string> diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp index 1f54034703..f54a6f85f5 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp index a592ea3f31..4adc6ef63f 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.cpp @@ -11,11 +11,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> using namespace armnnUtils; diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp index c612e19c9b..127e7ef883 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp index b16ce47c8f..7699daa21d 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp @@ -5,10 +5,10 @@ #include "ConvertBf16ToFp32TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 4> ConvertBf16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp index 08f4c04074..db92d42aca 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp index 177acef772..2c1f9b9407 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp @@ -8,10 +8,10 @@ #include <Half.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 4> SimpleConvertFp16ToFp32Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp index 8eefb77892..9e64cdd823 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp index 9ab3746b61..14a75c13de 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp @@ -5,10 +5,10 @@ #include "ConvertFp32ToBf16TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<armnn::BFloat16, 4> ConvertFp32ToBf16Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp index 9e1da65c2e..737181def1 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp index 9946801aab..8210b2d2d1 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp @@ -6,10 +6,10 @@ #include "ConvertFp32ToFp16TestImpl.hpp" -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<armnn::Half, 4> SimpleConvertFp32ToFp16Test( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp index 39dc8a4d4d..8b6617c8ef 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp index 0539cd1470..5475dbfae7 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp index cf4b237d27..beab583cab 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <BFloat16.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp index 7495c6b5b3..be88e77456 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp @@ -8,11 +8,11 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp index 18797c66dc..c6781a99c3 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp index 924844d92f..61fb4078c4 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp @@ -8,10 +8,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp index 1e079a75bf..8f120d3b03 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp index 2472c342ea..b9f06deaa1 100644 --- a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp @@ -12,11 +12,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp index 41467466b2..b5d04e5f43 100644 --- a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp index 88f34f6add..3175aaf4c3 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> @@ -15,11 +15,11 @@ #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <memory> diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp index 20e341b4e2..a15add049f 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/ArmNN.hpp> @@ -16,11 +16,11 @@ #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <memory> diff --git a/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp index 91cb669737..c7008a744f 100644 --- a/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ExpTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp index bbe481657d..f433f9dd17 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp @@ -8,10 +8,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> LayerTestResult<float, 2> FakeQuantizationTest( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp index 519880e92a..d8af8c561e 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp index 9208a311a7..41fcf59ba8 100644 --- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp @@ -5,11 +5,11 @@ #include "FillTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleFillTest( diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp index 0eaffd14b6..beaf35c050 100644 --- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp index bf871ae2f4..c05e1d833e 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp @@ -5,11 +5,11 @@ #include "FloorTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleFloorTest( diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp index 78211c6c15..ff25252d14 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp index dcf87fe92b..59e67febdf 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp @@ -10,11 +10,11 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp index ec921f7dd5..76cea90c04 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp index 51df1eb847..edcc900f5e 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp @@ -8,10 +8,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp index 8c37f92f42..363478dd30 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp index ed656daa02..da9608c122 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -13,11 +13,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp index d28069a8ef..be771441a2 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index 11c9766604..67f1c3c221 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/TensorUtils.hpp> #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <numeric> diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp index 137ab7e8f6..283a25b187 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp b/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp index ac60764964..e0054cad63 100644 --- a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp +++ b/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp @@ -1,62 +1,15 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#pragma once +// This file is deprecated and will be removed soon. +// Please use the new header in armnnTestUtils instead. +// This will use the new armnnTestUtils header. +#include <armnnTestUtils/LayerTestResult.hpp> -#include <armnn/Tensor.hpp> -#include <armnn/utility/Assert.hpp> - -#include <cstddef> -#include <vector> - -template <typename T, std::size_t n> -struct LayerTestResult -{ - LayerTestResult(const armnn::TensorInfo& outputInfo) - : m_Supported(true) - , m_CompareBoolean(false) - { - m_ActualData.reserve(outputInfo.GetNumElements()); - m_ExpectedData.reserve(outputInfo.GetNumElements()); - m_ActualShape = outputInfo.GetShape(); - m_ExpectedShape = outputInfo.GetShape(); - } - - LayerTestResult(const std::vector<T>& actualData, - const std::vector<T>& expectedData, - const armnn::TensorShape& actualShape, - const armnn::TensorShape& expectedShape) - : m_ActualData(actualData) - , m_ExpectedData(expectedData) - , m_ActualShape(actualShape) - , m_ExpectedShape(expectedShape) - , m_Supported(true) - , m_CompareBoolean(false) - {} - - LayerTestResult(const std::vector<T>& actualData, - const std::vector<T>& expectedData, - const armnn::TensorShape& actualShape, - const armnn::TensorShape& expectedShape, - const bool compareBoolean) - : m_ActualData(actualData) - , m_ExpectedData(expectedData) - , m_ActualShape(actualShape) - , m_ExpectedShape(expectedShape) - , m_Supported(true) - , m_CompareBoolean(compareBoolean) - {} - - std::vector<T> m_ActualData; - std::vector<T> m_ExpectedData; - armnn::TensorShape m_ActualShape; - armnn::TensorShape m_ExpectedShape; - - bool m_Supported; - bool m_CompareBoolean; -}; +#pragma message("backendsCommon/test/layerTests/LayerTestResult.hpp has been deprecated, it is due for " \ + "removal in 22.08 release. Please use public interface include/armnnTestUtils/LayerTestResult.hpp") diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp index ad23f8f380..94f5a5be1c 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -14,10 +14,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp index 1f4cc8947c..b293337554 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp index e7e14b89d1..cf9878f592 100644 --- a/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp index 119e76bda9..a2ce5af2f3 100644 --- a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.cpp @@ -11,10 +11,10 @@ #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp index 1711d90d5a..b81d2f38a1 100644 --- a/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogicalTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp index 035c592738..56bc23cf9c 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp @@ -11,14 +11,14 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/workloads/Decoders.hpp> #include <reference/workloads/Encoders.hpp> #include <reference/workloads/LstmUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> namespace diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp index d27ddd6920..62bb125519 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp index 8cc660b76f..c13059b445 100644 --- a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index 0f045d1198..9cc45e2e69 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp index 1e84191908..bd60b20af0 100644 --- a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp index 61899db00e..60fbfb0548 100644 --- a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.cpp @@ -7,10 +7,10 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp index 52898b820c..60475fdeb8 100644 --- a/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MirrorPadTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp index 9d2a95409d..72154dbc33 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp index 126a754335..0296ca2993 100644 --- a/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/NegTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp index 153afd9cd7..e3a3bea798 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp @@ -12,10 +12,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp index bbbbc4fe02..30cd57ca05 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp index a09e387b0e..628eed04b0 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp @@ -7,10 +7,10 @@ #include <QuantizeHelper.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> // // Implementation templates diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp index 4c30c427cb..1d19aa84ff 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp index 91add545ec..26fb5044b1 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -11,9 +11,9 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> SimplePermuteTestImpl( diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 1eaf1f9d66..7bb0e59547 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -19,10 +19,10 @@ #include <backendsCommon/WorkloadInfo.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp index bf2c39e9a3..0a25339ff5 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp index 96a56fd9f0..ad438eaf6e 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp @@ -19,10 +19,10 @@ #include <armnn/BackendHelper.hpp> #include <backendsCommon/WorkloadInfo.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp index e7cd6b4577..6c1d5defff 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/Types.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp index 3cf85817c8..6b9aaed742 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <QuantizeHelper.hpp> #include <ResolveType.hpp> @@ -14,11 +14,11 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 4> PreluTest( diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index 029d50e718..b593620326 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp index 9e2f3dfe28..967155061d 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp index c483d2cdc6..c04d7b2e82 100644 --- a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp @@ -5,11 +5,11 @@ #include "RankTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T, std::size_t n> LayerTestResult<int32_t, 1> RankTest( diff --git a/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp index 0aacee1aa5..27b0fcc609 100644 --- a/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/RankTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp index 4fb0732141..b93eb55104 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReduceProdTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp index 97e94978f7..4d7ddde92c 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceProdTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp index 9f5422bcbc..c50fe75394 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReduceSumTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp index db23240958..a5249b41da 100644 --- a/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReduceSumTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp index 7ce03ad13a..a69afb8438 100644 --- a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReductionTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <iostream> diff --git a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp index 495a74b64f..14809353d7 100644 --- a/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReductionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp index c3aacad4b0..ccf234588a 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp @@ -5,11 +5,11 @@ #include "ReshapeTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp index a29a965fdc..c692c95bc7 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index 7706bde60d..aa5bbae8d7 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -12,11 +12,11 @@ #include <armnnUtils/DataLayoutIndexed.hpp> #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp index ce7d41910c..bbbe861658 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp index 0df9ea7999..33d965bdac 100644 --- a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp index d6c03141ab..3ebb5236bc 100644 --- a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.cpp @@ -5,11 +5,11 @@ #include "ShapeTestImpl.hpp" -#include <backendsCommon/test/DataTypeUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <DataTypeUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T, std::size_t n> LayerTestResult<int32_t, 1> ShapeTest( diff --git a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp index 85f7c0a453..8b95aa50c3 100644 --- a/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ShapeTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp index b04d75a255..ee7bcb94ac 100644 --- a/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SinTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp index f3e28363c2..ddf216dec0 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp index d308268acd..c4d62ccd71 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp index 375bdaa130..05c4784bfb 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp @@ -11,10 +11,10 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <algorithm> diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp index f0efe4d233..9f93c025b3 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp index 44a37f4fe8..69f5f5aae4 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp index 69ee99bea7..1f446b7b41 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp index 9175aec8c6..d8c5747917 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp @@ -11,10 +11,10 @@ #include <armnnUtils/Permute.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp index 29f2646816..5a3e4934ef 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp @@ -4,7 +4,7 @@ // #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp index e19a3216c3..bf95a9fec8 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp index 400720088c..dc76bc9233 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp index 25989f90ed..2a0e049937 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -4,7 +4,7 @@ // #include "StackTestImpl.hpp" -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> @@ -12,10 +12,10 @@ #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp index 75e9ae82d5..24e88c4f24 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp index af4b089cde..72ba681c7d 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp @@ -9,10 +9,10 @@ #include <ResolveType.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> namespace { diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp index 52feb0c01a..3806d33cae 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp index 6113b029b8..eba0d0ab85 100644 --- a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index dae7483011..34abc86400 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -12,13 +12,13 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/DataLayoutUtils.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/DataLayoutUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <reference/RefWorkloadFactory.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp index 0c45b0fb9b..6af9e32dec 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp index 6be8bcb5cb..dceb386b31 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeTestImpl.hpp @@ -12,9 +12,9 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <WorkloadTestUtils.hpp> -#include <test/TensorHelpers.hpp> +#include <TensorHelpers.hpp> template<typename T> LayerTestResult<T, 4> SimpleTransposeTestImpl( diff --git a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp index d17dceb3f6..5315dd3685 100644 --- a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.cpp @@ -9,8 +9,8 @@ #include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/test/TensorCopyUtils.hpp> -#include <backendsCommon/test/WorkloadTestUtils.hpp> +#include <armnnTestUtils/TensorCopyUtils.hpp> +#include <WorkloadTestUtils.hpp> #include <ResolveType.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp index 20ac3135a4..88b09b9606 100644 --- a/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/UnidirectionalSequenceLstmTestImpl.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LayerTestResult.hpp" +#include <armnnTestUtils/LayerTestResult.hpp> #include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> |