diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-03-27 16:40:56 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-03-30 09:15:02 +0000 |
| commit | 2b030d9e6d24cfba615f8803047e914b56cb79b5 (patch) | |
| tree | 6297a8ec3720e33b3fa3074801d25160b2abf3c7 /src/backends/cl/ClLayerSupport.cpp | |
| parent | 1161ab7afae6e2e0b9403df480739735efeaa1fa (diff) | |
| download | armnn-2b030d9e6d24cfba615f8803047e914b56cb79b5.tar.gz | |
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
Diffstat (limited to 'src/backends/cl/ClLayerSupport.cpp')
| -rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 7f7554ab54..12c71c0f70 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -22,6 +22,7 @@ #include "workloads/ClArgMinMaxWorkload.hpp" #include "workloads/ClBatchNormalizationFloatWorkload.hpp" #include "workloads/ClBatchToSpaceNdWorkload.hpp" +#include "workloads/ClComparisonWorkload.hpp" #include "workloads/ClConvertFp16ToFp32Workload.hpp" #include "workloads/ClConvertFp32ToFp16Workload.hpp" #include "workloads/ClConvolution2dWorkload.hpp" @@ -31,7 +32,6 @@ #include "workloads/ClDivisionFloatWorkload.hpp" #include "workloads/ClFloorFloatWorkload.hpp" #include "workloads/ClFullyConnectedWorkload.hpp" -#include "workloads/ClGreaterWorkload.hpp" #include "workloads/ClInstanceNormalizationWorkload.hpp" #include "workloads/ClL2NormalizationFloatWorkload.hpp" #include "workloads/ClLstmFloatWorkload.hpp" @@ -232,16 +232,12 @@ bool ClLayerSupport::IsComparisonSupported(const TensorInfo& input0, const ComparisonDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported) const { - if (descriptor.m_Operation == ComparisonOperation::Greater) - { - FORWARD_WORKLOAD_VALIDATE_FUNC(ClGreaterWorkloadValidate, - reasonIfUnsupported, - input0, - input1, - output); - } - - return false; + FORWARD_WORKLOAD_VALIDATE_FUNC(ClComparisonWorkloadValidate, + reasonIfUnsupported, + input0, + input1, + output, + descriptor); } bool ClLayerSupport::IsConcatSupported(const std::vector<const TensorInfo*> inputs, |