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/GraphTests.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/GraphTests.cpp')
| -rw-r--r-- | src/armnn/test/GraphTests.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index cca4653509..0777d98d3a 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -454,18 +454,18 @@ struct CopyLayersFixture convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); - armnn::OriginsDescriptor mergerDefaults(2); - Layer* const mergerLayer = AddLayer<MergerLayer>(mergerDefaults, "merger"); - mergerLayer->SetBackendId(armnn::Compute::CpuRef); + armnn::OriginsDescriptor concatDefaults(2); + Layer* const concatLayer = AddLayer<ConcatLayer>(concatDefaults, "concat"); + concatLayer->SetBackendId(armnn::Compute::CpuRef); - convLayer1->GetOutputSlot(0).Connect(mergerLayer->GetInputSlot(0)); - convLayer2->GetOutputSlot(0).Connect(mergerLayer->GetInputSlot(1)); + convLayer1->GetOutputSlot(0).Connect(concatLayer->GetInputSlot(0)); + convLayer2->GetOutputSlot(0).Connect(concatLayer->GetInputSlot(1)); armnn::ActivationDescriptor activationDefaults; Layer* const actLayer = AddLayer<ActivationLayer>(activationDefaults, "act"); actLayer->SetBackendId(armnn::Compute::CpuRef); - mergerLayer->GetOutputSlot(0).Connect(actLayer->GetInputSlot(0)); + concatLayer->GetOutputSlot(0).Connect(actLayer->GetInputSlot(0)); armnn::SoftmaxDescriptor softmaxDefaults; Layer* const softmaxLayer = AddLayer<SoftmaxLayer>(softmaxDefaults, "softmax"); |