From d6c10ed456eb6d8f2569f9bebefe915c1e5951b7 Mon Sep 17 00:00:00 2001 From: arovir01 Date: Fri, 5 Oct 2018 15:46:51 +0100 Subject: IVGCVSW-1973: Replace char* reasonIfNotSupported with Optional in ILayerSupport Change-Id: Id5db71a0b6f4bdc5d97210652b9028e3c5dcc39a --- include/armnn/ILayerSupport.hpp | 84 ++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) (limited to 'include/armnn/ILayerSupport.hpp') diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index b9b41b7fcf..c595075a63 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -24,14 +24,12 @@ public: virtual bool IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsAdditionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsBatchNormalizationSupported(const TensorInfo& input, const TensorInfo& output, @@ -40,68 +38,57 @@ public: const TensorInfo& beta, const TensorInfo& gamma, const BatchNormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsConstantSupported(const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsConvertFp16ToFp32Supported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsConvertFp32ToFp16Supported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsConvolution2dSupported(const TensorInfo& input, const TensorInfo& output, const Convolution2dDescriptor& descriptor, const TensorInfo& weights, const Optional& biases, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsDepthwiseConvolutionSupported(const TensorInfo& input, const TensorInfo& output, const DepthwiseConvolution2dDescriptor& descriptor, const TensorInfo& weights, const Optional& biases, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsDivisionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsSubtractionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsInputSupported(const TensorInfo& input, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsFullyConnectedSupported(const TensorInfo& input, const TensorInfo& output, const TensorInfo& weights, const TensorInfo& biases, const FullyConnectedDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsL2NormalizationSupported(const TensorInfo& input, const TensorInfo& output, const L2NormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsLstmSupported(const TensorInfo& input, const TensorInfo& outputStateIn, @@ -128,82 +115,67 @@ public: const TensorInfo* projectionBias, const TensorInfo* cellToForgetWeights, const TensorInfo* cellToOutputWeights, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsMergerSupported(const std::vector inputs, const OriginsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsMultiplicationSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsNormalizationSupported(const TensorInfo& input, const TensorInfo& output, const NormalizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsOutputSupported(const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsPermuteSupported(const TensorInfo& input, const TensorInfo& output, const PermuteDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsPooling2dSupported(const TensorInfo& input, const TensorInfo& output, const Pooling2dDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsResizeBilinearSupported(const TensorInfo& input, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsSoftmaxSupported(const TensorInfo& input, const TensorInfo& output, const SoftmaxDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsSplitterSupported(const TensorInfo& input, const ViewsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsFakeQuantizationSupported(const TensorInfo& input, const FakeQuantizationDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsReshapeSupported(const TensorInfo& input, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsFloorSupported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsMeanSupported(const TensorInfo& input, const TensorInfo& output, const MeanDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; virtual bool IsPadSupported(const TensorInfo& input, const TensorInfo& output, const PadDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024) const; + Optional reasonIfUnsupported = EmptyOptional()) const; }; // class ILayerSupport -- cgit v1.2.1