diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-31 15:35:59 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-02-01 10:24:15 +0000 |
commit | d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88 (patch) | |
tree | da56a3d5b9546409d7860126a46419e5b0eaa7d5 /src/backends/aclCommon | |
parent | 339bcae73515c66899432b5844d7c239c570c4b8 (diff) | |
download | armnn-d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88.tar.gz |
IVGCVSW-2603 The macros ARMCOMPUTECL_ENABLED and ARMCOMPUTENEON_ENABLED
no longer work
* Added two master variables ARMNN_COMPUTE_CL_ENABLED and ARMNN_COMPUTE_NEON_ENABLED
to android-nn-driver/Android.mk to easily control backend support
* Setting either of those two new variables then properly sets the
corresponding build macro
* If a specific backend gets disabled, the corresponding source files
will be excluded from the build
* Unified the usage of the pre-compile macros
!android-nn-driver:613
Change-Id: I582ff73493b70ba9e22ca2e38d875a0f19566c8a
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'src/backends/aclCommon')
-rw-r--r-- | src/backends/aclCommon/BaseMemoryManager.cpp | 4 | ||||
-rw-r--r-- | src/backends/aclCommon/BaseMemoryManager.hpp | 18 | ||||
-rw-r--r-- | src/backends/aclCommon/test/CreateWorkloadClNeon.hpp | 4 | ||||
-rw-r--r-- | src/backends/aclCommon/test/MemCopyTests.cpp | 11 |
4 files changed, 17 insertions, 20 deletions
diff --git a/src/backends/aclCommon/BaseMemoryManager.cpp b/src/backends/aclCommon/BaseMemoryManager.cpp index f564dc63e2..7c06ec5537 100644 --- a/src/backends/aclCommon/BaseMemoryManager.cpp +++ b/src/backends/aclCommon/BaseMemoryManager.cpp @@ -89,7 +89,7 @@ void BaseMemoryManager::Release() } #endif -#ifdef ARMCOMPUTENEON_ENABLED +#if defined(ARMCOMPUTENEON_ENABLED) std::shared_ptr<arm_compute::IMemoryGroup> NeonMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) { @@ -97,7 +97,7 @@ NeonMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryMa } #endif -#ifdef ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) std::shared_ptr<arm_compute::IMemoryGroup> ClMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) { diff --git a/src/backends/aclCommon/BaseMemoryManager.hpp b/src/backends/aclCommon/BaseMemoryManager.hpp index a880b9a183..b8d1922d62 100644 --- a/src/backends/aclCommon/BaseMemoryManager.hpp +++ b/src/backends/aclCommon/BaseMemoryManager.hpp @@ -7,11 +7,11 @@ #include <backendsCommon/IMemoryManager.hpp> #include <backendsCommon/WorkloadFactory.hpp> -#ifdef ARMCOMPUTENEON_ENABLED +#if defined(ARMCOMPUTENEON_ENABLED) #include <arm_compute/runtime/MemoryGroup.h> #endif -#ifdef ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) #include <arm_compute/runtime/CL/CLMemoryGroup.h> #endif @@ -40,7 +40,6 @@ public: void Release() override; #if defined(ARMCOMPUTENEON_ENABLED) || defined(ARMCOMPUTECL_ENABLED) - BaseMemoryManager(std::unique_ptr<arm_compute::IAllocator> alloc, MemoryAffinity memoryAffinity); std::shared_ptr<arm_compute::MemoryManagerOnDemand>& GetIntraLayerManager() { return m_IntraLayerMemoryMgr; } @@ -57,17 +56,16 @@ protected: virtual std::shared_ptr<arm_compute::IMemoryGroup> CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) = 0; - #endif }; +#if defined(ARMCOMPUTENEON_ENABLED) class NeonMemoryManager : public BaseMemoryManager { public: NeonMemoryManager() {} virtual ~NeonMemoryManager() {} -#ifdef ARMCOMPUTENEON_ENABLED NeonMemoryManager(std::unique_ptr<arm_compute::IAllocator> alloc, MemoryAffinity memoryAffinity) : BaseMemoryManager(std::move(alloc), memoryAffinity) { @@ -75,18 +73,18 @@ public: } protected: - virtual std::shared_ptr<arm_compute::IMemoryGroup> + std::shared_ptr<arm_compute::IMemoryGroup> CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) override; -#endif }; +#endif +#if defined(ARMCOMPUTECL_ENABLED) class ClMemoryManager : public BaseMemoryManager { public: ClMemoryManager() {} virtual ~ClMemoryManager() {} -#ifdef ARMCOMPUTECL_ENABLED ClMemoryManager(std::unique_ptr<arm_compute::IAllocator> alloc) : BaseMemoryManager(std::move(alloc), MemoryAffinity::Buffer) { @@ -94,9 +92,9 @@ public: } protected: - virtual std::shared_ptr<arm_compute::IMemoryGroup> + std::shared_ptr<arm_compute::IMemoryGroup> CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) override; -#endif }; +#endif } //namespace armnn diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp index adabed07f8..f544c12c30 100644 --- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp +++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp @@ -9,11 +9,11 @@ #include <backendsCommon/MemCopyWorkload.hpp> #include <reference/RefWorkloadFactory.hpp> -#if ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) #include <cl/ClTensorHandle.hpp> #endif -#if ARMCOMPUTENEON_ENABLED +#if defined(ARMCOMPUTENEON_ENABLED) #include <neon/NeonTensorHandle.hpp> #endif diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp index 78cd95b21d..3e26364354 100644 --- a/src/backends/aclCommon/test/MemCopyTests.cpp +++ b/src/backends/aclCommon/test/MemCopyTests.cpp @@ -4,15 +4,14 @@ // #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <cl/ClWorkloadFactory.hpp> -#include <neon/NeonWorkloadFactory.hpp> - -#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED #include <aclCommon/test/MemCopyTestImpl.hpp> +#if defined(ARMCOMPUTECL_ENABLED) && defined(ARMCOMPUTENEON_ENABLED) +#include <cl/ClWorkloadFactory.hpp> #include <cl/test/ClContextControlFixture.hpp> #include <cl/test/ClWorkloadFactoryHelper.hpp> +#include <neon/NeonWorkloadFactory.hpp> #include <neon/test/NeonWorkloadFactoryHelper.hpp> #endif @@ -41,7 +40,7 @@ BOOST_AUTO_TEST_CASE(AclTypeConversions) BOOST_AUTO_TEST_SUITE_END() -#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) && defined(ARMCOMPUTENEON_ENABLED) BOOST_FIXTURE_TEST_SUITE(MemCopyClNeon, ClContextControlFixture) @@ -75,4 +74,4 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeonWithSubtensors) BOOST_AUTO_TEST_SUITE_END() -#endif
\ No newline at end of file +#endif |