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>

2 files changed, 1 insertions, 25 deletions

diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index c68f4ce95b..cea2aa3eba 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -313,7 +313,6 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                             }
                             else if (base.GetType() == LayerType::Addition)
                             {
-                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 AdditionLayer* baseLayer = PolymorphicDowncast<AdditionLayer*>(&base);
 
                                 arm_compute::Status status = NeonAdditionWorkloadValidate(
@@ -332,11 +331,9 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
-                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Division)
                             {
-                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 DivisionLayer* baseLayer = PolymorphicDowncast<DivisionLayer*>(&base);
 
                                 arm_compute::Status status = NeonDivisionWorkloadValidate(
@@ -355,11 +352,9 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
-                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Multiplication)
                             {
-                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 MultiplicationLayer* baseLayer = PolymorphicDowncast<MultiplicationLayer*>(&base);
 
                                 arm_compute::Status status = NeonMultiplicationWorkloadValidate(
@@ -378,11 +373,9 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
-                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Subtraction)
                             {
-                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 SubtractionLayer* baseLayer = PolymorphicDowncast<SubtractionLayer*>(&base);
 
                                 arm_compute::Status status = NeonSubtractionWorkloadValidate(
@@ -401,7 +394,6 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
-                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::ElementwiseBinary)
                             {
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
index 19881c26a0..66718cc481 100644
--- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp
+++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -128,86 +128,70 @@ TEST_CASE("CreateAdditionFloat16Workload")
 
 TEST_CASE("CreateAdditionFloatWorkload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonAdditionWorkload,
                                       AdditionQueueDescriptor,
                                       AdditionLayer,
                                       DataType::Float32>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 TEST_CASE("CreateSubtractionFloat16Workload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::Float16>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 #endif
 
 TEST_CASE("CreateSubtractionFloatWorkload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::Float32>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateSubtractionUint8Workload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::QAsymmU8>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 TEST_CASE("CreateMultiplicationFloat16Workload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::Float16>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 #endif
 
 TEST_CASE("CreateMultiplicationFloatWorkload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::Float32>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateMultiplicationUint8Workload")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::QAsymmU8>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateDivisionFloatWorkloadTest")
 {
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonDivisionWorkload,
                                       DivisionQueueDescriptor,
                                       DivisionLayer,
                                       armnn::DataType::Float32>();
-    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 template <typename BatchNormalizationWorkloadType, typename armnn::DataType DataType>