diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-08-17 01:01:06 +0100 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2020-08-17 08:05:20 +0000 |
| commit | fbf0e5bde02c3f6a9f6b840b7565155ba82ccd86 (patch) | |
| tree | f5feac2dbad1fbfeccf1bd9c3bd226687ba0b40e | |
| parent | b74f36a526640bf62ac827ed367d53da9e0a6f76 (diff) | |
| download | armnn-fbf0e5bde02c3f6a9f6b840b7565155ba82ccd86.tar.gz | |
IVGCVSW-5217 Add ARMNN_NO_DEPRECATE_WARN to layer tests
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I3c2c3d0c5d743b9faf05e6e9bcb4a9c9fd369ebc
45 files changed, 238 insertions, 101 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp index a82048cd81..5be8c22648 100644 --- a/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ActivationTestImpl.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 // @@ -59,8 +59,10 @@ LayerTestResult<T, 4> BoundedReLuTestCommon( auto input = MakeTensor<T, 4>(inputTensorInfo, inputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Setup bounded ReLu. armnn::ActivationQueueDescriptor descriptor; @@ -255,8 +257,10 @@ boost::multi_array<float, 4> BoundedReLuRandomInputTest( // range [lowerBound, upperBound]. auto input = MakeRandomTensor<float, 4>(inputTensorInfo, 4605828, lowerBound - 5.0f, upperBound * 2.0f); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Set up bounded ReLu. armnn::ActivationQueueDescriptor descriptor; @@ -334,9 +338,10 @@ LayerTestResult<T,4> ConstantLinearActivationTestCommon( } LayerTestResult<T, 4> ret(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Do linear activation that should leave the tensor unchanged. armnn::ActivationQueueDescriptor data; @@ -429,8 +434,10 @@ LayerTestResult<T, 4> SimpleActivationTest( auto input = MakeTensor<T, 4>(inputTensorInfo, armnnUtils::QuantizedVector<T>(inputData, scale, offset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Setup bounded ReLu. armnn::ActivationQueueDescriptor descriptor; @@ -818,8 +825,10 @@ LayerTestResult<float, 5> SqrtNNTest( auto input = MakeTensor<float, 5>(inputTensorInfo, inputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ActivationQueueDescriptor descriptor; armnn::WorkloadInfo workloadInfo; @@ -1191,12 +1200,13 @@ LayerTestResult<T,4> CompareActivationTestImpl( ret.output.resize(boostArrayExtents); ret.outputExpected.resize(boostArrayExtents); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ActivationQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp index 4ae0f5aacf..c0a2ca8faf 100644 --- a/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/AdditionTestImpl.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 // @@ -214,9 +214,11 @@ LayerTestResult<T, 4> AdditionBroadcastTestImpl( }, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> inputHandle2 = workloadFactory.CreateTensorHandle(inputTensorInfo2); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::AdditionQueueDescriptor data; armnn::WorkloadInfo info; @@ -292,9 +294,11 @@ LayerTestResult<T, 4> AdditionBroadcast1ElementTestImpl( }, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> inputHandle2 = workloadFactory.CreateTensorHandle(inputTensorInfo2); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::AdditionQueueDescriptor data; armnn::WorkloadInfo info; @@ -528,11 +532,12 @@ LayerTestResult<float, 4> AdditionAfterMaxPoolTest( 4, 5, 6, 7, 8, 9 }); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> poolingInputHandle = workloadFactory.CreateTensorHandle(poolingInputTensorInfo); std::unique_ptr<armnn::ITensorHandle> poolingOutputHandle = workloadFactory.CreateTensorHandle(poolingOutputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Apply MaxPool poolSize = 1x1, stride=2x2 // Result = @@ -582,8 +587,10 @@ LayerTestResult<float, 4> AdditionAfterMaxPoolTest( 31, 37 })); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> addInputHandle = workloadFactory.CreateTensorHandle(addInputTensorInfo); std::unique_ptr<armnn::ITensorHandle> addOutputHandle = workloadFactory.CreateTensorHandle(addOutputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::AdditionQueueDescriptor data; armnn::WorkloadInfo info; @@ -641,6 +648,7 @@ LayerTestResult<float,4> CompareAdditionTest( LayerTestResult<float,4> ret(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> inputHandle2 = workloadFactory.CreateTensorHandle(inputTensorInfo2); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); @@ -648,6 +656,7 @@ LayerTestResult<float,4> CompareAdditionTest( std::unique_ptr<armnn::ITensorHandle> inputHandle1Ref = refWorkloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> inputHandle2Ref = refWorkloadFactory.CreateTensorHandle(inputTensorInfo2); std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::AdditionQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index 4d781c0490..c2aad3d4fb 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -32,8 +32,10 @@ LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( LayerTestResult<int32_t, 3> result(outputTensorInfo); result.outputExpected = MakeTensor<int32_t, 3>(outputTensorInfo, outputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ArgMinMaxQueueDescriptor descriptor; descriptor.m_Parameters.m_Function = argMinMaxFunction; diff --git a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp index 48f7257a2e..44cfc69c24 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/BatchNormalizationTestImpl.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 // @@ -69,8 +69,10 @@ LayerTestResult<T, 4> BatchNormTestImpl( result.outputExpected = MakeTensor<T, 4>(inputTensorInfo, QuantizedVector<T>(expectedOutputValues, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ScopedCpuTensorHandle meanTensor(tensorInfo); armnn::ScopedCpuTensorHandle varianceTensor(tensorInfo); @@ -152,8 +154,10 @@ LayerTestResult<T,4> BatchNormTestNhwcImpl( auto gamma = MakeTensor<T, 1>(tensorInfo, QuantizedVector<T>({ 2, 1 }, qScale, qOffset)); LayerTestResult<T,4> ret(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::BatchNormalizationQueueDescriptor data; armnn::WorkloadInfo info; @@ -615,11 +619,13 @@ LayerTestResult<float,4> CompareBatchNormTest( LayerTestResult<float,4> ret(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::BatchNormalizationQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp index 2ba3a0c68c..38df285920 100644 --- a/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/BatchToSpaceNdTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -56,8 +56,10 @@ LayerTestResult<T, OutputDim> BatchToSpaceNdHelper( result.outputExpected = MakeTensor<T, OutputDim>(outputTensorInfo, ConvertToDataType<ArmnnType>(outputData, outputTensorInfo)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::BatchToSpaceNdQueueDescriptor data; data.m_Parameters.m_DataLayout = dataLayout; diff --git a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp index a6b703b08b..9c83b9d06c 100644 --- a/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ComparisonTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -56,9 +56,11 @@ LayerTestResult<uint8_t, NumDims> ComparisonTestImpl( LayerTestResult<uint8_t, NumDims> ret(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle0 = workloadFactory.CreateTensorHandle(inputTensorInfo0); std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ComparisonQueueDescriptor qDescriptor; qDescriptor.m_Parameters = descriptor; 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<typename T> void PermuteTensorData( } TensorInfo outputTensorInfo = armnnUtils::Permuted(inputTensorInfo, mappings); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END PermuteQueueDescriptor queueDescriptor; queueDescriptor.m_Parameters = PermuteDescriptor{mappings}; @@ -322,9 +323,9 @@ template<typename T> void Concatenate( std::vector<std::unique_ptr<ITensorHandle>> inputHandles; inputHandles.reserve(inputCount); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> 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<typename T> void Concatenate( queueDescriptor.m_ViewOrigins.emplace_back(std::vector<unsigned int>(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<ITensorHandle> 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<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfos[i]); + ARMNN_NO_DEPRECATE_WARN_END inputHandles.emplace_back(std::move(inputHandle)); } } @@ -2004,11 +2009,11 @@ LayerTestResult<T, 3> ConcatDifferentInputOutputQParamTest( std::vector<unsigned int> 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<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END bool subTensorsSupported = useSubtensor && workloadFactory.SupportsSubTensors(); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> inputHandle1 = subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo1.GetShape(), wOrigin1.data()) : @@ -2018,7 +2023,7 @@ LayerTestResult<T, 3> 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<float,3> ConcatTest( std::vector<unsigned int> 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<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2167,7 +2172,7 @@ LayerTestResult<float,3> 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<uint8_t, 3> ConcatUint8DifferentQParamsTest( std::vector<unsigned int> 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<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2467,7 +2472,7 @@ LayerTestResult<uint8_t, 3> 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<uint8_t, 3> ConcatUint8Test( std::vector<unsigned int> 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<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2604,7 +2609,7 @@ LayerTestResult<uint8_t, 3> 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<uint16_t, 3> ConcatUint16Test( std::vector<unsigned int> 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<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); bool subTensorsSupported = workloadFactory.SupportsSubTensors(); @@ -2739,7 +2744,7 @@ LayerTestResult<uint16_t, 3> ConcatUint16Test( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle, inputTensorInfo2.GetShape(), wOrigin2.data()) : workloadFactory.CreateTensorHandle(inputTensorInfo2); - + ARMNN_NO_DEPRECATE_WARN_END ConcatQueueDescriptor data; WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp index 7a8aac4686..d84a9bf8bc 100644 --- a/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConstantTestImpl.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 // @@ -97,9 +97,9 @@ LayerTestResult<T, 4> ConstantTestImpl( LayerTestResult<T, 4> result(outputTensorInfo); result.outputExpected = input; - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ScopedCpuTensorHandle constantTensor(inputTensorInfo); AllocateAndCopyDataToITensorHandle(&constantTensor, &input[0][0][0][0]); diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index acc888ebc0..407e627a39 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.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 // @@ -312,10 +312,10 @@ LayerTestResult<T, 4> SimpleConvolution2dTestImpl( outputData = tmp; } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputData); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::Convolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -418,10 +418,10 @@ LayerTestResult<O, 4> SimpleConvolution2dNhwcTestImpl( LayerTestResult<O, 4> ret(outputTensorInfo); ret.outputExpected = MakeTensor<O, 4>(outputTensorInfo, outputData); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); AllocateAndCopyDataToITensorHandle(&weightsTensor, &kernel[0][0][0][0]); @@ -539,10 +539,10 @@ LayerTestResult<T,4> Convolution1dTestImpl( biasData, biasInfo.GetQuantizationScale(), biasInfo.GetQuantizationOffset(), 1, outputSize); } - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::Convolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelInfo); @@ -1319,10 +1319,10 @@ LayerTestResult<T,4> CompareConvolution2dTestImpl( auto input = MakeRandomTensor<T, 4>(inputTensorInfo, 124908); auto kernel = MakeRandomTensor<T, 4>(kernelDesc, 891234); auto bias = MakeRandomTensor<T, 1>(biasDesc, 1028); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::Convolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -1342,10 +1342,10 @@ LayerTestResult<T,4> CompareConvolution2dTestImpl( data.m_Parameters.m_PadTop = padY; data.m_Parameters.m_PadBottom = padY; data.m_Parameters.m_BiasEnabled = true; - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::Convolution2dQueueDescriptor refData = data; armnn::WorkloadInfo refInfo = info; SetWorkloadInput(refData, refInfo, 0, inputTensorInfo, inputHandleRef.get()); @@ -1689,10 +1689,10 @@ LayerTestResult<T, 4> DepthwiseConvolution2dAsymmetricTestImpl( } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputData); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); AllocateAndCopyDataToITensorHandle(&weightsTensor, &kernel[0][0][0][0]); @@ -1846,10 +1846,10 @@ LayerTestResult<T, 4> DepthwiseConvolution2dDepthMul1TestImpl( } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputImage); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::DepthwiseConvolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -2058,10 +2058,10 @@ LayerTestResult<T, 4> DepthwiseConvolution2dTestImpl( } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputImage); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::DepthwiseConvolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -2214,10 +2214,10 @@ LayerTestResult<T, 4> DepthwiseConvolution2dTestImpl( outputData = tmp; } ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputData); - +ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - +ARMNN_NO_DEPRECATE_WARN_END armnn::DepthwiseConvolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -2951,10 +2951,10 @@ LayerTestResult<T, 4> CompareDepthwiseConvolution2dTestImpl( auto kernel = MakeRandomTensor<T, 4>(kernelDesc, 891234, 0.0f, 255.0f); auto bias = MakeRandomTensor<typename FullyConnectedBiasTypeForInputType<T>::Type, 1>( biasDesc, 1028, 0.0f, 255.0f); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::DepthwiseConvolution2dQueueDescriptor data; armnn::WorkloadInfo info; armnn::ScopedCpuTensorHandle weightsTensor(kernelDesc); @@ -2975,10 +2975,10 @@ LayerTestResult<T, 4> CompareDepthwiseConvolution2dTestImpl( data.m_Parameters.m_PadBottom = padY; data.m_Parameters.m_BiasEnabled = true; data.m_Parameters.m_DataLayout = layout.GetDataLayout(); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::DepthwiseConvolution2dQueueDescriptor refData = data; armnn::WorkloadInfo refInfo = info; SetWorkloadInput(refData, refInfo, 0, inputTensorInfo, inputHandleRef.get()); @@ -3402,8 +3402,10 @@ LayerTestResult<uint8_t, 4> Convolution2dPerAxisQuantTest( descriptor.m_BiasEnabled = true; descriptor.m_DataLayout = layout; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END WorkloadInfo workloadInfo; ScopedCpuTensorHandle weightTensor(kernelInfo); @@ -3641,8 +3643,10 @@ LayerTestResult<uint8_t, 4> DepthwiseConvolution2dPerAxisQuantTest( descriptor.m_BiasEnabled = true; descriptor.m_DataLayout = layout; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END WorkloadInfo workloadInfo; ScopedCpuTensorHandle weightTensor(kernelInfo); diff --git a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp index 0dc3048ee3..e85af5683f 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertBf16ToFp32TestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -33,8 +33,10 @@ LayerTestResult<float, 4> ConvertBf16ToFp32Test( { -37.5f, -15.2f, -8.76f, -2.0f, -1.5f, -1.3f, -0.5f, -0.4f, 0.0f, 1.0f, 0.4f, 0.5f, 1.3f, 1.5f, 2.0f, 8.76f, 15.2f, 37.5f }); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ConvertBf16ToFp32QueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp index 8b3bbd82e2..fa2341e3a4 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp16ToFp32TestImpl.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 // @@ -31,10 +31,10 @@ LayerTestResult<float, 4> SimpleConvertFp16ToFp32Test( ret.outputExpected = MakeTensor<float, 4>(outputTensorInfo, { -37.5f, -15.2f, -8.76f, -2.0f, -1.5f, -1.3f, -0.5f, -0.4f, 0.0f, 1.0f, 0.4f, 0.5f, 1.3f, 1.5f, 2.0f, 8.76f, 15.2f, 37.5f }); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ConvertFp16ToFp32QueueDescriptor data; armnn::WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp index 66eb4ee28c..c721304b84 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToBf16TestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -53,10 +53,10 @@ LayerTestResult<armnn::BFloat16, 4> ConvertFp32ToBf16Test( LayerTestResult<armnn::BFloat16, 4> ret(outputTensorInfo); ret.outputExpected = MakeTensor<armnn::BFloat16, 4>(outputTensorInfo, outputValues); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ConvertFp32ToBf16QueueDescriptor data; armnn::WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp index 1e604719e7..2041470aeb 100644 --- a/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ConvertFp32ToFp16TestImpl.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 // @@ -29,10 +29,10 @@ LayerTestResult<armnn::Half, 4> SimpleConvertFp32ToFp16Test( ret.outputExpected = MakeTensor<armnn::Half, 4>(outputTensorInfo, { -37.5_h, -15.2_h, -8.76_h, -2.0_h, -1.5_h, -1.3_h, -0.5_h, -0.4_h, 0.0_h, 1.0_h, 0.4_h, 0.5_h, 1.3_h, 1.5_h, 2.0_h, 8.76_h, 15.2_h, 37.5_h }); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::ConvertFp32ToFp16QueueDescriptor data; armnn::WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp index 42fe4876ff..f2127c0f0c 100644 --- a/src/backends/backendsCommon/test/layerTests/DebugTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DebugTestImpl.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 // @@ -47,11 +47,10 @@ LayerTestResult<T, Dim> DebugTestImpl( ret.outputExpected = MakeTensor<T, Dim>(outputTensorInfo, armnnUtils::QuantizedVector<T>(outputExpectedData, qScale, qOffset)); - std::unique_ptr<armnn::ITensorHandle> inputHandle = - workloadFactory.CreateTensorHandle(inputTensorInfo); - - std::unique_ptr<armnn::ITensorHandle> outputHandle = - workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN + std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); + std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp index 69994ddb03..a2a5483844 100644 --- a/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DepthToSpaceTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -51,8 +51,10 @@ LayerTestResult<T, 4> DepthToSpaceTestImpl( result.outputExpected = MakeTensor<T, 4>(outputInfo, armnnUtils::QuantizedVector<T>(expectedOutputData, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp index 0a4bdb8124..f60b42cae5 100644 --- a/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/DequantizeTestImpl.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 // @@ -32,8 +32,10 @@ LayerTestResult<T1, Dim> DequantizeTestImpl( LayerTestResult<T1, Dim> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T1, Dim>(outputTensorInfo, expectedOutputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp index cbbe140843..79eb2e4419 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -77,9 +77,11 @@ LayerTestResult<TOutput, NumDims> ElementwiseTestHelper( ret.compareBoolean = true; } + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle0 = workloadFactory.CreateTensorHandle(inputTensorInfo0); std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END Descriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp index bea4ec205e..863e988c9a 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -58,8 +58,10 @@ LayerTestResult<T, NumDims> ElementwiseUnaryTestHelper( LayerTestResult<T, NumDims> ret(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ElementwiseUnaryDescriptor desc(op); armnn::ElementwiseUnaryQueueDescriptor qDesc; diff --git a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp index 905f97b968..c9adcc8274 100644 --- a/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FakeQuantizationTestImpl.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 // @@ -32,8 +32,10 @@ LayerTestResult<float, 2> FakeQuantizationTest( LayerTestResult<float, 2> ret(tensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(tensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(tensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::FakeQuantizationQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp index 040a988729..7c62678524 100644 --- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp @@ -30,8 +30,10 @@ LayerTestResult<T, 4> SimpleFillTest( 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }, outputTensorInfo)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::FillQueueDescriptor data; data.m_Parameters.m_Value = 1.0f; diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp index 444809f69b..7072698374 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.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 // @@ -34,8 +34,10 @@ LayerTestResult<T, 4> SimpleFloorTest( 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 2.0f, 8.0f, 15.0f, 37.0f }, outputTensorInfo)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::FloorQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp index 43bcfb1d76..ede35f5a3d 100644 --- a/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FullyConnectedTestImpl.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 // @@ -35,8 +35,10 @@ LayerTestResult<T, 2> SimpleFullyConnectedTestImpl( bool transposeWeights) { IgnoreUnused(memoryManager); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::FullyConnectedQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp index bee5f6aaf9..b57f2ef569 100644 --- a/src/backends/backendsCommon/test/layerTests/GatherTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GatherTestImpl.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 // @@ -38,9 +38,11 @@ LayerTestResult<T, OutputDim> GatherTestImpl( LayerTestResult<T, OutputDim> result(outputInfo); result.outputExpected = MakeTensor<T, OutputDim>(outputInfo, outputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> paramsHandle = workloadFactory.CreateTensorHandle(paramsInfo); std::unique_ptr<armnn::ITensorHandle> indicesHandle = workloadFactory.CreateTensorHandle(indicesInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::GatherQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp index a13198b2f9..58ac0e78e1 100644 --- a/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/InstanceNormalizationTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -42,8 +42,10 @@ LayerTestResult<T, 4> InstanceNormTestImpl( result.outputExpected = MakeTensor<T, 4>(outputTensorInfo, armnnUtils::QuantizedVector<T>(expectedOutputValues, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index 4d98e236d3..6c3fe5b1a1 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.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 // @@ -68,8 +68,10 @@ LayerTestResult<T, 4> L2NormalizationTestImpl( outputTensorInfo.GetQuantizationScale(), outputTensorInfo.GetQuantizationOffset())); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::L2NormalizationQueueDescriptor descriptor; descriptor.m_Parameters.m_Eps = epsilon; @@ -702,8 +704,10 @@ LayerTestResult<float, 2> L2Normalization2dShapeTest( LayerTestResult<float, 2> result(outputTensorInfo); result.outputExpected = MakeTensor<float, 2>(outputTensorInfo, expectedOutputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::L2NormalizationQueueDescriptor descriptor; descriptor.m_Parameters.m_Eps = 1e-12f; diff --git a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp index 9ccca84bfc..979e36a94e 100644 --- a/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LogSoftmaxTestImpl.cpp @@ -41,8 +41,10 @@ LayerTestResult<T, NumDims> LogSoftmaxTestImpl( result.outputExpected = MakeTensor<T, NumDims>(outputInfo, armnnUtils::QuantizedVector<T>(expectedOutputValues, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp index 08ee440b8e..946764b5ba 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.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 // @@ -183,6 +183,7 @@ LstmNoCifgNoPeepholeNoProjectionTestImpl( outputVector.assign(outputExpected.data(), outputExpected.data() + (batchSize * outputSize)); ret.outputExpected = MakeTensor<T, 2>(outputTensorInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = workloadFactory.CreateTensorHandle(cellStateInTensorInfo); @@ -195,7 +196,7 @@ LstmNoCifgNoPeepholeNoProjectionTestImpl( std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateOutTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::LstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -386,6 +387,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workl outputVector.assign(outputExpected.data(), outputExpected.data() + (batchSize * outputSize)); ret.outputExpected = MakeTensor<T, 2>(outputTensorInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = workloadFactory.CreateTensorHandle(cellStateInTensorInfo); @@ -398,6 +400,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workl std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateOutTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::LstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -1217,6 +1220,7 @@ LayerTestResult<T, 2> LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( LayerTestResult<T, 2> ret3(outputTensorInfo); ret3.outputExpected = MakeTensor<T, 2>(outputTensorInfo, outputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN // Prepare the inputs and outputs for the workload std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); @@ -1233,6 +1237,7 @@ LayerTestResult<T, 2> LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( workloadFactory.CreateTensorHandle(cellStateOutTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); @@ -1326,6 +1331,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionWithLayerNormTestImpl(armnn::IWorkloadF outputVector.assign(outputExpected.data(), outputExpected.data() + (batchSize * outputSize)); ret.outputExpected = MakeTensor<float, 2>(outputTensorInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = workloadFactory.CreateTensorHandle(cellStateInTensorInfo); @@ -1338,6 +1344,7 @@ LstmLayerNoCifgWithPeepholeWithProjectionWithLayerNormTestImpl(armnn::IWorkloadF std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateOutTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::LstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -1610,6 +1617,7 @@ LayerTestResult<uint8_t, 2> QuantizedLstmTestImpl( outputVector.assign(outputExpected.data(), outputExpected.data() + (numBatches * outputSize)); ret.outputExpected = MakeTensor<uint8_t, 2>(outputStateInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN // Create tensor handles std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = @@ -1620,6 +1628,7 @@ LayerTestResult<uint8_t, 2> QuantizedLstmTestImpl( std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputStateInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::QuantizedLstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -1819,6 +1828,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl( outputVector.assign(outputExpected.data(), outputExpected.data() + (numBatches * outputSize)); ret.outputExpected = MakeTensor<int8_t, 2>(outputStateInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN // Create tensor handles std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = @@ -1830,6 +1840,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl( std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputStateInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::QLstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -2057,6 +2068,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl1( outputVector.assign(outputExpected.data(), outputExpected.data() + (numBatches * outputSize)); ret.outputExpected = MakeTensor<int8_t, 2>(outputStateInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN // Create tensor handles std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = @@ -2068,6 +2080,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl1( std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputStateInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::QLstmQueueDescriptor data; armnn::WorkloadInfo info; @@ -2327,6 +2340,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl2( outputVector.assign(outputExpected.data(), outputExpected.data() + (numBatches * outputSize)); ret.outputExpected = MakeTensor<int8_t, 2>(outputStateInfo, outputVector); + ARMNN_NO_DEPRECATE_WARN_BEGIN // Create tensor handles std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> cellStateInHandle = @@ -2338,6 +2352,7 @@ LayerTestResult<int8_t, 2> QLstmTestImpl2( std::unique_ptr<armnn::ITensorHandle> cellStateOutHandle = workloadFactory.CreateTensorHandle(cellStateInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputStateInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::QLstmQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index cd7b22ea42..283bfd9502 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -45,8 +45,10 @@ LayerTestResult<T, OutputDim> MeanTestHelper( result.outputExpected = MakeTensor<T, OutputDim>( outputTensorInfo, ConvertToDataType<ArmnnType>(outputData, outputTensorInfo)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::MeanQueueDescriptor data; data.m_Parameters.m_Axis = axis; diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp index 18f4831881..595fbd4556 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.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 // @@ -521,6 +521,7 @@ LayerTestResult<float,4> CompareMultiplicationTest( auto input0 = MakeRandomTensor<float, 4>(inputTensorInfo0, 803506992); auto input1 = MakeRandomTensor<float, 4>(inputTensorInfo1, 54902257); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle0 = workloadFactory.CreateTensorHandle(inputTensorInfo0); std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); @@ -528,6 +529,7 @@ LayerTestResult<float,4> CompareMultiplicationTest( std::unique_ptr<armnn::ITensorHandle> inputHandle0Ref = refWorkloadFactory.CreateTensorHandle(inputTensorInfo0); std::unique_ptr<armnn::ITensorHandle> inputHandle1Ref = refWorkloadFactory.CreateTensorHandle(inputTensorInfo1); std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::MultiplicationQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp index ac35262074..ce7ef37d13 100644 --- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.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 // @@ -57,8 +57,10 @@ LayerTestResult<float,4> SimpleNormalizationTestImpl( float kappa = 1.f; uint32_t normSize = 3; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::NormalizationQueueDescriptor data; armnn::WorkloadInfo info; @@ -200,8 +202,10 @@ LayerTestResult<float,4> SimpleNormalizationNhwcTestImpl( float kappa = 1.f; uint32_t normSize = 3; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::NormalizationQueueDescriptor data; armnn::WorkloadInfo info; @@ -298,8 +302,10 @@ LayerTestResult<float,4> CompareNormalizationTestImpl( constexpr float kappa = 1.f; constexpr uint32_t normSize = 5; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::NormalizationQueueDescriptor data; armnn::WorkloadInfo info; @@ -312,8 +318,10 @@ LayerTestResult<float,4> CompareNormalizationTestImpl( data.m_Parameters.m_Beta = beta; data.m_Parameters.m_K = kappa; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::NormalizationQueueDescriptor refData = data; armnn::WorkloadInfo refInfo = info; diff --git a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp index 405f4743bc..35e6103f7f 100644 --- a/src/backends/backendsCommon/test/layerTests/PadTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/PadTestImpl.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 // @@ -58,8 +58,10 @@ LayerTestResult<T, 2> Pad2dTestCommon( LayerTestResult<T, 2> result(outputTensorInfo); result.outputExpected = MakeTensor<T, 2>(outputTensorInfo, std::vector<T>(expectedOutputValues)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::PadQueueDescriptor descriptor; @@ -142,8 +144,10 @@ LayerTestResult<T, 3> Pad3dTestCommon( LayerTestResult<T, 3> result(outputTensorInfo); result.outputExpected = MakeTensor<T, 3>(outputTensorInfo, std::vector<T>(expectedOutputValues)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::PadQueueDescriptor descriptor; @@ -380,8 +384,10 @@ LayerTestResult<T, 4> Pad4dTestCommon( LayerTestResult<T, 4> result(outputTensorInfo); result.outputExpected = MakeTensor<T, 4>(outputTensorInfo, std::vector<T>(expectedOutputValues)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::PadQueueDescriptor descriptor; diff --git a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp index 96d4ec8f0f..0d66af93e6 100644 --- a/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PermuteTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -31,8 +31,10 @@ LayerTestResult<T, 4> SimplePermuteTestImpl( LayerTestResult<T, 4> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, outputExpectedData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::PermuteQueueDescriptor data; data.m_Parameters = descriptor; diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 89e46fbdb1..078e74403e 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.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 // @@ -74,8 +74,10 @@ LayerTestResult<T, 4> SimplePooling2dTestImpl( LayerTestResult<T, 4> result(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::Pooling2dQueueDescriptor queueDescriptor; queueDescriptor.m_Parameters = descriptor; @@ -779,8 +781,10 @@ LayerTestResult<T, 4> ComparePooling2dTestCommon( LayerTestResult<T, 4> comparisonResult(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::Pooling2dQueueDescriptor data; armnn::WorkloadInfo info; @@ -797,8 +801,10 @@ LayerTestResult<T, 4> ComparePooling2dTestCommon( data.m_Parameters.m_PadBottom = padY; data.m_Parameters.m_OutputShapeRounding = armnn::OutputShapeRounding::Floor; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END // Don't execute if Pooling is not supported, as an exception will be raised. armnn::BackendId backend = workloadFactory.GetBackendId(); diff --git a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp index 673bfef678..d16669502a 100644 --- a/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/QuantizeTestImpl.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 // @@ -35,8 +35,10 @@ LayerTestResult<T, Dim> QuantizeTestImpl( LayerTestResult<T, Dim> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T, Dim>(outputTensorInfo, expectedOutputData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp index 82de11ae21..f815968a7f 100644 --- a/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/RankTestImpl.cpp @@ -26,8 +26,10 @@ LayerTestResult<int32_t, 1> RankTest( LayerTestResult<int32_t , 1> ret(outputTensorInfo); ret.outputExpected = MakeTensor<uint32_t, 1>(outputTensorInfo, { n }); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::RankQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp index 979d0a7f73..1e528a0fdc 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.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 // @@ -29,8 +29,10 @@ LayerTestResult<T, NumDims> SimpleReshapeTestImpl( LayerTestResult<T, NumDims> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T, NumDims>(outputTensorInfo, outputExpectedData); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ReshapeQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index 0b02c1f074..f3c72709e0 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -109,9 +109,10 @@ LayerTestResult<T, NumDims> ResizeTestImpl( LayerTestResult<T, NumDims> result(outputInfo); result.outputExpected = MakeTensor<T, NumDims>(outputInfo, expectedOutputData); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::ResizeQueueDescriptor descriptor; descriptor.m_Parameters.m_Method = params.m_ResizeMethod; diff --git a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp index df3b6238c5..a2e6e2473f 100644 --- a/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SliceTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -46,8 +46,10 @@ LayerTestResult<T, NumDims> SliceTestImpl( result.outputExpected = MakeTensor<T, NumDims>(outputInfo, armnnUtils::QuantizedVector<T>(expectedOutputData, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp index fa7ab90b16..1ffb34f932 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.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 // @@ -87,8 +87,10 @@ LayerTestResult<T, n> SimpleSoftmaxBaseTestImpl( // Each row is independently softmax'd. auto input = MakeTensor<T, n>(inputTensorInfo, armnnUtils::QuantizedVector<T>(inputData, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::SoftmaxQueueDescriptor data; data.m_Parameters.m_Beta = beta; @@ -258,8 +260,10 @@ LayerTestResult<T, 2> CompareSoftmaxTestImpl( LayerTestResult<T, 2> ret(outputTensorInfo); auto input = MakeRandomTensor<T, 2>(inputTensorInfo, 0xF00D, 0.0f, 1.0f); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::SoftmaxQueueDescriptor data; data.m_Parameters.m_Beta = beta; @@ -268,9 +272,10 @@ LayerTestResult<T, 2> CompareSoftmaxTestImpl( AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); AddOutputToWorkload(data, info, outputTensorInfo, outputHandle.get()); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> outputHandleRef = refWorkloadFactory.CreateTensorHandle(outputTensorInfo); std::unique_ptr<armnn::ITensorHandle> inputHandleRef = refWorkloadFactory.CreateTensorHandle(inputTensorInfo); - + ARMNN_NO_DEPRECATE_WARN_END armnn::SoftmaxQueueDescriptor refData = data; armnn::WorkloadInfo refInfo = info; diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp index d1bc2a950f..692103e8ad 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToBatchNdTestImpl.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 // @@ -64,8 +64,10 @@ LayerTestResult<T, 4> SpaceToBatchNdTestImpl( ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, armnnUtils::QuantizedVector<T>(outputExpectedData, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp index c6a5bbed0e..74407bb9d3 100644 --- a/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SpaceToDepthTestImpl.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 // @@ -65,8 +65,10 @@ LayerTestResult<T, 4> SpaceToDepthTestImpl( ret.outputExpected = MakeTensor<T, 4>(outputTensorInfo, armnnUtils::QuantizedVector<T>(outputExpectedData, qScale, qOffset)); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp index 88b18b9732..911696b9da 100644 --- a/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SplitterTestImpl.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 // @@ -181,6 +181,7 @@ std::vector<LayerTestResult<T,3>> SplitterTestCommon( bool subTensorsSupported = workloadFactory.SupportsSubTensors(); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle1 = @@ -202,6 +203,7 @@ std::vector<LayerTestResult<T,3>> SplitterTestCommon( subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*outputHandle2, outputTensorInfo4.GetShape(), wOrigin4.data()) : workloadFactory.CreateTensorHandle(outputTensorInfo4); + ARMNN_NO_DEPRECATE_WARN_END // Do the first split armnn::SplitterQueueDescriptor data; @@ -290,12 +292,14 @@ LayerTestResult<T, 3> CopyViaSplitterTestImpl( const bool subTensorsSupported = workloadFactory.SupportsSubTensors(); + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(tensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = subTensorsSupported ? workloadFactory.CreateSubTensorHandle(*inputHandle, tensorInfo.GetShape(), origin.data()) : workloadFactory.CreateTensorHandle(tensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::SplitterQueueDescriptor data; armnn::WorkloadInfo info; diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp index eeaa846972..f523afb43c 100644 --- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -42,11 +42,13 @@ LayerTestResult<T, outputDimLength> StackTestHelper( result.outputExpected = MakeTensor<T, outputDimLength>(outputTensorInfo, outputExpectedData); std::vector<std::unique_ptr<armnn::ITensorHandle>> inputHandles; + ARMNN_NO_DEPRECATE_WARN_BEGIN for (unsigned int i = 0; i < numInputs; ++i) { inputHandles.push_back(workloadFactory.CreateTensorHandle(inputTensorInfo)); } std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::StackQueueDescriptor descriptor; descriptor.m_Parameters.m_Axis = axis; diff --git a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp index b857a1b23b..722b7dd2f3 100644 --- a/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/StridedSliceTestImpl.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 // @@ -45,12 +45,13 @@ LayerTestResult<T, OutDim> StridedSliceTestImpl( LayerTestResult<T, OutDim> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T, OutDim>(outputTensorInfo, armnnUtils::QuantizedVector<T>(outputExpectedData, qScale, qOffset)); - + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + ARMNN_NO_DEPRECATE_WARN_END armnn::WorkloadInfo info; AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get()); diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index a599bae4b5..d5a045eec7 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -85,9 +85,11 @@ void TransposeConvolution2dTestImpl(armnn::IWorkloadFactory& workloadFactory, AllocateAndCopyDataToITensorHandle(biasesTensor.get(), biases.value().second.data()); } + ARMNN_NO_DEPRECATE_WARN_BEGIN // set up input and output handles std::unique_ptr<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(input.first); std::unique_ptr<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(output.first); + ARMNN_NO_DEPRECATE_WARN_END // set up workload armnn::WorkloadInfo workloadInfo; @@ -627,8 +629,10 @@ LayerTestResult<uint8_t, 4> TransposeConvolution2dPerAxisQuantTest( descriptor.m_BiasEnabled = true; descriptor.m_DataLayout = layout; + ARMNN_NO_DEPRECATE_WARN_BEGIN std::unique_ptr<ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputInfo); std::unique_ptr<ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputInfo); + ARMNN_NO_DEPRECATE_WARN_END WorkloadInfo workloadInfo; ScopedCpuTensorHandle weightTensor(kernelInfo); |