diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-22 14:24:13 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2019-05-28 17:50:33 +0100 |
commit | e242f2dc646f41e9162aaaf74e057ce39fcb92df (patch) | |
tree | d6c49b559c34d1d306b1e901501dded1c18f71c5 /src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | |
parent | 2f2778f36e59537bbd47fb8b21e73c6c5a949584 (diff) | |
download | armnn-e242f2dc646f41e9162aaaf74e057ce39fcb92df.tar.gz |
IVGCVSW-3119 Rename MergerLayer to ConcatLayer
!android-nn-driver:1210
Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp')
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index f94906d10d..478f0293a4 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -20,7 +20,7 @@ void Set2dDataValues(SplitterDescriptor descriptor, u_int32_t value) } } -void Set2dDataValues(MergerDescriptor descriptor, u_int32_t value) +void Set2dDataValues(OriginsDescriptor& descriptor, u_int32_t value) { for (unsigned int i = 0; i < descriptor.GetNumViews(); ++i) { @@ -230,32 +230,28 @@ BOOST_AUTO_TEST_CASE(CheckSplitterLayerVisitorNameNullAndDescriptor) layer->Accept(visitor); } -BOOST_AUTO_TEST_CASE(CheckMergerLayerVisitorNameAndDescriptor) +BOOST_AUTO_TEST_CASE(CheckConcatLayerVisitorNameAndDescriptor) { - const char* layerName = "MergerLayer"; - MergerDescriptor descriptor(2, 2); + const char* layerName = "ConcatLayer"; + OriginsDescriptor descriptor(2, 2); Set2dDataValues(descriptor, 1); descriptor.SetConcatAxis(1); - TestMergerLayerVisitor visitor(descriptor, layerName); + TestConcatLayerVisitor visitor(descriptor, layerName); Network net; - ARMNN_NO_DEPRECATE_WARN_BEGIN - IConnectableLayer *const layer = net.AddMergerLayer(descriptor, layerName); - ARMNN_NO_DEPRECATE_WARN_END + IConnectableLayer *const layer = net.AddConcatLayer(descriptor, layerName); layer->Accept(visitor); } -BOOST_AUTO_TEST_CASE(CheckMergerLayerVisitorNameNullAndDescriptor) +BOOST_AUTO_TEST_CASE(CheckConcatLayerVisitorNameNullAndDescriptor) { - MergerDescriptor descriptor(2, 2); + OriginsDescriptor descriptor(2, 2); Set2dDataValues(descriptor, 1); descriptor.SetConcatAxis(1); - TestMergerLayerVisitor visitor(descriptor); + TestConcatLayerVisitor visitor(descriptor); Network net; - ARMNN_NO_DEPRECATE_WARN_BEGIN - IConnectableLayer *const layer = net.AddMergerLayer(descriptor); - ARMNN_NO_DEPRECATE_WARN_END + IConnectableLayer *const layer = net.AddConcatLayer(descriptor); layer->Accept(visitor); } |