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>
---
 src/armnn/test/RuntimeTests.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/armnn/test/RuntimeTests.cpp')

diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 6b3fe0f211..e0d3a222fe 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.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
 //
 
@@ -10,6 +10,7 @@
 #include <armnn/Descriptors.hpp>
 #include <armnn/IRuntime.hpp>
 #include <armnn/INetwork.hpp>
+#include <armnn/TypesUtils.hpp>
 
 #include <armnn/profiling/ArmNNProfiling.hpp>
 
@@ -18,6 +19,9 @@
 
 #include <test/ProfilingTestUtils.hpp>
 
+#include <HeapProfiling.hpp>
+#include <LeakChecking.hpp>
+
 #ifdef WITH_VALGRIND
 #include <valgrind/memcheck.h>
 #endif
@@ -72,9 +76,7 @@ TEST_CASE("RuntimePreImportInputs")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{{4}, armnn::DataType::Signed32};
@@ -1304,9 +1306,7 @@ TEST_CASE("RuntimeOptimizeImportOff_LoadNetworkImportOn")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{{4}, armnn::DataType::Signed32};
@@ -1349,9 +1349,7 @@ TEST_CASE("RuntimeOptimizeExportOff_LoadNetworkExportOn")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{{4}, armnn::DataType::Signed32};
@@ -1394,9 +1392,7 @@ TEST_CASE("RuntimeOptimizeImportOn_LoadNetworkImportOff")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{{4}, armnn::DataType::Signed32};
@@ -1439,9 +1435,7 @@ TEST_CASE("RuntimeOptimizeExportOn_LoadNetworkExportOff")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{{4}, armnn::DataType::Signed32};
@@ -1489,9 +1483,7 @@ TEST_CASE("SyncExecutePreImportInputsHappyPath")
 
     auto inputLayer1 = testNetwork->AddInputLayer(0, "input 1 layer");
     auto inputLayer2 = testNetwork->AddInputLayer(1, "input 2 layer");
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
     auto addLayer    = testNetwork->AddAdditionLayer("add layer");
-    ARMNN_NO_DEPRECATE_WARN_END
     auto outputLayer = testNetwork->AddOutputLayer(2, "output layer");
 
     TensorInfo tensorInfo{ { 4 }, armnn::DataType::Signed32 };
-- 
cgit v1.2.1