diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-10-01 11:32:10 +0100 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-10-01 15:50:00 +0000 |
| commit | 680f9911d9d9b369fe321ee2dad014012fb5b20f (patch) | |
| tree | 30e0650d06a6fa3e1a3c0ac58ae771977c04d3d2 | |
| parent | 86bc3d8ff06a9b59565504dfda02b3fcaab2b2c9 (diff) | |
| download | armnn-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
| -rwxr-xr-x | scripts/get_compute_library.sh | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/BaseMemoryManager.cpp | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/BaseMemoryManager.hpp | 6 | ||||
| -rw-r--r-- | src/backends/cl/ClTensorHandle.hpp | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh index fcb88559d4..1649e3e2e1 100755 --- a/scripts/get_compute_library.sh +++ b/scripts/get_compute_library.sh @@ -10,7 +10,7 @@ CMD=$( basename $0 ) #DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_19_08" # Release 19.08 # # For pinning to a revision use this: -DEFAULT_CLFRAMEWORKREVISION="8d5dd867c32fc31f635fdc58783c29a38a99ebb7" #COMPMID-2659: Activation.SQRT Failure on NEON +DEFAULT_CLFRAMEWORKREVISION="5c4a8e96460eb83a6caef1c69ea5cbb4893858d7" #COMPMID-2592 Create a new kernel for CLPad with SYMMETRIC and REFLECT usage() { echo "Usage: $CMD (Use the default clframework SHA)" 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> diff --git a/src/backends/cl/ClTensorHandle.hpp b/src/backends/cl/ClTensorHandle.hpp index d08b79f9a6..f5583c0b97 100644 --- a/src/backends/cl/ClTensorHandle.hpp +++ b/src/backends/cl/ClTensorHandle.hpp @@ -12,8 +12,8 @@ #include <arm_compute/runtime/CL/CLTensor.h> #include <arm_compute/runtime/CL/CLSubTensor.h> -#include <arm_compute/runtime/CL/CLMemoryGroup.h> #include <arm_compute/runtime/IMemoryGroup.h> +#include <arm_compute/runtime/MemoryGroup.h> #include <arm_compute/core/TensorShape.h> #include <arm_compute/core/Coordinates.h> @@ -72,7 +72,7 @@ public: virtual void SetMemoryGroup(const std::shared_ptr<arm_compute::IMemoryGroup>& memoryGroup) override { - m_MemoryGroup = boost::polymorphic_pointer_downcast<arm_compute::CLMemoryGroup>(memoryGroup); + m_MemoryGroup = boost::polymorphic_pointer_downcast<arm_compute::MemoryGroup>(memoryGroup); } TensorShape GetStrides() const override @@ -151,7 +151,7 @@ private: } arm_compute::CLTensor m_Tensor; - std::shared_ptr<arm_compute::CLMemoryGroup> m_MemoryGroup; + std::shared_ptr<arm_compute::MemoryGroup> m_MemoryGroup; }; class ClSubTensorHandle : public IClTensorHandle |