diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-01-07 09:47:29 +0000 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-01-18 13:15:41 +0000 |
commit | 611c7fb97412230d5cefee047081455fb60db06c (patch) | |
tree | 1244050b50a300f67285aef00d8b05c52865b89a /src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp | |
parent | 53e06599a3af44db90c37d1cda34fc85ec9c27fa (diff) | |
download | armnn-611c7fb97412230d5cefee047081455fb60db06c.tar.gz |
IVGCVSW-6641 Stabilize the IWorkloadFactory interface with unified strategy
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ia941be9bf2c15fe56e49a9b9a2bbe943a8152438
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
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(); |