From e06757e605e4d0c5618dd58b4c8599dc96fabf7e Mon Sep 17 00:00:00 2001
From: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Date: Thu, 11 Oct 2018 15:39:18 +0100
Subject: IVGCVSW-1951 Remove type templating from ClActivationWorkload

Change-Id: I200adcef35b861a412e7beef8043d5c7dddba443
---
 src/backends/cl/test/ClCreateWorkloadTests.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/backends/cl/test')

diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp
index 6ec89aa579..6ac47fd4d6 100644
--- a/src/backends/cl/test/ClCreateWorkloadTests.cpp
+++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp
@@ -22,13 +22,13 @@ boost::test_tools::predicate_result CompareIClTensorHandleShape(IClTensorHandle*
 
 BOOST_FIXTURE_TEST_SUITE(CreateWorkloadCl, ClContextControlFixture)
 
-template <typename ActivationWorkloadType, armnn::DataType DataType>
+template <armnn::DataType DataType>
 static void ClCreateActivationWorkloadTest()
 {
     Graph graph;
     ClWorkloadFactory factory;
 
-    auto workload = CreateActivationWorkloadTest<ActivationWorkloadType, DataType>(factory, graph);
+    auto workload = CreateActivationWorkloadTest<ClActivationWorkload, DataType>(factory, graph);
 
     // Checks that inputs/outputs are as we expect them (see definition of CreateActivationWorkloadTest).
     ActivationQueueDescriptor queueDescriptor = workload->GetData();
@@ -41,12 +41,12 @@ static void ClCreateActivationWorkloadTest()
 
 BOOST_AUTO_TEST_CASE(CreateActivationFloatWorkload)
 {
-    ClCreateActivationWorkloadTest<ClActivationFloatWorkload, armnn::DataType::Float32>();
+    ClCreateActivationWorkloadTest<armnn::DataType::Float32>();
 }
 
 BOOST_AUTO_TEST_CASE(CreateActivationFloat16Workload)
 {
-    ClCreateActivationWorkloadTest<ClActivationFloatWorkload, armnn::DataType::Float16>();
+    ClCreateActivationWorkloadTest<armnn::DataType::Float16>();
 }
 
 template <typename WorkloadType,
@@ -536,13 +536,13 @@ BOOST_AUTO_TEST_CASE(CreateSingleOutputMultipleInputs)
     Graph graph;
     ClWorkloadFactory factory;
     std::unique_ptr<ClSplitterWorkload> wlSplitter;
-    std::unique_ptr<ClActivationFloatWorkload> wlActiv0_0;
-    std::unique_ptr<ClActivationFloatWorkload> wlActiv0_1;
-    std::unique_ptr<ClActivationFloatWorkload> wlActiv1_0;
-    std::unique_ptr<ClActivationFloatWorkload> wlActiv1_1;
+    std::unique_ptr<ClActivationWorkload> wlActiv0_0;
+    std::unique_ptr<ClActivationWorkload> wlActiv0_1;
+    std::unique_ptr<ClActivationWorkload> wlActiv1_0;
+    std::unique_ptr<ClActivationWorkload> wlActiv1_1;
 
     CreateSplitterMultipleInputsOneOutputWorkloadTest<ClSplitterWorkload,
-        ClActivationFloatWorkload, armnn::DataType::Float32>(factory, graph, wlSplitter, wlActiv0_0, wlActiv0_1,
+        ClActivationWorkload, armnn::DataType::Float32>(factory, graph, wlSplitter, wlActiv0_0, wlActiv0_1,
                                                                wlActiv1_0, wlActiv1_1);
 
     //Checks that the index of inputs/outputs matches what we declared on InputDescriptor construction.
-- 
cgit v1.2.1