diff options
author | Colm Donelan <colm.donelan@arm.com> | 2021-12-10 12:43:54 +0000 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2021-12-15 12:53:20 +0000 |
commit | 0c47974f1800e8770904aecaef15d6f105758c4e (patch) | |
tree | f5424858c6fe6f33376b3432580179958ab8ac5a /src/backends/cl/test | |
parent | cdbb09f6e15ea6698a62197cf76ecba87b81cb9d (diff) | |
download | armnn-0c47974f1800e8770904aecaef15d6f105758c4e.tar.gz |
IVGCVSW-6626 Promote backend headers in backendCommon to armnn/backends
Move the following header files from backendsCommon to armnn/backends.
* MemCopyWorkload.hpp
* TensorHandle.hpp
* Workload.hpp
* WorkloadData.hpp
* WorkloadFactory.hpp
Replace them with forwarding headers and a pragma deprecation message.
Resolve the deprecation messages in Arm NN code.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I47f116b30f86e478c9057795bc518c391a8ae514
Diffstat (limited to 'src/backends/cl/test')
-rw-r--r-- | src/backends/cl/test/ClContextControlFixture.hpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 4 | ||||
-rw-r--r-- | src/backends/cl/test/ClLayerSupportTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/DefaultAllocatorTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/Fp16SupportTest.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/OpenClTimerTest.cpp | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp index 14970be139..d1b2514693 100644 --- a/src/backends/cl/test/ClContextControlFixture.hpp +++ b/src/backends/cl/test/ClContextControlFixture.hpp @@ -6,7 +6,7 @@ #pragma once #include <cl/ClContextControl.hpp> -#include <backendsCommon/WorkloadFactory.hpp> +#include <armnn/backends/WorkloadFactory.hpp> template<bool ProfilingEnabled> struct ClContextControlFixtureBase diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index dd53f38382..34914fca50 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -9,9 +9,9 @@ #include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <backendsCommon/MemCopyWorkload.hpp> +#include <armnn/backends/MemCopyWorkload.hpp> #include <armnnTestUtils/TensorCopyUtils.hpp> -#include <WorkloadTestUtils.hpp> +#include <armnnTestUtils/WorkloadTestUtils.hpp> #include <aclCommon/test/CreateWorkloadClNeon.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index 1747cb6763..f3df594762 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -10,7 +10,7 @@ #include <layers/MeanLayer.hpp> #include <TensorHelpers.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <cl/ClWorkloadFactory.hpp> #include <cl/test/ClContextControlFixture.hpp> #include <backendsCommon/test/IsLayerSupportedTestImpl.hpp> diff --git a/src/backends/cl/test/DefaultAllocatorTests.cpp b/src/backends/cl/test/DefaultAllocatorTests.cpp index 3132bc2acb..6bb11a1aa1 100644 --- a/src/backends/cl/test/DefaultAllocatorTests.cpp +++ b/src/backends/cl/test/DefaultAllocatorTests.cpp @@ -7,7 +7,7 @@ #include <armnn/Descriptors.hpp> #include <armnn/Exceptions.hpp> #include <armnn/IRuntime.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> // Requires the OpenCl backend to be included (GpuAcc) #include <cl/ClBackend.hpp> #include <doctest/doctest.h> diff --git a/src/backends/cl/test/Fp16SupportTest.cpp b/src/backends/cl/test/Fp16SupportTest.cpp index b30a447f9f..da6ea10926 100644 --- a/src/backends/cl/test/Fp16SupportTest.cpp +++ b/src/backends/cl/test/Fp16SupportTest.cpp @@ -10,7 +10,7 @@ #include <Graph.hpp> #include <Optimizer.hpp> -#include <backendsCommon/TensorHandle.hpp> +#include <armnn/backends/TensorHandle.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <doctest/doctest.h> diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 85fdc81a94..43387d8e4e 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -9,15 +9,15 @@ #include <TensorHelpers.hpp> -#include <backendsCommon/TensorHandle.hpp> -#include <backendsCommon/WorkloadFactory.hpp> +#include <armnn/backends/TensorHandle.hpp> +#include <armnn/backends/WorkloadFactory.hpp> #include <cl/ClContextControl.hpp> #include <cl/ClWorkloadFactory.hpp> #include <cl/OpenClTimer.hpp> #include <armnnTestUtils/TensorCopyUtils.hpp> -#include <WorkloadTestUtils.hpp> +#include <armnnTestUtils/WorkloadTestUtils.hpp> #include <arm_compute/runtime/CL/CLScheduler.h> |