From 2c14db6f5747a279b7bf7dd2244ac3c82b86656c Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Wed, 15 Mar 2023 15:06:23 +0000 Subject: IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers * Added Deprecation notices for old ElementwiseBinary layers. Signed-off-by: Mike Kelly Change-Id: I5bd0f186aaed675885d667f47e1e210ee9ec84f8 --- src/armnnSerializer/test/SerializerTests.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/armnnSerializer/test/SerializerTests.cpp') diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 6ddc971f36..3998ee730d 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -32,7 +32,9 @@ TEST_CASE("SerializeAddition") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const additionLayer = network->AddAdditionLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(additionLayer->GetInputSlot(0)); @@ -357,7 +359,9 @@ TEST_CASE("SerializeConstant") armnn::INetworkPtr network(armnn::INetwork::Create()); armnn::IConnectableLayer* input = network->AddInputLayer(0); armnn::IConnectableLayer* constant = network->AddConstantLayer(constTensor, layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* add = network->AddAdditionLayer(); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* output = network->AddOutputLayer(0); input->GetOutputSlot(0).Connect(add->GetInputSlot(0)); @@ -927,7 +931,9 @@ TEST_CASE("SerializeDivision") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const divisionLayer = network->AddDivisionLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(divisionLayer->GetInputSlot(0)); @@ -1627,7 +1633,9 @@ TEST_CASE("SerializeMaximum") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const maximumLayer = network->AddMaximumLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(maximumLayer->GetInputSlot(0)); @@ -1852,7 +1860,9 @@ TEST_CASE("SerializeMinimum") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const minimumLayer = network->AddMinimumLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(minimumLayer->GetInputSlot(0)); @@ -1878,7 +1888,9 @@ TEST_CASE("SerializeMultiplication") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const multiplicationLayer = network->AddMultiplicationLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(multiplicationLayer->GetInputSlot(0)); @@ -2736,7 +2748,9 @@ TEST_CASE("SerializeSubtraction") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const subtractionLayer = network->AddSubtractionLayer(layerName.c_str()); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer0->GetOutputSlot(0).Connect(subtractionLayer->GetInputSlot(0)); @@ -2945,7 +2959,9 @@ TEST_CASE("SerializeDeserializeNonLinearNetwork") armnn::INetworkPtr network(armnn::INetwork::Create()); armnn::IConnectableLayer* input = network->AddInputLayer(0); + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* add = network->AddAdditionLayer(); + ARMNN_NO_DEPRECATE_WARN_END armnn::IConnectableLayer* constant = network->AddConstantLayer(constTensor, layerName.c_str()); armnn::IConnectableLayer* output = network->AddOutputLayer(0); -- cgit v1.2.1