diff options
author | Nikhil Raj <nikhil.raj@arm.com> | 2023-11-24 10:19:40 +0000 |
---|---|---|
committer | Nikhil Raj <nikhil.raj@arm.com> | 2023-11-24 16:34:30 +0000 |
commit | 4179c6a97368db213f419498ead000d3909b7230 (patch) | |
tree | 1f77f9db66cd53e72c448e9e6bbe2f5031d0c8c9 | |
parent | f06d5c560cd5943ff71e1d2b172f74d8f68d71e5 (diff) | |
download | armnn-4179c6a97368db213f419498ead000d3909b7230.tar.gz |
Update ACL pin to e30c8740d2da7af52ae1320f4d597ffc73d41c5e
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ic69532e6d9101c76a45898e8204aa1ed9bf97e91
-rw-r--r-- | cmake/GlobalConfig.cmake | 16 | ||||
-rwxr-xr-x | scripts/get_compute_library.sh | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 2d97899ce8..008d151c0a 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -314,33 +314,21 @@ if(ARMCOMPUTENEON OR ARMCOMPUTECL) PATHS ${ARMCOMPUTE_BUILD_DIR} PATH_SUFFIXES "Release" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static - PATHS ${ARMCOMPUTE_BUILD_DIR} - PATH_SUFFIXES "Debug" - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static - PATHS ${ARMCOMPUTE_BUILD_DIR} - PATH_SUFFIXES "Release" - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) # In case it wasn't there, try a default search (will work in cases where # the library has been installed into a standard location) find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute-static) find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute-static) - find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static) - find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static) # In case it wasn't there, try the dynamic libraries # This case will get used in a linux setup where the Compute Library # has been installed in a standard system library path as a dynamic library find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute) find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute) - find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core) - find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core) set(ARMCOMPUTE_LIBRARIES - debug ${ARMCOMPUTE_LIBRARY_DEBUG} ${ARMCOMPUTE_CORE_LIBRARY_DEBUG} - optimized ${ARMCOMPUTE_LIBRARY_RELEASE} ${ARMCOMPUTE_CORE_LIBRARY_RELEASE} ) + debug ${ARMCOMPUTE_LIBRARY_DEBUG} + optimized ${ARMCOMPUTE_LIBRARY_RELEASE} ) endif() endif() diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh index f70579db76..e61894d6b7 100755 --- a/scripts/get_compute_library.sh +++ b/scripts/get_compute_library.sh @@ -7,10 +7,10 @@ CMD=$( basename "$0" ) # For pinning to a ref use this: -DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_23_11" # Release 23.11 +#DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_23_11" # Release 23.11 # # For pinning to a revision use this: -#DEFAULT_CLFRAMEWORKREVISION="449af409bae38951730e860599001c81c83ec8ed" #10586: Fix Elementwise Division Dynamic Shape tests +DEFAULT_CLFRAMEWORKREVISION="e30c8740d2da7af52ae1320f4d597ffc73d41c5e" #10728: Remove the legacy core library usage() { echo -e "get_compute_library.sh: Clones the Arm Compute Library (ACL) repo from the ML Platform server and checks out |