diff options
author | arovir01 <Aron.Virginas-Tar@arm.com> | 2018-10-05 15:46:51 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:58 +0100 |
commit | d6c10ed456eb6d8f2569f9bebefe915c1e5951b7 (patch) | |
tree | 580c349e20bfd1b5c0ec2007388bfecf804d9c98 /src/backends | |
parent | 152fb1cf5ef061b21fd3103e97ff8758815d21ea (diff) | |
download | armnn-d6c10ed456eb6d8f2569f9bebefe915c1e5951b7.tar.gz |
IVGCVSW-1973: Replace char* reasonIfNotSupported with Optional<std::string&> in ILayerSupport
Change-Id: Id5db71a0b6f4bdc5d97210652b9028e3c5dcc39a
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/ILayerSupport.cpp | 157 |
1 files changed, 64 insertions, 93 deletions
diff --git a/src/backends/ILayerSupport.cpp b/src/backends/ILayerSupport.cpp index ff4b80d22b..286f1255e5 100644 --- a/src/backends/ILayerSupport.cpp +++ b/src/backends/ILayerSupport.cpp @@ -14,18 +14,17 @@ namespace bool DefaultLayerSupport(const char* func, const char* file, unsigned int line, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) + Optional<std::string&> reasonIfUnsupported) { - if (reasonIfUnsupported != nullptr && reasonIfUnsupportedMaxLength > 0) + // NOTE: We only need to return the reason if the optional parameter is not empty + if (reasonIfUnsupported) { - snprintf(reasonIfUnsupported, - reasonIfUnsupportedMaxLength, - "%s is not supported [%s:%d]", - func, - file, - line); + std::stringstream message; + message << func << "is not implemented [" << file << ":" << line << "]"; + + reasonIfUnsupported.value() = message.str(); } + return false; } @@ -34,19 +33,17 @@ bool DefaultLayerSupport(const char* func, bool ILayerSupport::IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsAdditionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsBatchNormalizationSupported(const TensorInfo& input, @@ -56,33 +53,29 @@ bool ILayerSupport::IsBatchNormalizationSupported(const TensorInfo& input, const TensorInfo& beta, const TensorInfo& gamma, const BatchNormalizationDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsConstantSupported(const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsConvertFp16ToFp32Supported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsConvertFp32ToFp16Supported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsConvolution2dSupported(const TensorInfo& input, @@ -90,10 +83,9 @@ bool ILayerSupport::IsConvolution2dSupported(const TensorInfo& input, const Convolution2dDescriptor& descriptor, const TensorInfo& weights, const Optional<TensorInfo>& biases, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsDepthwiseConvolutionSupported(const TensorInfo& input, @@ -101,35 +93,31 @@ bool ILayerSupport::IsDepthwiseConvolutionSupported(const TensorInfo& input, const DepthwiseConvolution2dDescriptor& descriptor, const TensorInfo& weights, const Optional<TensorInfo>& biases, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsDivisionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsSubtractionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsInputSupported(const TensorInfo& input, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsFullyConnectedSupported(const TensorInfo& input, @@ -137,19 +125,17 @@ bool ILayerSupport::IsFullyConnectedSupported(const TensorInfo& input, const TensorInfo& weights, const TensorInfo& biases, const FullyConnectedDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsL2NormalizationSupported(const TensorInfo& input, const TensorInfo& output, const L2NormalizationDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsLstmSupported(const TensorInfo& input, @@ -177,126 +163,111 @@ bool ILayerSupport::IsLstmSupported(const TensorInfo& input, const TensorInfo* projectionBias, const TensorInfo* cellToForgetWeights, const TensorInfo* cellToOutputWeights, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> inputs, const OriginsDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsMultiplicationSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsNormalizationSupported(const TensorInfo& input, const TensorInfo& output, const NormalizationDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsOutputSupported(const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsPermuteSupported(const TensorInfo& input, const TensorInfo& output, const PermuteDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsPooling2dSupported(const TensorInfo& input, const TensorInfo& output, const Pooling2dDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsResizeBilinearSupported(const TensorInfo& input, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsSoftmaxSupported(const TensorInfo& input, const TensorInfo& output, const SoftmaxDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsSplitterSupported(const TensorInfo& input, const ViewsDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsFakeQuantizationSupported(const TensorInfo& input, const FakeQuantizationDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsReshapeSupported(const TensorInfo& input, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsFloorSupported(const TensorInfo& input, const TensorInfo& output, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsMeanSupported(const TensorInfo& input, const TensorInfo& output, const MeanDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool ILayerSupport::IsPadSupported(const TensorInfo& input, const TensorInfo& output, const PadDescriptor& descriptor, - char* reasonIfUnsupported, - size_t reasonIfUnsupportedMaxLength) const + Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } } |