diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-29 15:03:22 +0000 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-10-31 12:52:00 +0000 |
| commit | c601aa626dac78e1482a258e493a6c186e6bf514 (patch) | |
| tree | dac6879d548571527fdd6dee9a7400f331583fdf /src/backends/backendsCommon/test | |
| parent | d90530719f6ab16417eb95d885317f50c662725f (diff) | |
| download | armnn-c601aa626dac78e1482a258e493a6c186e6bf514.tar.gz | |
GitHub #292 Move BackendRegistry.hpp to the public API
* Moved to BackendRegistry.hpp include/armnn
* Updated makefiles and sources accordingly
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I4d83abb581d523218a880c879fcf30c9611f7fd7
Diffstat (limited to 'src/backends/backendsCommon/test')
5 files changed, 8 insertions, 6 deletions
diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp index 283caafaf9..e1ab7ecb82 100644 --- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp +++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp @@ -4,8 +4,8 @@ // #include <armnn/Types.hpp> +#include <armnn/BackendRegistry.hpp> -#include <backendsCommon/BackendRegistry.hpp> #include <backendsCommon/IBackendInternal.hpp> #include <boost/test/unit_test.hpp> diff --git a/src/backends/backendsCommon/test/CommonTestUtils.hpp b/src/backends/backendsCommon/test/CommonTestUtils.hpp index 58bd6b197f..e96edc8317 100644 --- a/src/backends/backendsCommon/test/CommonTestUtils.hpp +++ b/src/backends/backendsCommon/test/CommonTestUtils.hpp @@ -9,8 +9,9 @@ #include <SubgraphView.hpp> #include <SubgraphViewSelector.hpp> +#include <armnn/BackendRegistry.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> -#include <backendsCommon/BackendRegistry.hpp> #include <test/TestUtils.hpp> @@ -73,4 +74,4 @@ armnn::TensorShape MakeTensorShape(unsigned int batches, unsigned int channels, unsigned int height, unsigned int width, - armnn::DataLayout layout);
\ No newline at end of file + armnn::DataLayout layout); diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 4a7ab19d54..2615bdc066 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -7,10 +7,10 @@ #include <backendsCommon/DynamicBackend.hpp> #include <backendsCommon/DynamicBackendUtils.hpp> -#include <backendsCommon/BackendRegistry.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <armnn/ILayerSupport.hpp> +#include <armnn/BackendRegistry.hpp> #include <reference/workloads/RefConvolution2dWorkload.hpp> diff --git a/src/backends/backendsCommon/test/MockBackend.cpp b/src/backends/backendsCommon/test/MockBackend.cpp index 043b5125c7..4fb692ca63 100644 --- a/src/backends/backendsCommon/test/MockBackend.cpp +++ b/src/backends/backendsCommon/test/MockBackend.cpp @@ -6,9 +6,10 @@ #include "MockBackend.hpp" #include "MockBackendId.hpp" +#include <armnn/BackendRegistry.hpp> + #include <backendsCommon/IBackendContext.hpp> #include <backendsCommon/IMemoryManager.hpp> -#include <backendsCommon/BackendRegistry.hpp> #include <Optimizer.hpp> #include <SubgraphViewSelector.hpp> diff --git a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp index a6e835612b..7cb5ded773 100644 --- a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp +++ b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp @@ -10,7 +10,7 @@ #include <Graph.hpp> #include <Network.hpp> -#include <backendsCommon/BackendRegistry.hpp> +#include <armnn/BackendRegistry.hpp> #include <boost/test/unit_test.hpp> |