diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-05-20 12:49:28 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-20 16:47:20 +0000 |
| commit | 825af454a1df237dc3b5e4996ed85c71daa72284 (patch) | |
| tree | 047fb43424cb6c4b50adc65ab7f0fdb0e03a37dd /src/backends/backendsCommon/test/LayerTests.cpp | |
| parent | f02e6cd728a0bceea221120ec039a4b66436d51d (diff) | |
| download | armnn-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/backends/backendsCommon/test/LayerTests.cpp')
| -rw-r--r-- | src/backends/backendsCommon/test/LayerTests.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index 90aceee619..5d059598a5 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -3251,7 +3251,7 @@ void PermuteTensorData( inputTensorInfo = outputTensorInfo; } -armnn::OriginsDescriptor CreateMergerDescriptorForConcatenation( +armnn::OriginsDescriptor CreateDescriptorForConcatenation( const std::vector<armnn::TensorInfo> & inputTensorInfos, unsigned int concatDim) { @@ -3262,9 +3262,9 @@ armnn::OriginsDescriptor CreateMergerDescriptorForConcatenation( shapes.push_back(it.GetShape()); } - return armnn::CreateMergerDescriptorForConcatenation(shapes.begin(), - shapes.end(), - concatDim); + return armnn::CreateDescriptorForConcatenation(shapes.begin(), + shapes.end(), + concatDim); } // @@ -3515,7 +3515,7 @@ void Concatenate( std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); armnn::MergerQueueDescriptor queueDescriptor; - armnn::OriginsDescriptor viewsDescriptor = CreateMergerDescriptorForConcatenation(inputTensorInfos, concatDim); + armnn::OriginsDescriptor viewsDescriptor = CreateDescriptorForConcatenation(inputTensorInfos, concatDim); queueDescriptor.m_Parameters = viewsDescriptor; if (useSubtensor) |