diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-16 17:45:38 +0100 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-10-21 08:52:04 +0000 |
| commit | 77bfb5e32faadb1383d48364a6f54adbff84ad80 (patch) | |
| tree | 0bf5dfb48cb8d5c248baf716f02b9f481400316e /src/backends/cl/ClWorkloadFactory.cpp | |
| parent | 5884708e650a80e355398532bc320bbabdbb53f4 (diff) | |
| download | armnn-77bfb5e32faadb1383d48364a6f54adbff84ad80.tar.gz | |
IVGCVSW-3993 Add frontend and reference workload for ComparisonLayer
* Added frontend for ComparisonLayer
* Added RefComparisonWorkload
* Deprecated and removed Equal and Greater layers and workloads
* Updated tests to ensure backward compatibility
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Id50c880be1b567c531efff919c0c366d0a71cbe9
Diffstat (limited to 'src/backends/cl/ClWorkloadFactory.cpp')
| -rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index c427ae7e12..04e09f4ff1 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -157,6 +157,20 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateBatchToSpaceNd(const BatchTo return MakeWorkload<ClBatchToSpaceNdWorkload>(descriptor, info); } +std::unique_ptr<IWorkload> ClWorkloadFactory::CreateComparison(const ComparisonQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + if (descriptor.m_Parameters.m_Operation == ComparisonOperation::Greater) + { + GreaterQueueDescriptor greaterQueueDescriptor; + greaterQueueDescriptor.m_Inputs = descriptor.m_Inputs; + greaterQueueDescriptor.m_Outputs = descriptor.m_Outputs; + + return MakeWorkload<ClGreaterFloat32Workload, ClGreaterUint8Workload>(greaterQueueDescriptor, info); + } + return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); +} + std::unique_ptr<IWorkload> ClWorkloadFactory::CreateConcat(const ConcatQueueDescriptor& descriptor, const WorkloadInfo& info) const { @@ -230,7 +244,12 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateDivision(const DivisionQueue std::unique_ptr<IWorkload> ClWorkloadFactory::CreateEqual(const EqualQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); + boost::ignore_unused(descriptor); + + ComparisonQueueDescriptor comparisonDescriptor; + comparisonDescriptor.m_Parameters = ComparisonDescriptor(ComparisonOperation::Equal); + + return CreateComparison(comparisonDescriptor, info); } std::unique_ptr<IWorkload> ClWorkloadFactory::CreateFakeQuantization( @@ -261,7 +280,12 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateGather(const GatherQueueDesc std::unique_ptr<IWorkload> ClWorkloadFactory::CreateGreater(const GreaterQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<ClGreaterFloat32Workload, ClGreaterUint8Workload>(descriptor, info); + boost::ignore_unused(descriptor); + + ComparisonQueueDescriptor comparisonDescriptor; + comparisonDescriptor.m_Parameters = ComparisonDescriptor(ComparisonOperation::Greater); + + return CreateComparison(comparisonDescriptor, info); } std::unique_ptr<IWorkload> ClWorkloadFactory::CreateInput(const InputQueueDescriptor& descriptor, |