Revert "IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers"

This reverts commit 52e90bf59ecbe90d33368d8fc1fd120f07658aaf.

Change-Id: I5a0d244593d8e760ee7ba0c9d38c02377e1bdc24
Signed-off-by: Mike Kelly <mike.kelly@arm.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 837b42e172..9ebb67b593 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -213,16 +213,12 @@ IConnectableLayer* INetwork::AddMergeLayer(const char* name)
 
 IConnectableLayer* INetwork::AddAdditionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddAdditionLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddMultiplicationLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddMultiplicationLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddBatchNormalizationLayer(const BatchNormalizationDescriptor& desc,
@@ -312,23 +308,17 @@ IConnectableLayer* INetwork::AddLstmLayer(const LstmDescriptor& descriptor,
 
 IConnectableLayer* INetwork::AddDivisionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddDivisionLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddSubtractionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddSubtractionLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddMaximumLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddMaximumLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddMeanLayer(const MeanDescriptor& meanDescriptor, const char* name)
@@ -355,9 +345,7 @@ IConnectableLayer* INetwork::AddStridedSliceLayer(const StridedSliceDescriptor&
 
 IConnectableLayer* INetwork::AddMinimumLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return pNetworkImpl->AddMinimumLayer(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* INetwork::AddGatherLayer(const GatherDescriptor& descriptor,
@@ -1996,30 +1984,22 @@ IConnectableLayer* NetworkImpl::AddSplitterLayer(const ViewsDescriptor& splitter
 
 IConnectableLayer* NetworkImpl::AddMaximumLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<MaximumLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddMinimumLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<MinimumLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddAdditionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<AdditionLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddMultiplicationLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<MultiplicationLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddOutputLayer(LayerBindingId id, const char* name)
@@ -2258,16 +2238,12 @@ IConnectableLayer* NetworkImpl::AddLstmLayer(const LstmDescriptor&  descriptor,
 
 IConnectableLayer* NetworkImpl::AddDivisionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<DivisionLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddSubtractionLayer(const char* name)
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     return m_Graph->AddLayer<SubtractionLayer>(name);
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 IConnectableLayer* NetworkImpl::AddMeanLayer(const MeanDescriptor& meanDescriptor, const char* name)