diff options
Diffstat (limited to 'src/backends/cl')
| -rw-r--r-- | src/backends/cl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/cl/ClBackend.cpp | 6 | ||||
| -rw-r--r-- | src/backends/cl/ClBackend.hpp | 3 | ||||
| -rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 6 | ||||
| -rw-r--r-- | src/backends/cl/ClLayerSupport.hpp | 2 | ||||
| -rw-r--r-- | src/backends/cl/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/cl/workloads/CMakeLists.txt | 2 |
7 files changed, 13 insertions, 10 deletions
diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index 2f32081dfe..5704e0e8ab 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -24,7 +24,7 @@ if(ARMCOMPUTECL) add_subdirectory(test) endif() -add_library(armnnClBackend STATIC ${armnnClBackend_sources}) +add_library(armnnClBackend OBJECT ${armnnClBackend_sources}) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index 95acf009de..29d1b3a402 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -15,10 +15,9 @@ namespace armnn namespace { -static const BackendId s_Id{"GpuAcc"}; static BackendRegistry::Helper g_RegisterHelper{ - s_Id, + ClBackend::GetIdStatic(), []() { return IBackendUniquePtr(new ClBackend, &ClBackend::Destroy); @@ -27,8 +26,9 @@ static BackendRegistry::Helper g_RegisterHelper{ } -const BackendId& ClBackend::GetId() const +const BackendId& ClBackend::GetIdStatic() { + static const BackendId s_Id{"GpuAcc"}; return s_Id; } diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index b927db4b25..1a99b7652b 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -16,7 +16,8 @@ public: ClBackend() = default; ~ClBackend() = default; - const BackendId& GetId() const override; + static const BackendId& GetIdStatic(); + const BackendId& GetId() const override { return GetIdStatic(); } const ILayerSupport& GetLayerSupport() const override; diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 9088da8645..7c66348b98 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -5,8 +5,10 @@ #include "ClLayerSupport.hpp" -#include "InternalTypes.hpp" -#include "LayerSupportCommon.hpp" +#include <InternalTypes.hpp> +#include <LayerSupportCommon.hpp> + +#include <armnn/Descriptors.hpp> #include <boost/core/ignore_unused.hpp> diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp index 75e90e000d..2d57d10040 100644 --- a/src/backends/cl/ClLayerSupport.hpp +++ b/src/backends/cl/ClLayerSupport.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <armnn/ArmNN.hpp> +#include <armnn/ILayerSupport.hpp> namespace armnn { diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 4936a78645..262e23a7c1 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -15,4 +15,4 @@ list(APPEND armnnClBackendUnitTests_sources add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources}) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) -target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 5bd217295e..59a45facea 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -58,7 +58,7 @@ list(APPEND armnnClBackendWorkloads_sources ClWorkloadUtils.hpp ) -add_library(armnnClBackendWorkloads STATIC ${armnnClBackendWorkloads_sources}) +add_library(armnnClBackendWorkloads OBJECT ${armnnClBackendWorkloads_sources}) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) |