From 1a05aad6d5adf3b25848ffd873a0e0e82756aa06 Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Fri, 31 Mar 2023 18:00:00 +0100
Subject: 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>
---
 include/armnn/BackendHelper.hpp | 6 ------
 include/armnn/INetwork.hpp      | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'include')

diff --git a/include/armnn/BackendHelper.hpp b/include/armnn/BackendHelper.hpp
index ddf2308da2..85aabe0dd2 100644
--- a/include/armnn/BackendHelper.hpp
+++ b/include/armnn/BackendHelper.hpp
@@ -42,7 +42,6 @@ public:
                                const ActivationDescriptor& descriptor,
                                Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsAdditionSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
                              const TensorInfo& output,
@@ -157,7 +156,6 @@ public:
             const Optional<TensorInfo>& biases,
             Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsDivisionSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
                              const TensorInfo& output,
@@ -246,7 +244,6 @@ public:
                          const LstmInputParamsInfo& paramsInfo,
                          Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsMaximumSupported(const TensorInfo& input0,
                             const TensorInfo& input1,
                             const TensorInfo& output,
@@ -270,13 +267,11 @@ public:
                           const TensorInfo& output,
                           Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsMinimumSupported(const TensorInfo& input0,
                             const TensorInfo& input1,
                             const TensorInfo& output,
                             Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsMultiplicationSupported(const TensorInfo& input0,
                                    const TensorInfo& input1,
                                    const TensorInfo& output,
@@ -405,7 +400,6 @@ public:
                                  const StridedSliceDescriptor& descriptor,
                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional());
 
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsElementwiseBinarySupported instead", "24.02")
     bool IsSubtractionSupported(const TensorInfo& input0,
                                 const TensorInfo& input1,
                                 const TensorInfo& output,
diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index 273753752d..4eac0cfe2a 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -481,13 +481,11 @@ public:
     /// Adds an addition layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddAdditionLayer(const char* name = nullptr);
 
     /// Adds a multiplication layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddMultiplicationLayer(const char* name = nullptr);
 
     /// Adds a batch normalization layer to the network.
@@ -605,19 +603,16 @@ public:
     /// Adds a division layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddDivisionLayer(const char* name = nullptr);
 
     /// Adds a subtraction layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddSubtractionLayer(const char* name = nullptr);
 
     /// Add a Maximum layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddMaximumLayer(const char* name = nullptr);
 
     /// Add a Mean layer to the network.
@@ -650,7 +645,6 @@ public:
     /// Add a Minimum layer to the network.
     /// @param name - Optional name for the layer.
     /// @return - Interface for configuring the layer.
-    ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use AddElementwiseBinaryLayer instead", "24.02")
     IConnectableLayer* AddMinimumLayer(const char* name = nullptr);
 
     /// Add Gather layer to the network.
-- 
cgit v1.2.1