diff options
Diffstat (limited to 'src/backends/reference')
| -rw-r--r-- | src/backends/reference/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/reference/RefBackend.cpp | 6 | ||||
| -rw-r--r-- | src/backends/reference/RefBackend.hpp | 3 | ||||
| -rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 4 | ||||
| -rw-r--r-- | src/backends/reference/RefLayerSupport.hpp | 5 | ||||
| -rw-r--r-- | src/backends/reference/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/reference/workloads/CMakeLists.txt | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt index 5aa3fc27f5..05ef7d5a8f 100644 --- a/src/backends/reference/CMakeLists.txt +++ b/src/backends/reference/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND armnnRefBackend_sources RefWorkloadFactory.hpp ) -add_library(armnnRefBackend STATIC ${armnnRefBackend_sources}) +add_library(armnnRefBackend OBJECT ${armnnRefBackend_sources}) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) diff --git a/src/backends/reference/RefBackend.cpp b/src/backends/reference/RefBackend.cpp index ef52a5edeb..1f08d82b98 100644 --- a/src/backends/reference/RefBackend.cpp +++ b/src/backends/reference/RefBackend.cpp @@ -15,10 +15,9 @@ namespace armnn namespace { -const BackendId s_Id{"CpuRef"}; static BackendRegistry::Helper s_RegisterHelper{ - s_Id, + RefBackend::GetIdStatic(), []() { return IBackendUniquePtr(new RefBackend, &RefBackend::Destroy); @@ -27,8 +26,9 @@ static BackendRegistry::Helper s_RegisterHelper{ } -const BackendId& RefBackend::GetId() const +const BackendId& RefBackend::GetIdStatic() { + static const BackendId s_Id{"CpuRef"}; return s_Id; } diff --git a/src/backends/reference/RefBackend.hpp b/src/backends/reference/RefBackend.hpp index dcc974167d..c206dbdaf3 100644 --- a/src/backends/reference/RefBackend.hpp +++ b/src/backends/reference/RefBackend.hpp @@ -16,7 +16,8 @@ public: RefBackend() = default; ~RefBackend() = 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/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 2ee942cc2e..3a250a6981 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -3,8 +3,10 @@ // SPDX-License-Identifier: MIT // -#include "LayerSupportCommon.hpp" #include "RefLayerSupport.hpp" + +#include <LayerSupportCommon.hpp> + #include <armnn/Descriptors.hpp> #include <armnn/Types.hpp> #include <armnn/Tensor.hpp> diff --git a/src/backends/reference/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index 1d0edf6cb3..40bca7f179 100644 --- a/src/backends/reference/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp @@ -4,10 +4,7 @@ // #pragma once -#include <armnn/DescriptorsFwd.hpp> -#include <armnn/Types.hpp> -#include <armnn/Tensor.hpp> -#include <layers/LstmLayer.hpp> +#include <armnn/ILayerSupport.hpp> namespace armnn { diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 511d747202..deee364a9a 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -12,4 +12,4 @@ list(APPEND armnnRefBackendUnitTests_sources add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources}) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) -target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 5a756e4596..be71a85047 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -102,7 +102,7 @@ list(APPEND armnnRefBackendWorkloads_sources RefMeanUint8Workload.hpp ) -add_library(armnnRefBackendWorkloads STATIC ${armnnRefBackendWorkloads_sources}) +add_library(armnnRefBackendWorkloads OBJECT ${armnnRefBackendWorkloads_sources}) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) |