IVGCVSW-4603 Support comparison operators in CL
* Deprecate ClGreaterWorkload
* Add ClComparisonWorkload to encompass all comparison operators
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ida0ed7f59899d75b0fe7de1e7433b1ade018c6f1
diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt
index 3f964eb..161ad96 100644
--- a/src/backends/cl/workloads/CMakeLists.txt
+++ b/src/backends/cl/workloads/CMakeLists.txt
@@ -16,6 +16,8 @@
ClBatchNormalizationFloatWorkload.hpp
ClBatchToSpaceNdWorkload.cpp
ClBatchToSpaceNdWorkload.hpp
+ ClComparisonWorkload.cpp
+ ClComparisonWorkload.hpp
ClConcatWorkload.cpp
ClConcatWorkload.hpp
ClConstantWorkload.cpp
@@ -38,8 +40,6 @@
ClFloorFloatWorkload.hpp
ClFullyConnectedWorkload.cpp
ClFullyConnectedWorkload.hpp
- ClGreaterWorkload.cpp
- ClGreaterWorkload.hpp
ClInstanceNormalizationWorkload.cpp
ClInstanceNormalizationWorkload.hpp
ClL2NormalizationFloatWorkload.cpp
diff --git a/src/backends/cl/workloads/ClComparisonWorkload.cpp b/src/backends/cl/workloads/ClComparisonWorkload.cpp
new file mode 100644
index 0000000..30b336d
--- /dev/null
+++ b/src/backends/cl/workloads/ClComparisonWorkload.cpp
@@ -0,0 +1,62 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include "ClComparisonWorkload.hpp"
+
+#include "ClWorkloadUtils.hpp"
+
+#include <aclCommon/ArmComputeUtils.hpp>
+#include <aclCommon/ArmComputeTensorUtils.hpp>
+
+#include <backendsCommon/CpuTensorHandle.hpp>
+
+#include <cl/ClLayerSupport.hpp>
+#include <cl/ClTensorHandle.hpp>
+#include <cl/ClLayerSupport.hpp>
+
+namespace armnn
+{
+
+using namespace armcomputetensorutils;
+
+arm_compute::Status ClComparisonWorkloadValidate(const TensorInfo& input0,
+ const TensorInfo& input1,
+ const TensorInfo& output,
+ const ComparisonDescriptor& descriptor)
+{
+ const arm_compute::TensorInfo aclInput0Info = BuildArmComputeTensorInfo(input0);
+ const arm_compute::TensorInfo aclInput1Info = BuildArmComputeTensorInfo(input1);
+ const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output);
+
+ const arm_compute::ComparisonOperation comparisonOperation = ConvertComparisonOperationToAcl(descriptor);
+
+ const arm_compute::Status aclStatus = arm_compute::CLComparison::validate(&aclInput0Info,
+ &aclInput1Info,
+ &aclOutputInfo,
+ comparisonOperation);
+ return aclStatus;
+}
+
+ClComparisonWorkload::ClComparisonWorkload(const ComparisonQueueDescriptor& descriptor, const WorkloadInfo& info)
+ : BaseWorkload<ComparisonQueueDescriptor>(descriptor, info)
+{
+ m_Data.ValidateInputsOutputs("ClComparisonWorkload", 2, 1);
+
+ arm_compute::ICLTensor& input0 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
+ arm_compute::ICLTensor& input1 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[1])->GetTensor();
+ arm_compute::ICLTensor& output = static_cast<IClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
+
+ const arm_compute::ComparisonOperation comparisonOperation = ConvertComparisonOperationToAcl(m_Data.m_Parameters);
+
+ m_ComparisonLayer.configure(&input0, &input1, &output, comparisonOperation);
+}
+
+void ClComparisonWorkload::Execute() const
+{
+ ARMNN_SCOPED_PROFILING_EVENT_CL("ClComparisonWorkload_Execute");
+ RunClFunction(m_ComparisonLayer, CHECK_LOCATION());
+}
+
+} //namespace armnn
diff --git a/src/backends/cl/workloads/ClComparisonWorkload.hpp b/src/backends/cl/workloads/ClComparisonWorkload.hpp
new file mode 100644
index 0000000..e842152
--- /dev/null
+++ b/src/backends/cl/workloads/ClComparisonWorkload.hpp
@@ -0,0 +1,30 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <backendsCommon/Workload.hpp>
+
+#include <arm_compute/runtime/CL/functions/CLComparison.h>
+
+namespace armnn
+{
+
+arm_compute::Status ClComparisonWorkloadValidate(const TensorInfo& input0,
+ const TensorInfo& input1,
+ const TensorInfo& output,
+ const ComparisonDescriptor& descriptor);
+
+class ClComparisonWorkload : public BaseWorkload<ComparisonQueueDescriptor>
+{
+public:
+ ClComparisonWorkload(const ComparisonQueueDescriptor& descriptor, const WorkloadInfo& info);
+ void Execute() const override;
+
+private:
+ mutable arm_compute::CLComparison m_ComparisonLayer;
+};
+
+} //namespace armnn
diff --git a/src/backends/cl/workloads/ClGreaterWorkload.cpp b/src/backends/cl/workloads/ClGreaterWorkload.cpp
deleted file mode 100644
index 2051cc3..0000000
--- a/src/backends/cl/workloads/ClGreaterWorkload.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "ClGreaterWorkload.hpp"
-
-#include "ClWorkloadUtils.hpp"
-
-#include <aclCommon/ArmComputeUtils.hpp>
-#include <aclCommon/ArmComputeTensorUtils.hpp>
-
-#include <backendsCommon/CpuTensorHandle.hpp>
-
-#include <cl/ClLayerSupport.hpp>
-#include <cl/ClTensorHandle.hpp>
-#include <cl/ClLayerSupport.hpp>
-
-namespace armnn
-{
-
-using namespace armcomputetensorutils;
-
-arm_compute::Status ClGreaterWorkloadValidate(const TensorInfo& input0,
- const TensorInfo& input1,
- const TensorInfo& output)
-{
- const arm_compute::TensorInfo aclInput0Info = BuildArmComputeTensorInfo(input0);
- const arm_compute::TensorInfo aclInput1Info = BuildArmComputeTensorInfo(input1);
- const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output);
-
- const arm_compute::Status aclStatus = arm_compute::CLComparison::validate(
- &aclInput0Info,
- &aclInput1Info,
- &aclOutputInfo,
- arm_compute::ComparisonOperation::Greater);
-
- return aclStatus;
-}
-
-ClGreaterWorkload::ClGreaterWorkload(const GreaterQueueDescriptor& descriptor, const WorkloadInfo& info)
- : BaseWorkload<GreaterQueueDescriptor>(descriptor, info)
-{
- m_Data.ValidateInputsOutputs("ClGreaterWorkload", 2, 1);
-
- arm_compute::ICLTensor& input0 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
- arm_compute::ICLTensor& input1 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[1])->GetTensor();
- arm_compute::ICLTensor& output = static_cast<IClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
-
- m_GreaterLayer.configure(&input0, &input1, &output, arm_compute::ComparisonOperation::Greater);
-}
-
-void ClGreaterWorkload::Execute() const
-{
- ARMNN_SCOPED_PROFILING_EVENT_CL("ClGreaterWorkload_Execute");
- RunClFunction(m_GreaterLayer, CHECK_LOCATION());
-}
-
-} //namespace armnn
diff --git a/src/backends/cl/workloads/ClGreaterWorkload.hpp b/src/backends/cl/workloads/ClGreaterWorkload.hpp
deleted file mode 100644
index 9b2a171..0000000
--- a/src/backends/cl/workloads/ClGreaterWorkload.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <backendsCommon/Workload.hpp>
-
-#include <arm_compute/runtime/CL/functions/CLComparison.h>
-
-namespace armnn
-{
-
-arm_compute::Status ClGreaterWorkloadValidate(const TensorInfo& input0,
- const TensorInfo& input1,
- const TensorInfo& output);
-
-class ClGreaterWorkload : public BaseWorkload<GreaterQueueDescriptor>
-{
-public:
- ClGreaterWorkload(const GreaterQueueDescriptor& descriptor, const WorkloadInfo& info);
- void Execute() const override;
-
-private:
- mutable arm_compute::CLComparison m_GreaterLayer;
-};
-
-} //namespace armnn
diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp
index c7c0163..ffe66a0 100644
--- a/src/backends/cl/workloads/ClWorkloads.hpp
+++ b/src/backends/cl/workloads/ClWorkloads.hpp
@@ -8,6 +8,7 @@
#include "ClActivationWorkload.hpp"
#include "ClAdditionWorkload.hpp"
#include "ClArgMinMaxWorkload.hpp"
+#include "ClComparisonWorkload.hpp"
#include "ClConstantWorkload.hpp"
#include "ClBatchNormalizationFloatWorkload.hpp"
#include "ClBatchToSpaceNdWorkload.hpp"
@@ -18,7 +19,6 @@
#include "ClDivisionFloatWorkload.hpp"
#include "ClFloorFloatWorkload.hpp"
#include "ClFullyConnectedWorkload.hpp"
-#include "ClGreaterWorkload.hpp"
#include "ClInstanceNormalizationWorkload.hpp"
#include "ClL2NormalizationFloatWorkload.hpp"
#include "ClLstmFloatWorkload.hpp"