diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-03-15 15:06:23 +0000 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2023-03-30 13:40:17 +0000 |
| commit | 52e90bf59ecbe90d33368d8fc1fd120f07658aaf (patch) | |
| tree | 7ea7d3bb8148ce3973e0fd6abcd951437211255d /src/armnn/test/OptimizerTests.cpp | |
| parent | 41f9d2a5bc060f6c63e80621ff2264a66fb298bd (diff) | |
| download | armnn-52e90bf59ecbe90d33368d8fc1fd120f07658aaf.tar.gz | |
IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers
* Added Deprecation notices for old ElementwiseBinary layers.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Iebbbaff38cc9c347b25eb2f9054c914a4f931c68
Diffstat (limited to 'src/armnn/test/OptimizerTests.cpp')
| -rw-r--r-- | src/armnn/test/OptimizerTests.cpp | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp index f83900404b..ff42ab8cbb 100644 --- a/src/armnn/test/OptimizerTests.cpp +++ b/src/armnn/test/OptimizerTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -339,7 +339,9 @@ TEST_CASE("InsertConvertersTest") armnn::Layer* head = graph.AddLayer<armnn::OutputLayer>(0, "output"); + ARMNN_NO_DEPRECATE_WARN_BEGIN head = graph.InsertNewLayer<armnn::AdditionLayer>(head->GetInputSlot(0), ""); + ARMNN_NO_DEPRECATE_WARN_END head->GetOutputHandler().SetTensorInfo(info); graph.InsertNewLayer<armnn::InputLayer>(head->GetInputSlot(1), inputId++, "") @@ -355,14 +357,16 @@ TEST_CASE("InsertConvertersTest") ->GetOutputHandler().SetTensorInfo(info); // Check graph layer sequence before inserting convert layers + ARMNN_NO_DEPRECATE_WARN_BEGIN CHECK(CheckSequence(graph.cbegin(), - graph.cend(), - &IsLayerOfType<armnn::InputLayer>, - &IsLayerOfType<armnn::InputLayer>, - &IsLayerOfType<armnn::MemCopyLayer>, - &IsLayerOfType<armnn::FloorLayer>, - &IsLayerOfType<armnn::AdditionLayer>, - &IsLayerOfType<armnn::OutputLayer>)); + graph.cend(), + &IsLayerOfType<armnn::InputLayer>, + &IsLayerOfType<armnn::InputLayer>, + &IsLayerOfType<armnn::MemCopyLayer>, + &IsLayerOfType<armnn::FloorLayer>, + &IsLayerOfType<armnn::AdditionLayer>, + &IsLayerOfType<armnn::OutputLayer>)); + ARMNN_NO_DEPRECATE_WARN_END // Check layers have Float16 DataType for (auto& layer : graph) @@ -405,19 +409,21 @@ TEST_CASE("InsertConvertersTest") } // Check sequence of layers after inserting convert layers + ARMNN_NO_DEPRECATE_WARN_BEGIN CHECK(CheckSequence(graph.cbegin(), - graph.cend(), - &IsLayerOfType<armnn::InputLayer>, - &IsLayerOfType<armnn::InputLayer>, - &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, - &IsLayerOfType<armnn::MemCopyLayer>, - &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, - &IsLayerOfType<armnn::FloorLayer>, - &IsLayerOfType<armnn::ConvertFp32ToFp16Layer>, - &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, - &IsLayerOfType<armnn::AdditionLayer>, - &IsLayerOfType<armnn::ConvertFp32ToFp16Layer>, - &IsLayerOfType<armnn::OutputLayer>)); + graph.cend(), + &IsLayerOfType<armnn::InputLayer>, + &IsLayerOfType<armnn::InputLayer>, + &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, + &IsLayerOfType<armnn::MemCopyLayer>, + &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, + &IsLayerOfType<armnn::FloorLayer>, + &IsLayerOfType<armnn::ConvertFp32ToFp16Layer>, + &IsLayerOfType<armnn::ConvertFp16ToFp32Layer>, + &IsLayerOfType<armnn::AdditionLayer>, + &IsLayerOfType<armnn::ConvertFp32ToFp16Layer>, + &IsLayerOfType<armnn::OutputLayer>)); + ARMNN_NO_DEPRECATE_WARN_END } void CreateConvolution2dGraph(Graph &graph, const unsigned int* inputShape, |