From 611c7fb97412230d5cefee047081455fb60db06c Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Fri, 7 Jan 2022 09:47:29 +0000
Subject: IVGCVSW-6641 Stabilize the IWorkloadFactory interface with unified
 strategy

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ia941be9bf2c15fe56e49a9b9a2bbe943a8152438
---
 .../test/layerTests/ActivationTestImpl.cpp          | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp')

diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp
index 57687051b6..ea9973b7d3 100644
--- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp
@@ -71,7 +71,8 @@ LayerTestResult<T, 4> BoundedReLuTestCommon(
     descriptor.m_Parameters.m_A = upperBound;
     descriptor.m_Parameters.m_B = lowerBound;
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(descriptor, workloadInfo);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                descriptor, workloadInfo);
 
     inputHandle->Allocate();
     outputHandle->Allocate();
@@ -269,7 +270,8 @@ std::vector<float> BoundedReLuRandomInputTest(
     AddOutputToWorkload(descriptor, workloadInfo, outputTensorInfo, outputHandle.get());
     descriptor.m_Parameters = activationDescriptor;
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(descriptor, workloadInfo);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                descriptor, workloadInfo);
 
     inputHandle->Allocate();
     outputHandle->Allocate();
@@ -352,7 +354,8 @@ LayerTestResult<T, 4> ConstantLinearActivationTestCommon(
     data.m_Parameters.m_B = 0.0f;
     data.m_Parameters.m_Function = armnn::ActivationFunction::Linear;
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(data, info);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                data, info);
 
     inputHandle->Allocate();
     outputHandle->Allocate();
@@ -458,7 +461,8 @@ LayerTestResult<T, 4> SimpleActivationTest(
     descriptor.m_Parameters.m_A = activationParameterA;
     descriptor.m_Parameters.m_B = activationParameterB;
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(descriptor, workloadInfo);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                descriptor, workloadInfo);
 
     inputHandle->Allocate();
     outputHandle->Allocate();
@@ -875,7 +879,8 @@ LayerTestResult<float, 5> SqrtNNTest(
 
     descriptor.m_Parameters.m_Function = armnn::ActivationFunction::Sqrt;
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(descriptor, workloadInfo);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                descriptor, workloadInfo);
 
     inputHandle->Allocate();
     outputHandle->Allocate();
@@ -1278,9 +1283,11 @@ LayerTestResult<T, 4> CompareActivationTestImpl(
     SetWorkloadInput(refData, refInfo, 0, inputTensorInfo, inputHandleRef.get());
     SetWorkloadOutput(refData, refInfo, 0, outputTensorInfo, outputHandleRef.get());
 
-    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateActivation(data, info);
+    std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                data, info);
     ARMNN_ASSERT(workload != nullptr);
-    std::unique_ptr<armnn::IWorkload> workloadRef = refWorkloadFactory.CreateActivation(refData, refInfo);
+    std::unique_ptr<armnn::IWorkload> workloadRef = refWorkloadFactory.CreateWorkload(armnn::LayerType::Activation,
+                                                                                      refData, refInfo);
     ARMNN_ASSERT(workloadRef != nullptr);
 
     inputHandle->Allocate();
-- 
cgit v1.2.1