commit 9fc824a596d6bddd27e5aa1438b115e71a117aa3
author jimfly01 <jim.flynn@arm.com> Mon Sep 24 12:47:14 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Wed Oct 10 16:16:57 2018 +0100
tree 228c8e04c3361826f078ce519cb651bf5a3df1bc
parent a05c2106ba5dd4361363049b0588d6995fd01f45

IVGCVSW-1924: Fixing clframework version update compile err

* Changed run_workloads function invocation to run_workloads_tagged
* Also ClMultiplication now supports QASYMM8

!builder:149820
!android-nn-driver:149821

Change-Id: Id76446aeccf5c0eaae2fd62da34c54a374cc4daa

src/armnn/NeonInterceptorScheduler.cpp

diff --git a/src/armnn/NeonInterceptorScheduler.cpp b/src/armnn/NeonInterceptorScheduler.cpp
index 6f52729..8363def 100644
--- a/src/armnn/NeonInterceptorScheduler.cpp
+++ b/src/armnn/NeonInterceptorScheduler.cpp
@@ -42,7 +42,8 @@
 void NeonInterceptorScheduler::run_workloads(std::vector <Workload>& workloads)
 {
     m_Timer.Start();
-    m_RealScheduler.run_workloads(workloads);
+    // NOTE: we should think about utilising the tag to make profiling more understandable
+    m_RealScheduler.run_tagged_workloads(workloads, nullptr);
     m_Timer.Stop();
 
     std::vector<Measurement> measurements = m_Timer.GetMeasurements();

src/backends/ClWorkloadFactory.cpp

diff --git a/src/backends/ClWorkloadFactory.cpp b/src/backends/ClWorkloadFactory.cpp
index 5f395a2..328c221 100644
--- a/src/backends/ClWorkloadFactory.cpp
+++ b/src/backends/ClWorkloadFactory.cpp
@@ -170,7 +170,7 @@
 std::unique_ptr<armnn::IWorkload> ClWorkloadFactory::CreateMultiplication(
     const MultiplicationQueueDescriptor& descriptor, const WorkloadInfo& info) const
 {
-    return MakeWorkload<ClMultiplicationFloatWorkload, NullWorkload>(descriptor, info);
+    return MakeWorkload<ClMultiplicationFloatWorkload, ClMultiplicationFloatWorkload>(descriptor, info);
 }
 
 std::unique_ptr<armnn::IWorkload> ClWorkloadFactory::CreateDivision(