aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimfly01 <jim.flynn@arm.com>2018-09-24 12:47:14 +0100
committerMatthew Bentham <matthew.bentham@arm.com>2018-10-10 16:16:57 +0100
commit9fc824a596d6bddd27e5aa1438b115e71a117aa3 (patch)
tree228c8e04c3361826f078ce519cb651bf5a3df1bc
parenta05c2106ba5dd4361363049b0588d6995fd01f45 (diff)
downloadarmnn-9fc824a596d6bddd27e5aa1438b115e71a117aa3.tar.gz
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
-rw-r--r--src/armnn/NeonInterceptorScheduler.cpp3
-rw-r--r--src/backends/ClWorkloadFactory.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/armnn/NeonInterceptorScheduler.cpp b/src/armnn/NeonInterceptorScheduler.cpp
index 6f52729092..8363def68e 100644
--- a/src/armnn/NeonInterceptorScheduler.cpp
+++ b/src/armnn/NeonInterceptorScheduler.cpp
@@ -42,7 +42,8 @@ void NeonInterceptorScheduler::schedule(arm_compute::ICPPKernel* kernel, const H
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();
diff --git a/src/backends/ClWorkloadFactory.cpp b/src/backends/ClWorkloadFactory.cpp
index 5f395a2f6f..328c22174d 100644
--- a/src/backends/ClWorkloadFactory.cpp
+++ b/src/backends/ClWorkloadFactory.cpp
@@ -170,7 +170,7 @@ std::unique_ptr<armnn::IWorkload> ClWorkloadFactory::CreateAddition(const Additi
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(