aboutsummaryrefslogtreecommitdiff
path: root/src/backends/aclCommon
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-10-01 11:32:10 +0100
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-10-01 15:50:00 +0000
commit680f9911d9d9b369fe321ee2dad014012fb5b20f (patch)
tree30e0650d06a6fa3e1a3c0ac58ae771977c04d3d2 /src/backends/aclCommon
parent86bc3d8ff06a9b59565504dfda02b3fcaab2b2c9 (diff)
downloadarmnn-680f9911d9d9b369fe321ee2dad014012fb5b20f.tar.gz
IVGCVSW-3882 Update ACL pin
* Update ACL pin to include change of ArgMinMax NEON/CL output type to Signed32 !android-nn-driver:2013 Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I2a0c80e0557f619a213790027efca8b84bf6e58a
Diffstat (limited to 'src/backends/aclCommon')
-rw-r--r--src/backends/aclCommon/BaseMemoryManager.cpp2
-rw-r--r--src/backends/aclCommon/BaseMemoryManager.hpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/backends/aclCommon/BaseMemoryManager.cpp b/src/backends/aclCommon/BaseMemoryManager.cpp
index 7c06ec5537..844fbcd4ca 100644
--- a/src/backends/aclCommon/BaseMemoryManager.cpp
+++ b/src/backends/aclCommon/BaseMemoryManager.cpp
@@ -101,7 +101,7 @@ NeonMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryMa
std::shared_ptr<arm_compute::IMemoryGroup>
ClMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager)
{
- return std::make_shared<arm_compute::CLMemoryGroup>(memoryManager);
+ return std::make_shared<arm_compute::MemoryGroup>(memoryManager);
}
#endif
diff --git a/src/backends/aclCommon/BaseMemoryManager.hpp b/src/backends/aclCommon/BaseMemoryManager.hpp
index b8d1922d62..adef8bc713 100644
--- a/src/backends/aclCommon/BaseMemoryManager.hpp
+++ b/src/backends/aclCommon/BaseMemoryManager.hpp
@@ -7,14 +7,10 @@
#include <backendsCommon/IMemoryManager.hpp>
#include <backendsCommon/WorkloadFactory.hpp>
-#if defined(ARMCOMPUTENEON_ENABLED)
+#if defined(ARMCOMPUTENEON_ENABLED) || defined(ARMCOMPUTECL_ENABLED)
#include <arm_compute/runtime/MemoryGroup.h>
#endif
-#if defined(ARMCOMPUTECL_ENABLED)
-#include <arm_compute/runtime/CL/CLMemoryGroup.h>
-#endif
-
#if defined(ARMCOMPUTENEON_ENABLED) || defined(ARMCOMPUTECL_ENABLED)
#include <arm_compute/runtime/IAllocator.h>
#include <arm_compute/runtime/IMemoryGroup.h>