aboutsummaryrefslogtreecommitdiff
path: root/src/armnnSerializer/test/SerializerTests.cpp
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2019-05-20 12:49:28 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-05-20 16:47:20 +0000
commit825af454a1df237dc3b5e4996ed85c71daa72284 (patch)
tree047fb43424cb6c4b50adc65ab7f0fdb0e03a37dd /src/armnnSerializer/test/SerializerTests.cpp
parentf02e6cd728a0bceea221120ec039a4b66436d51d (diff)
downloadarmnn-825af454a1df237dc3b5e4996ed85c71daa72284.tar.gz
IVGCVSW-3125 Deprecate CreateMergerDescriptorForConcatenation function
!android-nn-driver:1183 Change-Id: Ia69995b7f09cb86b64611e8efd315413e3064ca1 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnSerializer/test/SerializerTests.cpp')
-rw-r--r--src/armnnSerializer/test/SerializerTests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 42111e6155..01eae2ebbf 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1280,7 +1280,7 @@ BOOST_AUTO_TEST_CASE(SerializeMerger)
const std::vector<armnn::TensorShape> shapes({inputInfo.GetShape(), inputInfo.GetShape()});
armnn::OriginsDescriptor descriptor =
- armnn::CreateMergerDescriptorForConcatenation(shapes.begin(), shapes.end(), 0);
+ armnn::CreateDescriptorForConcatenation(shapes.begin(), shapes.end(), 0);
armnn::INetworkPtr network = armnn::INetwork::Create();
armnn::IConnectableLayer* const inputLayerOne = network->AddInputLayer(0);
@@ -1375,7 +1375,7 @@ BOOST_AUTO_TEST_CASE(EnsureMergerLayerBackwardCompatibility)
const std::vector<armnn::TensorShape> shapes({inputInfo.GetShape(), inputInfo.GetShape()});
armnn::OriginsDescriptor descriptor =
- armnn::CreateMergerDescriptorForConcatenation(shapes.begin(), shapes.end(), 0);
+ armnn::CreateDescriptorForConcatenation(shapes.begin(), shapes.end(), 0);
MergerLayerVerifier verifier(layerName, {inputInfo, inputInfo}, {outputInfo}, descriptor);
deserializedNetwork->Accept(verifier);