diff options
Diffstat (limited to 'src/backends/aclCommon')
| -rw-r--r-- | src/backends/aclCommon/ArmComputeTensorUtils.cpp | 4 | ||||
| -rw-r--r-- | src/backends/aclCommon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/memory/BaseMemoryManager.hpp | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/test/CreateWorkloadClNeon.hpp | 10 | ||||
| -rw-r--r-- | src/backends/aclCommon/test/MemCopyTestImpl.hpp | 8 | ||||
| -rw-r--r-- | src/backends/aclCommon/test/MemCopyTests.cpp | 10 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/backends/aclCommon/ArmComputeTensorUtils.cpp b/src/backends/aclCommon/ArmComputeTensorUtils.cpp index d48408c430..9fb78f8a80 100644 --- a/src/backends/aclCommon/ArmComputeTensorUtils.cpp +++ b/src/backends/aclCommon/ArmComputeTensorUtils.cpp @@ -2,8 +2,8 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/aclCommon/ArmComputeUtils.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> #include "armnn/Exceptions.hpp" #include <armnn/Descriptors.hpp> diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index 9282e1056a..83c7c87cd0 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -28,6 +28,6 @@ if(BUILD_UNIT_TESTS) endif() add_library(armnnAclCommon OBJECT ${armnnAclCommon_sources}) -target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/aclCommon/memory/BaseMemoryManager.hpp b/src/backends/aclCommon/memory/BaseMemoryManager.hpp index 2afc1cb130..a6ffff7086 100644 --- a/src/backends/aclCommon/memory/BaseMemoryManager.hpp +++ b/src/backends/aclCommon/memory/BaseMemoryManager.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <backends/WorkloadFactory.hpp> +#include <backendsCommon/WorkloadFactory.hpp> #ifdef ARMCOMPUTENEON_ENABLED #include <arm_compute/runtime/MemoryGroup.h> diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 4378276961..637b724b14 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -10,6 +10,6 @@ list(APPEND armnnAclCommonUnitTests_sources ) add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources}) -target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp index a79cfe6b0d..ec2072d243 100644 --- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp +++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp @@ -4,17 +4,17 @@ // #pragma once -#include <armnn/test/CreateWorkload.hpp> +#include <test/CreateWorkload.hpp> -#include <backends/MemCopyWorkload.hpp> -#include <backends/reference/RefWorkloadFactory.hpp> +#include <backendsCommon/MemCopyWorkload.hpp> +#include <reference/RefWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED -#include <backends/cl/ClTensorHandle.hpp> +#include <cl/ClTensorHandle.hpp> #endif #if ARMCOMPUTENEON_ENABLED -#include <backends/neon/NeonTensorHandle.hpp> +#include <neon/NeonTensorHandle.hpp> #endif using namespace armnn; diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp index 322cb07c1a..6cafaadd88 100644 --- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp +++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp @@ -4,11 +4,11 @@ // #pragma once -#include <backends/test/LayerTests.hpp> -#include <backends/test/TensorCopyUtils.hpp> -#include <backends/test/WorkloadTestUtils.hpp> +#include <backendsCommon/test/LayerTests.hpp> +#include <backendsCommon/test/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadTestUtils.hpp> -#include <armnn/test/TensorHelpers.hpp> +#include <test/TensorHelpers.hpp> #include <boost/multi_array.hpp> diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp index d8b407d1bc..3d4236dd36 100644 --- a/src/backends/aclCommon/test/MemCopyTests.cpp +++ b/src/backends/aclCommon/test/MemCopyTests.cpp @@ -3,13 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <backends/aclCommon/ArmComputeTensorUtils.hpp> -#include <backends/cl/ClWorkloadFactory.hpp> -#include <backends/neon/NeonWorkloadFactory.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <cl/ClWorkloadFactory.hpp> +#include <neon/NeonWorkloadFactory.hpp> #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED -#include <backends/aclCommon/test/MemCopyTestImpl.hpp> -#include <backends/cl/test/ClContextControlFixture.hpp> +#include <aclCommon/test/MemCopyTestImpl.hpp> +#include <cl/test/ClContextControlFixture.hpp> #endif #include <boost/test/unit_test.hpp> |