commit d29d09de2bcee68d0820e6ee7549033b05c6c469
author Nikhil Raj <nikhil.raj@arm.com> Mon Jun 26 11:52:40 2023 +0100
committer Colm Donelan <colm.donelan@arm.com> Mon Jun 26 22:02:38 2023 +0000
tree 4044d4810fde6f1609354838ad0a920a9388a7e1
parent ed928a91a80db4f013995a558433012b1dfc03ea

Update ACL pin to c952596e70f2fe0073029f053e329a4e930ced8c

* activationInfo passed in directly to configure() rather than part of matMulInfo

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I546def1c1e1cabaf50629f7d78ae0ba459766ed4

src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp

diff --git a/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp b/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
index 628e314..7f2b6ea 100644
--- a/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
+++ b/src/backends/neon/workloads/NeonBatchMatMulWorkload.cpp
@@ -46,12 +46,12 @@
     arm_compute::MatMulInfo matMulInfo;
     matMulInfo.adj_lhs(descriptor.m_TransposeX);
     matMulInfo.adj_rhs(descriptor.m_TransposeY);
-    matMulInfo.fused_activation(activationInfo);
 
     arm_compute::CpuMatMulSettings settings;
     settings.fast_math(isFastMathEnabled);
 
-    return arm_compute::NEMatMul::validate(&aclInputInfoX, &aclInputInfoY, &aclOutputInfo, matMulInfo, settings);
+    return arm_compute::NEMatMul::validate(&aclInputInfoX, &aclInputInfoY, &aclOutputInfo, matMulInfo, settings,
+                                           activationInfo);
 }
 
 NeonBatchMatMulWorkload::NeonBatchMatMulWorkload(const BatchMatMulQueueDescriptor& descriptor,
@@ -84,12 +84,11 @@
     arm_compute::MatMulInfo matMulInfo;
     matMulInfo.adj_lhs(descriptor.m_Parameters.m_TransposeX);
     matMulInfo.adj_rhs(descriptor.m_Parameters.m_TransposeY);
-    matMulInfo.fused_activation(activationInfo);
 
     arm_compute::CpuMatMulSettings settings;
     settings.fast_math(isFastMathEnabled);
 
-    m_MatMulLayer.configure(&inputX, &inputY, &output, matMulInfo, settings);
+    m_MatMulLayer.configure(&inputX, &inputY, &output, matMulInfo, settings, activationInfo);
 
     // Report Profiling Details
     WorkloadInfo detailsInfo;