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

6 files changed, 30 insertions, 6 deletions

diff --git a/src/backends/backendsCommon/WorkloadFactoryBase.hpp b/src/backends/backendsCommon/WorkloadFactoryBase.hpp
index 00e549c933..e793b44cf4 100644
--- a/src/backends/backendsCommon/WorkloadFactoryBase.hpp
+++ b/src/backends/backendsCommon/WorkloadFactoryBase.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2019 Arm Ltd. All rights reserved.
+// Copyright © 2019-2023 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -43,6 +43,7 @@ public:
                                                 const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateAddition(const AdditionQueueDescriptor& /*descriptor*/,
                                               const WorkloadInfo& /*info*/) const override
     { return nullptr; }
@@ -103,6 +104,7 @@ public:
                                                           const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateDivision(const DivisionQueueDescriptor& /*descriptor*/,
                                               const WorkloadInfo& /*info*/) const override
     { return nullptr; }
@@ -152,6 +154,7 @@ public:
                                           const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateMaximum(const MaximumQueueDescriptor& /*descriptor*/,
                                              const WorkloadInfo& /*info*/) const override
     { return nullptr; }
@@ -172,10 +175,12 @@ public:
                                            const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& /*descriptor*/,
                                              const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateMultiplication(const MultiplicationQueueDescriptor& /*descriptor*/,
                                                     const WorkloadInfo& /*info*/) const override
     { return nullptr; }
@@ -248,6 +253,7 @@ public:
                                                   const WorkloadInfo& /*info*/) const override
     { return nullptr; }
 
+    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use CreateElementwiseBinary instead", "24.02")
     std::unique_ptr<IWorkload> CreateSubtraction(const SubtractionQueueDescriptor& /*descriptor*/,
                                                  const WorkloadInfo& /*info*/) const override
     { return nullptr; }
diff --git a/src/backends/backendsCommon/test/AdditionEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/AdditionEndToEndTestImpl.hpp
index f33521888f..a0d1af6ab7 100644
--- a/src/backends/backendsCommon/test/AdditionEndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/AdditionEndToEndTestImpl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
@@ -30,8 +30,7 @@ armnn::INetworkPtr CreateAdditionNetwork(const armnn::TensorShape& inputXShape,
 
     TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset);
 
-
-    IConnectableLayer* addition = network->AddAdditionLayer("addition");
+    IConnectableLayer* addition = network->AddElementwiseBinaryLayer(BinaryOperation::Add, "addition");
     IConnectableLayer* inputX = network->AddInputLayer(0, "inputX");
     IConnectableLayer* inputY = network->AddInputLayer(1, "inputY");
     IConnectableLayer* output = network->AddOutputLayer(0, "output");
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
index 795fc13c32..9213f0eac9 100644
--- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
@@ -39,7 +39,7 @@ bool ConstantUsageTest(const std::vector<BackendId>& computeDevice,
 
     IConnectableLayer* input = net->AddInputLayer(0);
     IConnectableLayer* constant = net->AddConstantLayer(ConstTensor(commonTensorInfo, constantData));
-    IConnectableLayer* add = net->AddAdditionLayer();
+    IConnectableLayer* add = net->AddElementwiseBinaryLayer(BinaryOperation::Add);
     IConnectableLayer* output = net->AddOutputLayer(0);
 
     input->GetOutputSlot(0).Connect(add->GetInputSlot(0));
@@ -176,7 +176,8 @@ void EndToEndLayerTestImpl(INetworkPtr network,
         for (unsigned int i = 0; i < out.size(); ++i)
         {
             CHECK_MESSAGE(Compare<ArmnnOType>(it.second[i], out[i], tolerance) == true,
-                    "Actual output: " << out[i] << ". Expected output:" << it.second[i]);
+                    "Position: " << i <<" Actual output: " << static_cast<uint32_t>(out[i]) <<
+                    ". Expected output:" << static_cast<uint32_t>(it.second[i]));
 
         }
     }
diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
index 5b95d3cd92..5475762a53 100644
--- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
+++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
@@ -622,7 +622,9 @@ struct LayerTypePolicy;
 // Every entry in the armnn::LayerType enum must be accounted for below.
 DECLARE_LAYER_POLICY_2_PARAM(Activation)
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Addition)
+ARMNN_NO_DEPRECATE_WARN_END
 
 DECLARE_LAYER_POLICY_2_PARAM(ArgMinMax)
 
@@ -694,15 +696,21 @@ DECLARE_LAYER_POLICY_2_PARAM(Lstm)
 
 DECLARE_LAYER_POLICY_MAP_PARAM(Map, void)
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Maximum)
+ARMNN_NO_DEPRECATE_WARN_END
 
 DECLARE_LAYER_POLICY_2_PARAM(Mean)
 
 DECLARE_LAYER_POLICY_1_PARAM(Merge)
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Minimum)
+ARMNN_NO_DEPRECATE_WARN_END
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Multiplication)
+ARMNN_NO_DEPRECATE_WARN_END
 
 DECLARE_LAYER_POLICY_2_PARAM(Normalization)
 
@@ -726,7 +734,9 @@ DECLARE_LAYER_POLICY_2_PARAM(QLstm)
 
 DECLARE_LAYER_POLICY_1_PARAM(QuantizedLstm)
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Division)
+ARMNN_NO_DEPRECATE_WARN_END
 
 DECLARE_LAYER_POLICY_1_PARAM(Rank)
 
@@ -752,7 +762,9 @@ DECLARE_LAYER_POLICY_EXCEPTION_2_PARAM(StandIn)
 
 DECLARE_LAYER_POLICY_2_PARAM(StridedSlice)
 
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 DECLARE_LAYER_POLICY_1_PARAM(Subtraction)
+ARMNN_NO_DEPRECATE_WARN_END
 
 DECLARE_LAYER_POLICY_2_PARAM(Reduce)
 
diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp
index ff3217911a..665358b9c6 100644
--- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp
+++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp
@@ -263,7 +263,9 @@ TEST_CASE("OptimizeViewsValidateDeviceMockBackend")
     armnn::IConnectableLayer* input = net->AddInputLayer(0, "inLayer0");
     armnn::IConnectableLayer* input1 = net->AddInputLayer(1, "inLayer1");
 
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     armnn::IConnectableLayer* addition = net->AddAdditionLayer("addLayer");
+    ARMNN_NO_DEPRECATE_WARN_END
 
     armnn::IConnectableLayer* output = net->AddOutputLayer(0, "outLayer");
 
diff --git a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp
index f5a6c4217b..7303733e17 100644
--- a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp
+++ b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp
@@ -133,6 +133,7 @@ Pooling2dLayer* AddPoolingLayer(Graph& graph,
 }
 
 // Convenience function to add an addition layer to a graph
+ARMNN_NO_DEPRECATE_WARN_BEGIN
 AdditionLayer* AddAdditionaLayer(Graph& graph,
                                  LayerNameToLayerMap& layersInGraph,
                                  const std::string& layerName,
@@ -144,6 +145,7 @@ AdditionLayer* AddAdditionaLayer(Graph& graph,
     layersInGraph.insert(std::make_pair(additionLayer->GetName(), additionLayer));
     return additionLayer;
 }
+ARMNN_NO_DEPRECATE_WARN_END
 
 // Convenience function to check that the given substitution matches the specified expected values
 void CheckSubstitution(const OptimizationViews::SubstitutionPair& substitution,
@@ -750,7 +752,9 @@ SubgraphView::SubgraphViewPtr BuildPartiallyOptimizableSubgraph2(Graph& graph, L
                                                                "conv2 layer unoptimizable", outputInfo);
     Convolution2dLayer* const conv3Layer = AddConvolutionLayer(graph, layersInGraph, convolutionDescriptor,
                                                                "conv3 layer", outputInfo);
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     AdditionLayer* const addLayer = AddAdditionaLayer(graph, layersInGraph, "add layer", outputInfo);
+    ARMNN_NO_DEPRECATE_WARN_END
     Layer* const outputLayer = AddOutputLayer(graph, "output layer");
 
     // Connect the network