From 3cc9a626773ae9e79d3d0bd9c120704676d44daa Mon Sep 17 00:00:00 2001
From: David Beck <david.beck@arm.com>
Date: Fri, 12 Oct 2018 10:38:31 +0100
Subject: IVGCVSW-1998 : replace Compute enum in LayerSupport free functions

!android-nn-driver:153490

Change-Id: I1c2a5f942e3a1c3626e093c90545ca27c64ba5e8
---
 src/backends/neon/CMakeLists.txt           | 2 +-
 src/backends/neon/NeonBackend.cpp          | 7 +++----
 src/backends/neon/NeonBackend.hpp          | 3 ++-
 src/backends/neon/NeonLayerSupport.hpp     | 5 +----
 src/backends/neon/test/CMakeLists.txt      | 2 +-
 src/backends/neon/workloads/CMakeLists.txt | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/backends/neon')

diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt
index 152955aa06..c44dcc1075 100644
--- a/src/backends/neon/CMakeLists.txt
+++ b/src/backends/neon/CMakeLists.txt
@@ -29,7 +29,7 @@ else()
     )
 endif()
 
-add_library(armnnNeonBackend STATIC ${armnnNeonBackend_sources})
+add_library(armnnNeonBackend OBJECT ${armnnNeonBackend_sources})
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src)
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index 2e235b6c2a..3c12f7766d 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -16,10 +16,8 @@ namespace armnn
 namespace
 {
 
-static const BackendId s_Id{"CpuAcc"};
-
 static BackendRegistry::Helper g_RegisterHelper{
-    s_Id,
+    NeonBackend::GetIdStatic(),
     []()
     {
         return IBackendUniquePtr(new NeonBackend, &NeonBackend::Destroy);
@@ -28,8 +26,9 @@ static BackendRegistry::Helper g_RegisterHelper{
 
 }
 
-const BackendId& NeonBackend::GetId() const
+const BackendId& NeonBackend::GetIdStatic()
 {
+    static const BackendId s_Id{"CpuAcc"};
     return s_Id;
 }
 
diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp
index fa2cad13ee..c7f7f6e380 100644
--- a/src/backends/neon/NeonBackend.hpp
+++ b/src/backends/neon/NeonBackend.hpp
@@ -16,7 +16,8 @@ public:
     NeonBackend()  = default;
     ~NeonBackend() = 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/neon/NeonLayerSupport.hpp b/src/backends/neon/NeonLayerSupport.hpp
index 91be98182a..1223ba893a 100644
--- a/src/backends/neon/NeonLayerSupport.hpp
+++ b/src/backends/neon/NeonLayerSupport.hpp
@@ -4,10 +4,7 @@
 //
 #pragma once
 
-#include <armnn/DescriptorsFwd.hpp>
-#include <armnn/Optional.hpp>
-#include <armnn/Types.hpp>
-#include <armnn/Tensor.hpp>
+#include <armnn/ILayerSupport.hpp>
 
 namespace armnn
 {
diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt
index 4a3380c3f9..384a5e1749 100644
--- a/src/backends/neon/test/CMakeLists.txt
+++ b/src/backends/neon/test/CMakeLists.txt
@@ -14,4 +14,4 @@ list(APPEND armnnNeonBackendUnitTests_sources
 add_library(armnnNeonBackendUnitTests OBJECT ${armnnNeonBackendUnitTests_sources})
 target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src)
 target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
-target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file
+target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt
index 0b0b9ed5a0..fddbcb5d97 100644
--- a/src/backends/neon/workloads/CMakeLists.txt
+++ b/src/backends/neon/workloads/CMakeLists.txt
@@ -61,7 +61,7 @@ list(APPEND armnnNeonBackendWorkloads_sources
     NeonWorkloadUtils.hpp
 )
 
-add_library(armnnNeonBackendWorkloads STATIC ${armnnNeonBackendWorkloads_sources})
+add_library(armnnNeonBackendWorkloads OBJECT ${armnnNeonBackendWorkloads_sources})
 target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src)
 target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
-- 
cgit v1.2.1