aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Raj <nikhil.raj@arm.com>2023-06-16 15:54:32 +0100
committerTeresa Charlin <teresa.charlinreyes@arm.com>2023-06-19 22:33:02 +0100
commita9c5c16154386fb1ec924c3778caf6b027bb57ee (patch)
treec8ec759cb2e843ae631761b5f9ab34d36bc696e1
parentc029930739d40983ac34ae4d4b2d10d5ce72964e (diff)
downloadarmnn-a9c5c16154386fb1ec924c3778caf6b027bb57ee.tar.gz
Update ACL pin to 043613fbb199e2c4fdd12c2c9a1785db9b0c45fa
* Break up Utils.h a bit to reduce unused code being included everywhere * Add FullyConnectedLayerInfo.h to ArmComputeUtils.hpp and remove Types.h * Add MatMulInfo.h to Neon and CL BatchMatMulWokloads Signed-off-by: Nikhil Raj <nikhil.raj@arm.com> Change-Id: I2fbe90cb40dc59add90735dafe9fef9aab3fbf06
-rwxr-xr-xscripts/get_compute_library.sh2
-rw-r--r--src/backends/aclCommon/ArmComputeUtils.hpp2
-rw-r--r--src/backends/cl/workloads/ClBatchMatMulWorkload.cpp1
-rw-r--r--src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp2
4 files changed, 5 insertions, 2 deletions
diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh
index 0d4fa5094c..89ff764c57 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_23_05" # Release 23.05
#
# For pinning to a revision use this:
-DEFAULT_CLFRAMEWORKREVISION="bec9b032ddcff449c7ad40febbcab24c23ee58a0" #9759: Add a Getting Started guide to CKW README
+DEFAULT_CLFRAMEWORKREVISION="043613fbb199e2c4fdd12c2c9a1785db9b0c45fa" #9743: Break up Utils.h a bit to reduce unused code being included everywhere
usage() {
echo -e "get_compute_library.sh: Clones the Arm Compute Library (ACL) repo from the ML Platform server and checks out
diff --git a/src/backends/aclCommon/ArmComputeUtils.hpp b/src/backends/aclCommon/ArmComputeUtils.hpp
index fab52ffb0f..d9b93f886c 100644
--- a/src/backends/aclCommon/ArmComputeUtils.hpp
+++ b/src/backends/aclCommon/ArmComputeUtils.hpp
@@ -10,8 +10,8 @@
#include <armnn/utility/NumericCast.hpp>
#include <armnn/backends/WorkloadData.hpp>
-#include <arm_compute/core/Types.h>
#include <arm_compute/runtime/FunctionDescriptors.h>
+#include <arm_compute/core/FullyConnectedLayerInfo.h>
#if defined(ARMCOMPUTENEON_ENABLED)
#include "neon/workloads/NeonReduceWorkload.hpp"
diff --git a/src/backends/cl/workloads/ClBatchMatMulWorkload.cpp b/src/backends/cl/workloads/ClBatchMatMulWorkload.cpp
index bd0fd51617..cfed1b83a1 100644
--- a/src/backends/cl/workloads/ClBatchMatMulWorkload.cpp
+++ b/src/backends/cl/workloads/ClBatchMatMulWorkload.cpp
@@ -16,6 +16,7 @@
#include <cl/ClTensorHandle.hpp>
+#include <arm_compute/core/MatMulInfo.h>
namespace armnn
{
diff --git a/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp b/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
index 9b22033bd1..628e314046 100644
--- a/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
+++ b/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
@@ -12,6 +12,8 @@
#include <backendsCommon/WorkloadUtils.hpp>
+#include <arm_compute/core/MatMulInfo.h>
+
namespace armnn
{
arm_compute::Status NeonBatchMatMulValidate(const TensorInfo& inputInfoX,