diff options
Diffstat (limited to 'src/backends/backendsCommon/test')
62 files changed, 69 insertions, 68 deletions
diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp index e1ab7ecb82..172c0a9169 100644 --- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp +++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp @@ -6,7 +6,7 @@ #include <armnn/Types.hpp> #include <armnn/BackendRegistry.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/backendsCommon/test/CommonTestUtils.cpp b/src/backends/backendsCommon/test/CommonTestUtils.cpp index 80512e290a..287c71ebc7 100644 --- a/src/backends/backendsCommon/test/CommonTestUtils.cpp +++ b/src/backends/backendsCommon/test/CommonTestUtils.cpp @@ -5,7 +5,7 @@ #include "CommonTestUtils.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> using namespace armnn; diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 2615bdc066..561578e841 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -5,13 +5,14 @@ #pragma once -#include <backendsCommon/DynamicBackend.hpp> +#include <armnn/BackendRegistry.hpp> +#include <armnn/ILayerSupport.hpp> + +#include <armnn/backends/DynamicBackend.hpp> + #include <backendsCommon/DynamicBackendUtils.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include <armnn/ILayerSupport.hpp> -#include <armnn/BackendRegistry.hpp> - #include <reference/workloads/RefConvolution2dWorkload.hpp> #include <Runtime.hpp> diff --git a/src/backends/backendsCommon/test/MockBackend.cpp b/src/backends/backendsCommon/test/MockBackend.cpp index 4fb692ca63..c5a4ed9e52 100644 --- a/src/backends/backendsCommon/test/MockBackend.cpp +++ b/src/backends/backendsCommon/test/MockBackend.cpp @@ -8,8 +8,8 @@ #include <armnn/BackendRegistry.hpp> -#include <backendsCommon/IBackendContext.hpp> -#include <backendsCommon/IMemoryManager.hpp> +#include <armnn/backends/IBackendContext.hpp> +#include <armnn/backends/IMemoryManager.hpp> #include <Optimizer.hpp> #include <SubgraphViewSelector.hpp> diff --git a/src/backends/backendsCommon/test/MockBackend.hpp b/src/backends/backendsCommon/test/MockBackend.hpp index 88c47850cf..437f23d2b3 100644 --- a/src/backends/backendsCommon/test/MockBackend.hpp +++ b/src/backends/backendsCommon/test/MockBackend.hpp @@ -5,8 +5,8 @@ #pragma once -#include <backendsCommon/IBackendInternal.hpp> -#include <backendsCommon/OptimizationViews.hpp> +#include <armnn/backends/IBackendInternal.hpp> +#include <armnn/backends/OptimizationViews.hpp> #include <LayerSupportCommon.hpp> #include <backendsCommon/LayerSupportBase.hpp> diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index 67c3e2c94d..5474f5ddac 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -8,7 +8,7 @@ #include <Graph.hpp> #include <SubgraphView.hpp> #include <SubgraphViewSelector.hpp> -#include <backendsCommon/OptimizationViews.hpp> +#include <armnn/backends/OptimizationViews.hpp> #include <Network.hpp> #include "CommonTestUtils.hpp" diff --git a/src/backends/backendsCommon/test/TensorCopyUtils.hpp b/src/backends/backendsCommon/test/TensorCopyUtils.hpp index 36f6369c0f..d3c8d9056b 100644 --- a/src/backends/backendsCommon/test/TensorCopyUtils.hpp +++ b/src/backends/backendsCommon/test/TensorCopyUtils.hpp @@ -6,7 +6,7 @@ #include <armnn/Tensor.hpp> -#include <backendsCommon/ITensorHandle.hpp> +#include <armnn/backends/ITensorHandle.hpp> void CopyDataToITensorHandle(armnn::ITensorHandle* tensorHandle, const void* memory); diff --git a/src/backends/backendsCommon/test/TestDynamicBackend.cpp b/src/backends/backendsCommon/test/TestDynamicBackend.cpp index 7230702984..a53f1698c2 100644 --- a/src/backends/backendsCommon/test/TestDynamicBackend.cpp +++ b/src/backends/backendsCommon/test/TestDynamicBackend.cpp @@ -5,7 +5,7 @@ #include "TestDynamicBackend.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> constexpr const char* TestDynamicBackendId() { diff --git a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp index 2f3e786f07..552eab2cae 100644 --- a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp +++ b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp @@ -6,8 +6,8 @@ #include <armnn/Tensor.hpp> -#include <backendsCommon/IBackendInternal.hpp> -#include <backendsCommon/IMemoryManager.hpp> +#include <armnn/backends/IBackendInternal.hpp> +#include <armnn/backends/IMemoryManager.hpp> #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadInfo.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp index 88bf1ea8a5..d0f775e21e 100644 --- a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp index 2d6362f532..2251ceb8dd 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.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 60ef975563..eb65c544ae 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> AdditionTest( diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp index b3bd7db703..24deba71b7 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index a92ff03753..8471456ab6 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp @@ -13,7 +13,7 @@ #include <armnnUtils/DataLayoutIndexed.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp index a2dacde1a9..eaffb8238f 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> BatchNormFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp index 67e7cc5f6e..79462d16e4 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -11,7 +11,7 @@ #include <armnn/ArmNN.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/DataTypeUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp index 84928faea0..d53c62305a 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> // Equal diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp index 223bf190df..4ce9d2921f 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.hpp @@ -10,7 +10,7 @@ #include <ResolveType.hpp> #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp index fa3e228786..932965a947 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> ConstantTest( diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp index 69bfa97281..6261bdfca6 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.hpp @@ -11,7 +11,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> // diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp index 8e77e2624d..f0f1a4bfb5 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> SimpleConvertFp16ToFp32Test( diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp index bb0fce28fe..263724710c 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<armnn::Half, 4> SimpleConvertFp32ToFp16Test( diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp index e35527911b..7582663a85 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> Debug4dFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp index 4dbcd266d7..18797c66dc 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.hpp @@ -8,7 +8,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp index 4d837808a6..008fea8833 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <Half.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp index bcb5abfe72..b8a241dfe6 100644 --- a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp @@ -9,7 +9,7 @@ #include <armnn/Types.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp index 0446f8b916..5e8c50210b 100644 --- a/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DivisionTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> DivisionByZeroTest( diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp index 1bb1348d61..86c5606e4c 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp @@ -11,7 +11,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> #include <backendsCommon/WorkloadFactory.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp index 506e9689c7..b317d40d14 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 2> FakeQuantizationTest( diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp index e5baf5d2d6..257756fc9e 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp index 8a2463c3f1..d181557d3f 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp index 33df17964b..b6a2dd17a0 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 1> Gather1dParamsFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp index d25fcea66b..c734a2d053 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -11,7 +11,7 @@ #include <armnn/ArmNN.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/DataLayoutUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp index 4030bee6b1..b79ba5f260 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.hpp @@ -11,7 +11,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> InstanceNormFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp index 78c2ac16b0..b50fdcd72b 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.hpp @@ -9,7 +9,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> L2NormalizationDefaultEpsilonTest( diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp index 4c340c8076..3a2f39aea6 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -12,7 +12,7 @@ #include <armnn/ArmNN.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp index 18a14ccd11..af18d69832 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp index 27790097e3..dad1760c65 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #if defined(ARMNNREF_ENABLED) diff --git a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp index 0c7ab47925..005d586da5 100644 --- a/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MaximumTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> MaximumSimpleTest(armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index d0bdfa4789..bab7337ba7 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> namespace diff --git a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp index 7a33e5e817..b1e38dcbb0 100644 --- a/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MinimumTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> MinimumBroadcast1ElementTest1( diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp index c56675150b..3e2f2ff2a3 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> MultiplicationTest( diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp index be66f6c981..4da1ad2606 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.hpp @@ -9,7 +9,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> SimpleNormalizationAcrossTest( diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp index 156b861cf8..bc514881d6 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.hpp @@ -11,7 +11,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp index fe0d07684a..c5039a1202 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -9,7 +9,7 @@ #include <armnn/ArmNN.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp index 6f7a595c1d..2f0cde219a 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.hpp @@ -9,7 +9,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> SimpleMaxPooling2dSize2x2Stride2x2Test( diff --git a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp index dc9b908b12..99f3cd12dd 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -12,7 +12,7 @@ #include <armnn/ArmNN.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index 7d5d73bf01..94d7224629 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp @@ -9,7 +9,7 @@ #include <armnn/ArmNN.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp index bac438e193..a2e1a49763 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<uint8_t, 4> QuantizeSimpleUint8Test( diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp index fb0bb334e0..2bc1d2c78c 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp index 4fe4b73ada..538a64c21a 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.hpp @@ -11,7 +11,7 @@ #include <armnn/Types.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> // Bilinear diff --git a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp index e5a53403d3..dd7ab66d45 100644 --- a/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/RsqrtTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp index 59458edd2f..d308268acd 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> // Float32 tests diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp index 2e5e244425..e0dfd10764 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 2> SimpleSoftmaxTest( diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp index cb4d8e3c52..984b9497fd 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.hpp @@ -8,7 +8,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> SpaceToBatchNdSimpleFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp index 80ad542077..c2f70e9d49 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.hpp @@ -8,7 +8,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<uint8_t, 4> SpaceToDepthNchwAsymmQ8Test( diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp index 00b5f7d0a7..b9b3b6653c 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.hpp @@ -7,7 +7,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <vector> diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp index 80058c6ea5..db9038ea13 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -10,7 +10,7 @@ #include <armnn/ArmNN.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp index b091dd4ca7..90327dded7 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> StackAxis0Float32Test( diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp index f71ce2b711..b3b13464ef 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.hpp @@ -7,7 +7,7 @@ #include "LayerTestResult.hpp" -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> StridedSlice4dFloat32Test( diff --git a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp index e154a7b37c..327aa90e58 100644 --- a/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/SubtractionTestImpl.hpp @@ -9,7 +9,7 @@ #include <Half.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> LayerTestResult<float, 4> SubtractionTest( diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp index 438828fe11..76e66d713b 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.hpp @@ -9,7 +9,7 @@ #include <ResolveType.hpp> -#include <backendsCommon/IBackendInternal.hpp> +#include <armnn/backends/IBackendInternal.hpp> #include <backendsCommon/WorkloadFactory.hpp> template<armnn::DataType ArmnnType, armnn::DataType ArmnnBType, typename T = armnn::ResolveType<ArmnnType>> |