From 66277031d8fb9588b5a9f3436b6a5f06173668a8 Mon Sep 17 00:00:00 2001 From: Francis Murtagh 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 Change-Id: Iaaead8320bb1b2f1bdab6b5be2e1e69d0eb482d5 --- include/armnn/LayerSupport.hpp | 402 ------------------------ include/armnn/backends/ILayerSupport.hpp | 520 ------------------------------- include/armnnTestUtils/MockBackend.hpp | 8 +- include/armnnTestUtils/Version.hpp | 4 +- 4 files changed, 6 insertions(+), 928 deletions(-) delete mode 100644 include/armnn/LayerSupport.hpp (limited to 'include') diff --git a/include/armnn/LayerSupport.hpp b/include/armnn/LayerSupport.hpp deleted file mode 100644 index 03b706fafd..0000000000 --- a/include/armnn/LayerSupport.hpp +++ /dev/null @@ -1,402 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include -#include -#include -#include -#include -#include "LstmParams.hpp" -#include "QuantizedLstmParams.hpp" - -namespace armnn -{ - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsActivationSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const ActivationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsAdditionSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsBatchNormalizationSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const TensorInfo& mean, - const TensorInfo& var, - const TensorInfo& beta, - const TensorInfo& gamma, - const BatchNormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsBatchToSpaceNdSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const BatchToSpaceNdDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsConcatSupported(const BackendId& backend, - const std::vector inputs, - const TensorInfo& output, - const OriginsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsConstantSupported(const BackendId& backend, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsConvertFp16ToFp32Supported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsConvertFp32ToFp16Supported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsConvolution2dSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const Convolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsDebugSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsDepthwiseConvolutionSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const DepthwiseConvolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsDequantizeSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsDivisionSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsEqualSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsFakeQuantizationSupported(const BackendId& backend, - const TensorInfo& input, - const FakeQuantizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsFloorSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsFullyConnectedSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const TensorInfo& weights, - const TensorInfo& biases, - const FullyConnectedDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsGreaterSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsInputSupported(const BackendId& backend, - const TensorInfo& input, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsL2NormalizationSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const L2NormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsLstmSupported(const BackendId& backend, const TensorInfo& input, const TensorInfo& outputStateIn, - const TensorInfo& cellStateIn, const TensorInfo& scratchBuffer, - const TensorInfo& outputStateOut, const TensorInfo& cellStateOut, - const TensorInfo& output, const LstmDescriptor& descriptor, - const LstmInputParamsInfo& paramsInfo, char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMaximumSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnSupported = nullptr, - size_t reasonIfUnSupportedMaxLength = 0); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMeanSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const MeanDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMemCopySupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMergeSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMinimumSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsMultiplicationSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsNormalizationSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const NormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsOutputSupported(const BackendId& backend, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsPadSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const PadDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsPermuteSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const PermuteDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsPreCompiledSupported(const BackendId& backend, - const TensorInfo& input, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsPreluSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& alpha, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsPooling2dSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const Pooling2dDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsQuantizedLstmSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& previousCellStateIn, - const TensorInfo& previousOutputIn, - const TensorInfo& cellStateOut, - const TensorInfo& output, - const QuantizedLstmInputParamsInfo& paramsInfo, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsReduceSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const ReduceDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsReshapeSupported(const BackendId& backend, - const TensorInfo& input, - const ReshapeDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsResizeSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const ResizeDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsRsqrtSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSoftmaxSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const SoftmaxDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSpaceToBatchNdSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const SpaceToBatchNdDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSpaceToDepthSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const SpaceToDepthDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSplitterSupported(const BackendId& backend, - const TensorInfo& input, - const std::vector>& outputs, - const ViewsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsStackSupported(const BackendId& backend, - const std::vector inputs, - const TensorInfo& output, - const StackDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsStridedSliceSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const StridedSliceDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSubtractionSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsSwitchSupported(const BackendId& backend, - const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output0, - const TensorInfo& output1, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -/// Deprecated in favor of IBackend and ILayerSupport interfaces -bool IsTransposeConvolution2dSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - const TransposeConvolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - -} diff --git a/include/armnn/backends/ILayerSupport.hpp b/include/armnn/backends/ILayerSupport.hpp index 92102c11ed..6b024e347b 100644 --- a/include/armnn/backends/ILayerSupport.hpp +++ b/include/armnn/backends/ILayerSupport.hpp @@ -35,526 +35,6 @@ public: EmptyOptional(), Optional reasonIfUnsupported = EmptyOptional()) const; - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsActivationSupported(const TensorInfo& input, - const TensorInfo& output, - const ActivationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsAdditionSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsArgMinMaxSupported(const TensorInfo& input, - const TensorInfo& output, - const ArgMinMaxDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsBatchNormalizationSupported(const TensorInfo& input, - const TensorInfo& output, - const TensorInfo& mean, - const TensorInfo& var, - const TensorInfo& beta, - const TensorInfo& gamma, - const BatchNormalizationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsBatchToSpaceNdSupported(const TensorInfo& input, - const TensorInfo& output, - const BatchToSpaceNdDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsCastSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsChannelShuffleSupported(const TensorInfo& input, - const TensorInfo& output, - const ChannelShuffleDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsComparisonSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - const ComparisonDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConcatSupported(const std::vector inputs, - const TensorInfo& output, - const OriginsDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConstantSupported(const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConvertFp16ToFp32Supported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConvertFp32ToFp16Supported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConvolution2dSupported(const TensorInfo& input, - const TensorInfo& output, - const Convolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsConvolution3dSupported(const TensorInfo& input, - const TensorInfo& output, - const Convolution3dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDebugSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDepthToSpaceSupported(const TensorInfo& input, - const TensorInfo& output, - const DepthToSpaceDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDepthwiseConvolutionSupported( - const TensorInfo& input, - const TensorInfo& output, - const DepthwiseConvolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDequantizeSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDetectionPostProcessSupported(const TensorInfo& boxEncodings, - const TensorInfo& scores, - const TensorInfo& anchors, - const TensorInfo& detectionBoxes, - const TensorInfo& detectionClasses, - const TensorInfo& detectionScores, - const TensorInfo& numDetections, - const DetectionPostProcessDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDilatedDepthwiseConvolutionSupported( - const TensorInfo& input, - const TensorInfo& output, - const DepthwiseConvolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsDivisionSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsElementwiseUnarySupported(const TensorInfo& input, - const TensorInfo& output, - const ElementwiseUnaryDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsFakeQuantizationSupported(const TensorInfo& input, - const FakeQuantizationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsFillSupported(const TensorInfo& input, - const TensorInfo& output, - const FillDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsFloorSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsFullyConnectedSupported(const TensorInfo& input, - const TensorInfo& output, - const TensorInfo& weights, - const TensorInfo& biases, - const FullyConnectedDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsGatherSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - const GatherDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsInputSupported(const TensorInfo& input, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsInstanceNormalizationSupported( - const TensorInfo& input, - const TensorInfo& output, - const InstanceNormalizationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsL2NormalizationSupported(const TensorInfo& input, - const TensorInfo& output, - const L2NormalizationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsLogicalBinarySupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - const LogicalBinaryDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsLogicalUnarySupported(const TensorInfo& input, - const TensorInfo& output, - const ElementwiseUnaryDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsLogSoftmaxSupported(const TensorInfo& input, - const TensorInfo& output, - const LogSoftmaxDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsLstmSupported(const TensorInfo& input, - const TensorInfo& outputStateIn, - const TensorInfo& cellStateIn, - const TensorInfo& scratchBuffer, - const TensorInfo& outputStateOut, - const TensorInfo& cellStateOut, - const TensorInfo& output, - const LstmDescriptor& descriptor, - const LstmInputParamsInfo& paramsInfo, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMaximumSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMeanSupported(const TensorInfo& input, - const TensorInfo& output, - const MeanDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMemCopySupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMemImportSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMergeSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMinimumSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& ouput, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsMultiplicationSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsNormalizationSupported(const TensorInfo& input, - const TensorInfo& output, - const NormalizationDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsOutputSupported(const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPadSupported(const TensorInfo& input, - const TensorInfo& output, - const PadDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPermuteSupported(const TensorInfo& input, - const TensorInfo& output, - const PermuteDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPooling2dSupported(const TensorInfo& input, - const TensorInfo& output, - const Pooling2dDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPooling3dSupported(const TensorInfo& input, - const TensorInfo& output, - const Pooling3dDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPreCompiledSupported(const TensorInfo& input, - const PreCompiledDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsPreluSupported(const TensorInfo& input, - const TensorInfo& alpha, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsQuantizeSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsQLstmSupported(const TensorInfo& input, - const TensorInfo& previousOutputIn, - const TensorInfo& previousCellStateIn, - const TensorInfo& outputStateOut, - const TensorInfo& cellStateOut, - const TensorInfo& output, - const QLstmDescriptor& descriptor, - const LstmInputParamsInfo& paramsInfo, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsQuantizedLstmSupported(const TensorInfo& input, - const TensorInfo& previousCellStateIn, - const TensorInfo& previousOutputIn, - const TensorInfo& cellStateOut, - const TensorInfo& output, - const QuantizedLstmInputParamsInfo& paramsInfo, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsRankSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsReduceSupported(const TensorInfo& input, - const TensorInfo& output, - const ReduceDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsReshapeSupported(const TensorInfo& input, - const TensorInfo& output, - const ReshapeDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsResizeSupported(const TensorInfo& input, - const TensorInfo& output, - const ResizeDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsShapeSupported(const TensorInfo& input, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSliceSupported(const TensorInfo& input, - const TensorInfo& output, - const SliceDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSoftmaxSupported(const TensorInfo& input, - const TensorInfo& output, - const SoftmaxDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSpaceToBatchNdSupported(const TensorInfo& input, - const TensorInfo& output, - const SpaceToBatchNdDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSpaceToDepthSupported(const TensorInfo& input, - const TensorInfo& output, - const SpaceToDepthDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSplitterSupported(const TensorInfo& input, - const std::vector>& outputs, - const ViewsDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsStackSupported(const std::vector& inputs, - const TensorInfo& output, - const StackDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsStandInSupported(const std::vector& inputs, - const std::vector& outputs, - const StandInDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsStridedSliceSupported(const TensorInfo& input, - const TensorInfo& output, - const StridedSliceDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSubtractionSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsSwitchSupported(const TensorInfo& input0, - const TensorInfo& input1, - const TensorInfo& output0, - const TensorInfo& output1, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsTransposeConvolution2dSupported( - const TensorInfo& input, - const TensorInfo& output, - const TransposeConvolution2dDescriptor& descriptor, - const TensorInfo& weights, - const Optional& biases, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsTransposeSupported(const TensorInfo& input, - const TensorInfo& output, - const TransposeDescriptor& descriptor, - Optional reasonIfUnsupported = EmptyOptional()) const; - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. " - "Use ABI Stable IsLayerSupported accepting LayerType argument instead.", "23.08") - virtual bool IsUnidirectionalSequenceLstmSupported( - const TensorInfo& input, - const TensorInfo& outputStateIn, - const TensorInfo& cellStateIn, - const TensorInfo& outputStateOut, - const TensorInfo& cellStateOut, - const TensorInfo& output, - const LstmDescriptor& descriptor, - const LstmInputParamsInfo& paramsInfo, - Optional reasonIfUnsupported = EmptyOptional()) const; - }; // class ILayerSupport using ILayerSupportSharedPtr = std::shared_ptr; diff --git a/include/armnnTestUtils/MockBackend.hpp b/include/armnnTestUtils/MockBackend.hpp index 05df1b46b1..3c79e16220 100644 --- a/include/armnnTestUtils/MockBackend.hpp +++ b/include/armnnTestUtils/MockBackend.hpp @@ -331,13 +331,13 @@ public: } bool IsInputSupported(const TensorInfo& /*input*/, - Optional /*reasonIfUnsupported = EmptyOptional()*/) const override + Optional /*reasonIfUnsupported = EmptyOptional()*/) const { return true; } bool IsOutputSupported(const TensorInfo& /*input*/, - Optional /*reasonIfUnsupported = EmptyOptional()*/) const override + Optional /*reasonIfUnsupported = EmptyOptional()*/) const { return true; } @@ -345,7 +345,7 @@ public: bool IsAdditionSupported(const TensorInfo& /*input0*/, const TensorInfo& /*input1*/, const TensorInfo& /*output*/, - Optional /*reasonIfUnsupported = EmptyOptional()*/) const override + Optional /*reasonIfUnsupported = EmptyOptional()*/) const { return true; } @@ -355,7 +355,7 @@ public: const Convolution2dDescriptor& /*descriptor*/, const TensorInfo& /*weights*/, const Optional& /*biases*/, - Optional /*reasonIfUnsupported = EmptyOptional()*/) const override + Optional /*reasonIfUnsupported = EmptyOptional()*/) const { return true; } diff --git a/include/armnnTestUtils/Version.hpp b/include/armnnTestUtils/Version.hpp index d7a8cd6164..a1c2e58009 100644 --- a/include/armnnTestUtils/Version.hpp +++ b/include/armnnTestUtils/Version.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 -- cgit v1.2.1