diff options
Diffstat (limited to 'src/backends/reference')
| -rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 16 | ||||
| -rw-r--r-- | src/backends/reference/RefWorkloadFactory.hpp | 4 | ||||
| -rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 10 |
3 files changed, 20 insertions, 10 deletions
diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 45c43a92ac..65448568f7 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -135,11 +135,7 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateSplitter(const SplitterQueu std::unique_ptr<armnn::IWorkload> RefWorkloadFactory::CreateMerger(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) const { - if (IsFloat16(info)) - { - return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); - } - return std::make_unique<RefConcatWorkload>(descriptor, info); + return CreateConcat(descriptor, info); } std::unique_ptr<armnn::IWorkload> RefWorkloadFactory::CreateFullyConnected( @@ -250,6 +246,16 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateL2Normalization(const L2Nor return MakeWorkload<RefL2NormalizationFloat32Workload, NullWorkload>(descriptor, info); } +std::unique_ptr<armnn::IWorkload> RefWorkloadFactory::CreateConcat(const MergerQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + if (IsFloat16(info)) + { + return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); + } + return std::make_unique<RefConcatWorkload>(descriptor, info); +} + std::unique_ptr<IWorkload> RefWorkloadFactory::CreateConstant(const ConstantQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index cbfcbfa363..985b634d77 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -69,6 +69,7 @@ public: std::unique_ptr<IWorkload> CreateSplitter(const SplitterQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + ARMNN_DEPRECATED_MSG("Use CreateConcat instead") std::unique_ptr<IWorkload> CreateMerger(const MergerQueueDescriptor& descriptor, const WorkloadInfo& info) const override; @@ -114,6 +115,9 @@ public: std::unique_ptr<IWorkload> CreateL2Normalization(const L2NormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr<IWorkload> CreateConcat(const MergerQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + std::unique_ptr<IWorkload> CreateConstant(const ConstantQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 55a25167f5..62e05a9db3 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -242,11 +242,11 @@ ARMNN_AUTO_TEST_CASE(SimpleSplitterUint8, SplitterUint8Test) ARMNN_AUTO_TEST_CASE(CopyViaSplitter, CopyViaSplitterTest) ARMNN_AUTO_TEST_CASE(CopyViaSplitterUint8, CopyViaSplitterUint8Test) -// Merger -ARMNN_AUTO_TEST_CASE(SimpleMerger, MergerTest) -ARMNN_AUTO_TEST_CASE(MergerUint8, MergerUint8Test) -ARMNN_AUTO_TEST_CASE(MergerUint8DifferentQParams, MergerUint8DifferentQParamsTest) -ARMNN_AUTO_TEST_CASE(MergerUint16, MergerUint16Test) +// Concat +ARMNN_AUTO_TEST_CASE(SimpleConcat, ConcatTest) +ARMNN_AUTO_TEST_CASE(ConcatUint8, ConcatUint8Test) +ARMNN_AUTO_TEST_CASE(ConcatUint8DifferentQParams, ConcatUint8DifferentQParamsTest) +ARMNN_AUTO_TEST_CASE(ConcatUint16, ConcatUint16Test) // Add ARMNN_AUTO_TEST_CASE(SimpleAdd, AdditionTest) |