IVGCVSW-7635 Remove deprecated code due to be removed in 23.08 (ILayerSupport)

 * ILayerSupport interface - removed unstable virtual functions.
 * User instead uses IsLayerSupported accepting LayerType enum argument.
 * Backend developers should implement the ILayerSupport::IsLayerSupported
   method accepting LayerType as a switch statement with case being
   LayerType and each case calling their implementation of IsXXXSupported()

Signed-off-by: Francis Murtagh <[email protected]>
Change-Id: Iaaead8320bb1b2f1bdab6b5be2e1e69d0eb482d5

Author: FrancisMurtagh-arm

include/armnn/LayerSupport.hpp

@@ -331,21 +331,21 @@ class MockLayerSupport : public LayerSupportBase
     }
 
     bool IsInputSupported(const TensorInfo& /*input*/,
-                          Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                          Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }
 
     bool IsOutputSupported(const TensorInfo& /*input*/,
-                           Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                           Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }
 
     bool IsAdditionSupported(const TensorInfo& /*input0*/,
                              const TensorInfo& /*input1*/,
                              const TensorInfo& /*output*/,
-                             Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                             Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }
@@ -355,7 +355,7 @@ class MockLayerSupport : public LayerSupportBase
                                   const Convolution2dDescriptor& /*descriptor*/,
                                   const TensorInfo& /*weights*/,
                                   const Optional<TensorInfo>& /*biases*/,
-                                  Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                                  Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }

include/armnn/backends/ILayerSupport.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
 //
 
@@ -10,7 +10,7 @@
 #define STRINGIFY_MACRO(s) #s
 
 // ArmnnTestUtils version components
-#define ARMNN_TEST_UTILS_MAJOR_VERSION 2
+#define ARMNN_TEST_UTILS_MAJOR_VERSION 3
 #define ARMNN_TEST_UTILS_MINOR_VERSION 0
 #define ARMNN_TEST_UTILS_PATCH_VERSION 0
 

include/armnnTestUtils/MockBackend.hpp

@@ -166,21 +166,21 @@ class MockLayerSupport : public LayerSupportBase
     }
 
     bool IsInputSupported(const TensorInfo& /*input*/,
-                          Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                          Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }
 
     bool IsOutputSupported(const TensorInfo& /*input*/,
-                           Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                           Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }
 
     bool IsActivationSupported(const TensorInfo& /*input0*/,
                                const TensorInfo& /*output*/,
                                const ActivationDescriptor& /*descriptor*/,
-                               Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const override
+                               Optional<std::string&> /*reasonIfUnsupported = EmptyOptional()*/) const
     {
         return true;
     }

include/armnnTestUtils/Version.hpp

@@ -18,7 +18,6 @@
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
 #include <armnn/utility/NumericCast.hpp>
-#include <armnn/LayerSupport.hpp>
 
 // armnnUtils:
 #include <armnnUtils/Permute.hpp>

src/armnn/ILayerSupport.cpp

@@ -46,7 +46,7 @@ class MockImportLayerSupport : public LayerSupportBase
     bool IsAdditionSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
                              const TensorInfo& output,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const
     {
         IgnoreUnused(input0);
         IgnoreUnused(input1);
@@ -56,15 +56,15 @@ class MockImportLayerSupport : public LayerSupportBase
     }
 
     bool IsInputSupported(const TensorInfo& input,
-                          Optional<std::string&> reasonIfUnsupported) const override
+                          Optional<std::string&> reasonIfUnsupported) const
     {
         IgnoreUnused(input);
         IgnoreUnused(reasonIfUnsupported);
         return true;
     }
 
     bool IsOutputSupported(const TensorInfo& output,
-                           Optional<std::string&> reasonIfUnsupported) const override
+                           Optional<std::string&> reasonIfUnsupported) const
     {
         IgnoreUnused(output);
         IgnoreUnused(reasonIfUnsupported);