Merge branch 'dev' into 'master'

Dev

See merge request arm-research/smarter/tflite_backend!11

Author: jishminor

CMakeLists.txt

@@ -41,16 +41,18 @@ if (TRITON_ENABLE_MALI_GPU)
   set(ACL_ENABLE_CL "1")
 endif()
 
-if (${TARGET_ARCH} MATCHES "armv7")
-  set(ACL_ARCH "armv7a")
-elseif(${TARGET_ARCH} MATCHES "armhf")
-  set(ACL_ARCH "armv7a-hf")
-elseif(${TARGET_ARCH} MATCHES "aarch64")
-  set(ACL_ARCH "arm64-v8a")
-elseif(${TARGET_ARCH} MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
-  set(ARMNN_DELEGATE_ENABLE OFF)
-else()
-  message(FATAL_ERROR "Unsupported target architecture: ${TARGET_ARCH}")
+if (NOT DEFINED ACL_ARCH)
+  if (${TARGET_ARCH} MATCHES "armv7")
+    set(ACL_ARCH "armv7a")
+  elseif(${TARGET_ARCH} MATCHES "armhf")
+    set(ACL_ARCH "armv7a-hf")
+  elseif(${TARGET_ARCH} MATCHES "aarch64")
+    set(ACL_ARCH "arm64-v8a")
+  elseif(${TARGET_ARCH} MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+    set(ARMNN_DELEGATE_ENABLE OFF)
+  else()
+    message(FATAL_ERROR "Unsupported target architecture: ${TARGET_ARCH}")
+  endif()
 endif()
 
 # ACL before 21.05 compiled with only gcc7