From 169d2f120cc9021f170fede22a448fd6b66fc979 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Mon, 1 Jul 2019 19:01:44 +0100 Subject: IVGCVSW-3382 Deprecate ResizeBilinear and use Resize with Bilinear method !android-nn-driver:1451 Signed-off-by: Aron Virginas-Tar Change-Id: Ieedbce1f6e95891137a250fdd07e2f7e4e1f4828 --- include/armnn/ILayerSupport.hpp | 1 + include/armnn/ILayerVisitor.hpp | 1 + include/armnn/INetwork.hpp | 1 + include/armnn/LayerSupport.hpp | 9 +++++++++ 4 files changed, 12 insertions(+) (limited to 'include') diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index 635b9cc663..58722fe1a0 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -251,6 +251,7 @@ public: const ReshapeDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const = 0; + ARMNN_DEPRECATED_MSG("Use IsResizeSupported instead") virtual bool IsResizeBilinearSupported(const TensorInfo& input, const TensorInfo& output, Optional reasonIfUnsupported = EmptyOptional()) const = 0; diff --git a/include/armnn/ILayerVisitor.hpp b/include/armnn/ILayerVisitor.hpp index 37cd383daf..86cf4a33cf 100644 --- a/include/armnn/ILayerVisitor.hpp +++ b/include/armnn/ILayerVisitor.hpp @@ -314,6 +314,7 @@ public: /// @param layer - pointer to the layer which is calling back to this visit function. /// @param resizeDesc - Parameters for the resize operation. /// @param name - Optional name for the layer. + ARMNN_DEPRECATED_MSG("Use VisitResizeLayer instead") virtual void VisitResizeBilinearLayer(const IConnectableLayer* layer, const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) = 0; diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index 598e1eb0a4..1f1b51095b 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -293,6 +293,7 @@ public: /// @param resizeDesc - Parameters for the resize operation. /// @param name - Optional name for the layer. /// @return - Interface for configuring the layer. + ARMNN_DEPRECATED_MSG("Use AddResizeLayer instead") virtual IConnectableLayer* AddResizeBilinearLayer(const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) = 0; diff --git a/include/armnn/LayerSupport.hpp b/include/armnn/LayerSupport.hpp index f0dca7709e..35336ed7da 100644 --- a/include/armnn/LayerSupport.hpp +++ b/include/armnn/LayerSupport.hpp @@ -305,12 +305,21 @@ bool IsReshapeSupported(const BackendId& backend, size_t reasonIfUnsupportedMaxLength = 1024); /// Deprecated in favor of IBackend and ILayerSupport interfaces +ARMNN_DEPRECATED_MSG("Use IsResizeSupported instead") bool IsResizeBilinearSupported(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 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, -- cgit v1.2.1