From 66277031d8fb9588b5a9f3436b6a5f06173668a8 Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
Date: Fri, 28 Jul 2023 13:01:32 +0100
Subject: 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 <francis.murtagh@arm.com>
Change-Id: Iaaead8320bb1b2f1bdab6b5be2e1e69d0eb482d5
---
 src/backends/cl/ClLayerSupport.hpp | 118 ++++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

(limited to 'src/backends/cl')

diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp
index 2b3593630a..737ab7a850 100644
--- a/src/backends/cl/ClLayerSupport.hpp
+++ b/src/backends/cl/ClLayerSupport.hpp
@@ -23,23 +23,23 @@ public:
                           const BaseDescriptor& descriptor,
                           const Optional<LstmInputParamsInfo>& lstmParamsInfo,
                           const Optional<QuantizedLstmInputParamsInfo>& quantizedLstmParamsInfo,
-                          Optional<std::string&> reasonIfUnsupported) const override;
+                          Optional<std::string&> reasonIfUnsupported) const;
 
     bool IsActivationSupported(const TensorInfo& input,
                                const TensorInfo& output,
                                const ActivationDescriptor& descriptor,
-                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsAdditionSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
                              const TensorInfo& output,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsArgMinMaxSupported(const TensorInfo& input,
                               const TensorInfo& output,
                               const ArgMinMaxDescriptor& descriptor,
-                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsBatchMatMulSupported(const TensorInfo& inputX,
                                 const TensorInfo& inputY,
@@ -54,107 +54,107 @@ public:
                                        const TensorInfo& beta,
                                        const TensorInfo& gamma,
                                        const BatchNormalizationDescriptor& descriptor,
-                                       Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                       Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsBatchToSpaceNdSupported(const TensorInfo& input,
                                    const TensorInfo& output,
                                    const BatchToSpaceNdDescriptor& descriptor,
-                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsCastSupported(const TensorInfo& input,
                          const TensorInfo& output,
-                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsChannelShuffleSupported(const TensorInfo& input,
                                    const TensorInfo& output,
                                    const ChannelShuffleDescriptor& descriptor,
-                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsComparisonSupported(const TensorInfo& input0,
                                const TensorInfo& input1,
                                const TensorInfo& ouput,
                                const ComparisonDescriptor& descriptor,
-                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConcatSupported(const std::vector<const TensorInfo*> inputs,
                            const TensorInfo& output,
                            const OriginsDescriptor& descriptor,
-                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConstantSupported(const TensorInfo& output,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConvertFp16ToFp32Supported(const TensorInfo& input,
                                       const TensorInfo& output,
-                                      Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                      Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConvertFp32ToFp16Supported(const TensorInfo& input,
                                       const TensorInfo& output,
-                                      Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                      Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConvolution2dSupported(const TensorInfo& input,
                                   const TensorInfo& output,
                                   const Convolution2dDescriptor& descriptor,
                                   const TensorInfo& weights,
                                   const Optional<TensorInfo>& biases,
-                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsConvolution3dSupported(const TensorInfo& input,
                                   const TensorInfo& output,
                                   const Convolution3dDescriptor& descriptor,
                                   const TensorInfo& weights,
                                   const Optional<TensorInfo>& biases,
-                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsDequantizeSupported(const TensorInfo& input,
                                const TensorInfo& output,
-                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsDepthToSpaceSupported(const TensorInfo& input,
                                  const TensorInfo& output,
                                  const DepthToSpaceDescriptor& descriptor,
-                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsDepthwiseConvolutionSupported(const TensorInfo& input,
                                          const TensorInfo& output,
                                          const DepthwiseConvolution2dDescriptor& descriptor,
                                          const TensorInfo& weights,
                                          const Optional<TensorInfo>& biases,
-                                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsDilatedDepthwiseConvolutionSupported(const TensorInfo& input,
                                                 const TensorInfo& output,
                                                 const DepthwiseConvolution2dDescriptor& descriptor,
                                                 const TensorInfo& weights,
                                                 const Optional<TensorInfo>& biases,
-                                                Optional<std::string&> reason = EmptyOptional()) const override;
+                                                Optional<std::string&> reason = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsDivisionSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
                              const TensorInfo& output,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsElementwiseUnarySupported(const TensorInfo& input,
                                      const TensorInfo& output,
                                      const ElementwiseUnaryDescriptor& descriptor,
-                                     Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                     Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsFillSupported(const TensorInfo& input,
                          const TensorInfo& output,
                          const FillDescriptor& descriptor,
-                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsFloorSupported(const TensorInfo& input,
                           const TensorInfo& output,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsFullyConnectedSupported(const TensorInfo& input,
                                    const TensorInfo& output,
                                    const TensorInfo& weights,
                                    const TensorInfo& biases,
                                    const FullyConnectedDescriptor& descriptor,
-                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsGatherNdSupported(const TensorInfo& input0,
                              const TensorInfo& input1,
@@ -165,31 +165,31 @@ public:
                            const TensorInfo& input1,
                            const TensorInfo& output,
                            const GatherDescriptor& descriptor,
-                           Optional<std::string&> reasonIfUnsupported) const override;
+                           Optional<std::string&> reasonIfUnsupported) const;
 
     bool IsInputSupported(const TensorInfo& input,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsInstanceNormalizationSupported(const TensorInfo& input,
                                           const TensorInfo& output,
                                           const InstanceNormalizationDescriptor& descriptor,
-                                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsL2NormalizationSupported(const TensorInfo& input,
                                     const TensorInfo& output,
                                     const L2NormalizationDescriptor& descriptor,
-                                    Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                    Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsLogicalBinarySupported(const TensorInfo& input0,
                                   const TensorInfo& input1,
                                   const TensorInfo& output,
                                   const LogicalBinaryDescriptor& descriptor,
-                                  Optional<std::string&> reasonIfUnsupported) const override;
+                                  Optional<std::string&> reasonIfUnsupported) const;
 
     bool IsLogSoftmaxSupported(const TensorInfo& input,
                                const TensorInfo& output,
                                const LogSoftmaxDescriptor& descriptor,
-                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                               Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsLstmSupported(const TensorInfo& input,
                          const TensorInfo& outputStateIn,
@@ -200,63 +200,63 @@ public:
                          const TensorInfo& output,
                          const LstmDescriptor& descriptor,
                          const LstmInputParamsInfo& paramsInfo,
-                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsMaximumSupported(const TensorInfo& input0,
                             const TensorInfo& input1,
                             const TensorInfo& output,
-                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsMeanSupported(const TensorInfo& input,
                          const TensorInfo& output,
                          const MeanDescriptor& descriptor,
-                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                         Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsMinimumSupported(const TensorInfo& input0,
                             const TensorInfo& input1,
                             const TensorInfo& output,
-                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsMultiplicationSupported(const TensorInfo& input0,
                                    const TensorInfo& input1,
                                    const TensorInfo& output,
-                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsNormalizationSupported(const TensorInfo& input,
                                   const TensorInfo& output,
                                   const NormalizationDescriptor& descriptor,
-                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsOutputSupported(const TensorInfo& output,
-                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsPadSupported(const TensorInfo& input,
                         const TensorInfo& output,
                         const PadDescriptor& descriptor,
-                        Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                        Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsPermuteSupported(const TensorInfo& input,
                             const TensorInfo& output,
                             const PermuteDescriptor& descriptor,
-                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsPooling2dSupported(const TensorInfo& input,
                               const TensorInfo& output,
                               const Pooling2dDescriptor& descriptor,
-                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsPooling3dSupported(const TensorInfo& input,
                               const TensorInfo& output,
                               const Pooling3dDescriptor& descriptor,
-                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsPreluSupported(const TensorInfo& input,
                           const TensorInfo& alpha,
                           const TensorInfo& output,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsQLstmSupported(const TensorInfo& input,
                           const TensorInfo& previousOutputIn,
@@ -266,7 +266,7 @@ public:
                           const TensorInfo& output,
                           const QLstmDescriptor& descriptor,
                           const LstmInputParamsInfo& paramsInfo,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsQuantizedLstmSupported(const TensorInfo& input,
                                   const TensorInfo& previousCellStateIn,
@@ -274,79 +274,79 @@ public:
                                   const TensorInfo& cellStateOut,
                                   const TensorInfo& output,
                                   const QuantizedLstmInputParamsInfo& paramsInfo,
-                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                  Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsQuantizeSupported(const TensorInfo& input,
                              const TensorInfo& output,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsReduceSupported(const TensorInfo& input,
                            const TensorInfo& output,
                            const ReduceDescriptor& descriptor,
-                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsReshapeSupported(const TensorInfo& input,
                             const TensorInfo& output,
                             const ReshapeDescriptor& descriptor,
-                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsResizeSupported(const TensorInfo& input,
                            const TensorInfo& output,
                            const ResizeDescriptor& descriptor,
-                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsSliceSupported(const TensorInfo& input,
                           const TensorInfo& output,
                           const SliceDescriptor& descriptor,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsSoftmaxSupported(const TensorInfo& input,
                             const TensorInfo& output,
                             const SoftmaxDescriptor& descriptor,
-                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                            Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsSpaceToBatchNdSupported(const TensorInfo& input,
                                    const TensorInfo& output,
                                    const SpaceToBatchNdDescriptor& descriptor,
-                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                   Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsSpaceToDepthSupported(const TensorInfo& input,
                                  const TensorInfo& output,
                                  const SpaceToDepthDescriptor& descriptor,
-                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsSplitterSupported(const TensorInfo& input,
                              const std::vector<std::reference_wrapper<TensorInfo>>& outputs,
                              const ViewsDescriptor& descriptor,
-                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                             Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsStackSupported(const std::vector<const TensorInfo*>& inputs,
                           const TensorInfo& output,
                           const StackDescriptor& descriptor,
-                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                          Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsStridedSliceSupported(const TensorInfo& input,
                                  const TensorInfo& output,
                                  const StridedSliceDescriptor& descriptor,
-                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                 Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use IsLayerSupported instead", "24.02")
     bool IsSubtractionSupported(const TensorInfo& input0,
                                 const TensorInfo& input1,
                                 const TensorInfo& output,
-                                Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsTransposeConvolution2dSupported(const TensorInfo& input,
                                            const TensorInfo& output,
                                            const TransposeConvolution2dDescriptor& descriptor,
                                            const TensorInfo& weights,
                                            const Optional<TensorInfo>& biases,
-                                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsTransposeSupported(const TensorInfo& input,
                               const TensorInfo& output,
                               const TransposeDescriptor& descriptor,
-                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const;
 
     bool IsUnidirectionalSequenceLstmSupported(const TensorInfo& input,
                                                const TensorInfo& outputStateIn,
@@ -356,7 +356,7 @@ public:
                                                const TensorInfo& output,
                                                const UnidirectionalSequenceLstmDescriptor& descriptor,
                                                const LstmInputParamsInfo& paramsInfo,
-                                               Optional<std::string&> reasonIfUnsupported) const override;
+                                               Optional<std::string&> reasonIfUnsupported) const;
 
 private:
     const IBackendInternal::IBackendSpecificModelContextPtr m_ModelContextPtr;
-- 
cgit v1.2.1