From fbf0e5bde02c3f6a9f6b840b7565155ba82ccd86 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Mon, 17 Aug 2020 01:01:06 +0100 Subject: IVGCVSW-5217 Add ARMNN_NO_DEPRECATE_WARN to layer tests Signed-off-by: Teresa Charlin Change-Id: I3c2c3d0c5d743b9faf05e6e9bcb4a9c9fd369ebc --- .../test/layerTests/ConcatTestImpl.cpp | 43 ++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp') diff --git a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp index 9e08e30dec..7f047cd323 100644 --- a/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConcatTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -137,9 +137,10 @@ template void PermuteTensorData( } TensorInfo outputTensorInfo = armnnUtils::Permuted(inputTensorInfo, mappings); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END PermuteQueueDescriptor queueDescriptor; queueDescriptor.m_Parameters = PermuteDescriptor{mappings}; @@ -322,9 +323,9 @@ template void Concatenate( std::vector> inputHandles; inputHandles.reserve(inputCount); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor queueDescriptor; OriginsDescriptor viewsDescriptor = CreateDescriptorForConcat(inputTensorInfos, concatDim); queueDescriptor.m_Parameters = viewsDescriptor; @@ -337,29 +338,33 @@ template void Concatenate( queueDescriptor.m_ViewOrigins.emplace_back(std::vector(viewsDescriptor.GetViewOrigin(i), viewsDescriptor.GetViewOrigin(i) + viewsDescriptor.GetNumDimensions())); } - + ARMNN_NO_DEPRECATE_WARN_BEGIN outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END const bool subTensorsSupported = workloadFactory.SupportsSubTensors(); for (unsigned int i = 0; i < inputCount; ++i) { const TensorInfo& inputTensorInfo = inputTensorInfos[i]; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr inputHandle = subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo.GetShape(), queueDescriptor.m_ViewOrigins[i].m_Origin.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END inputHandles.emplace_back(std::move(inputHandle)); } + } else { for (unsigned int i = 0; i < inputCount; ++i) { + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfos[i]); + ARMNN_NO_DEPRECATE_WARN_END inputHandles.emplace_back(std::move(inputHandle)); } } @@ -2004,11 +2009,11 @@ LayerTestResult ConcatDifferentInputOutputQParamTest( std::vector wOrigin2 = { 0, 0, 2 }; //Extent of the window is defined by size of input[1]. ConcatQueueDescriptor::ViewOrigin window2(wOrigin2); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END bool subTensorsSupported = useSubtensor && workloadFactory.SupportsSubTensors(); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr inputHandle1 = subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo1.GetShape(), wOrigin1.data()) : @@ -2018,7 +2023,7 @@ LayerTestResult ConcatDifferentInputOutputQParamTest( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; OriginsDescriptor desc = CreateDescriptorForConcatenation( inputTensorShapes.begin(),inputTensorShapes.end(), 2); @@ -2153,7 +2158,7 @@ LayerTestResult ConcatTest( std::vector wOrigin2 = {2, 0, 0}; //Extent of the window is defined by size of input[1]. ConcatQueueDescriptor::ViewOrigin window2(wOrigin2); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2167,7 +2172,7 @@ LayerTestResult ConcatTest( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo1, inputHandle1.get()); @@ -2453,7 +2458,7 @@ LayerTestResult ConcatUint8DifferentQParamsTest( std::vector wOrigin2 = { 2, 0, 0 }; //Extent of the window is defined by size of input[1]. ConcatQueueDescriptor::ViewOrigin window2(wOrigin2); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2467,7 +2472,7 @@ LayerTestResult ConcatUint8DifferentQParamsTest( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo1, inputHandle1.get()); @@ -2590,7 +2595,7 @@ LayerTestResult ConcatUint8Test( std::vector wOrigin2 = { 2, 0, 0 }; //Extent of the window is defined by size of input[1]. ConcatQueueDescriptor::ViewOrigin window2(wOrigin2); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2604,7 +2609,7 @@ LayerTestResult ConcatUint8Test( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; WorkloadInfo info; @@ -2725,7 +2730,7 @@ LayerTestResult ConcatUint16Test( std::vector wOrigin2 = { 2, 0, 0 }; //Extent of the window is defined by size of input[1]. ConcatQueueDescriptor::ViewOrigin window2(wOrigin2); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2739,7 +2744,7 @@ LayerTestResult ConcatUint16Test( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; WorkloadInfo info; -- cgit v1.2.1