commit 157d94fc3bdab6a0c9d26054f1f85350810783cd
author Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> Wed Oct 10 15:47:15 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Mon Oct 22 16:57:53 2018 +0100
tree 085bf82431fd099a859046ddefb73130b4db3391
parent 4e00a3d62ad7b82a6e98bdd9e4fd8734bd692a14

IVGCVSW-1951 Remove type templating from ClPermuteWorkload

Change-Id: Ibd12e04abe71015f31ee36a7f0a2416cb625cdad

src/backends/cl/workloads/ClPermuteWorkload.cpp

diff --git a/src/backends/cl/workloads/ClPermuteWorkload.cpp b/src/backends/cl/workloads/ClPermuteWorkload.cpp
index 079772d..5dacc83 100644
--- a/src/backends/cl/workloads/ClPermuteWorkload.cpp
+++ b/src/backends/cl/workloads/ClPermuteWorkload.cpp
@@ -26,10 +26,9 @@
     return arm_compute::Status{};
 }
 
-template <armnn::DataType... DataTypes>
-ClPermuteWorkload<DataTypes...>::ClPermuteWorkload(const PermuteQueueDescriptor& descriptor,
-                                               const WorkloadInfo& info)
-    : TypedWorkload<PermuteQueueDescriptor, DataTypes...>(descriptor, info)
+ClPermuteWorkload::ClPermuteWorkload(const PermuteQueueDescriptor& descriptor,
+                                     const WorkloadInfo& info)
+    : BaseWorkload<PermuteQueueDescriptor>(descriptor, info)
 {
     using armcomputetensorutils::BuildArmComputePermutationVector;
 
@@ -43,14 +42,10 @@
     m_PermuteFunction.configure(&input, &output, BuildArmComputePermutationVector(mappings));
 }
 
-template <armnn::DataType... DataTypes>
-void ClPermuteWorkload<DataTypes...>::Execute() const
+void ClPermuteWorkload::Execute() const
 {
     ARMNN_SCOPED_PROFILING_EVENT_CL( GetName() + "_Execute");
     m_PermuteFunction.run();
 }
 
-template class ClPermuteWorkload<DataType::Float16, DataType::Float32>;
-template class ClPermuteWorkload<DataType::QuantisedAsymm8>;
-
 } // namespace armnn

src/backends/cl/workloads/ClPermuteWorkload.hpp

diff --git a/src/backends/cl/workloads/ClPermuteWorkload.hpp b/src/backends/cl/workloads/ClPermuteWorkload.hpp
index 8ff5707..43de302 100644
--- a/src/backends/cl/workloads/ClPermuteWorkload.hpp
+++ b/src/backends/cl/workloads/ClPermuteWorkload.hpp
@@ -18,8 +18,7 @@
 
 arm_compute::Status ClPermuteWorkloadValidate(const PermuteDescriptor& descriptor);
 
-template<armnn::DataType... DataTypes>
-class ClPermuteWorkload : public TypedWorkload<PermuteQueueDescriptor, DataTypes...>
+class ClPermuteWorkload : public BaseWorkload<PermuteQueueDescriptor>
 {
 public:
     static const std::string& GetName()
@@ -32,11 +31,8 @@
     void Execute() const override;
 
 private:
-    using TypedWorkload<PermuteQueueDescriptor, DataTypes...>::m_Data;
+    using BaseWorkload<PermuteQueueDescriptor>::m_Data;
     mutable arm_compute::CLPermute m_PermuteFunction;
 };
 
-using ClPermuteFloatWorkload = ClPermuteWorkload<DataType::Float16, DataType::Float32>;
-using ClPermuteUint8Workload = ClPermuteWorkload<DataType::QuantisedAsymm8>;
-
 } // namespace armnn