diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 10:36:13 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 13:33:59 +0100 |
| commit | fc598e15ff30bc375c95c9536d4a56662d867926 (patch) | |
| tree | 0d17a7928ae4faab6978552e666123bfc1926d93 /include | |
| parent | 906f94631aa7ef590b9d8ff45507e818a0d1ac2c (diff) | |
| download | armnn-fc598e15ff30bc375c95c9536d4a56662d867926.tar.gz | |
Use the new deprecation API
* Used the new ARMNN_DEPRECATED_MSG macro instead of @deprecated
* Refactored the code to no longer use the deprecated methods where
applicable
!android-nn-driver:1126
Change-Id: Ib0578d3d6fc5a763f5fb922f67ba91fafc7796f6
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/INetwork.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index bae6e94955..ef8524377d 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -11,6 +11,7 @@ #include <armnn/Optional.hpp> #include <armnn/TensorFwd.hpp> #include <armnn/Types.hpp> +#include <armnn/Deprecated.hpp> #include <memory> #include <vector> @@ -121,12 +122,12 @@ public: const Optional<ConstTensor>& biases, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddConvolution2dLayer overload is deprecated") virtual IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddConvolution2dLayer overload is deprecated") virtual IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const ConstTensor& biases, @@ -144,13 +145,13 @@ public: const Optional<ConstTensor>& biases, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddDepthwiseConvolution2dLayer overload is deprecated") virtual IConnectableLayer* AddDepthwiseConvolution2dLayer( const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddDepthwiseConvolution2dLayer overload is deprecated") virtual IConnectableLayer* AddDepthwiseConvolution2dLayer( const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, @@ -182,12 +183,12 @@ public: const Optional<ConstTensor>& biases, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated") virtual IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const char* name = nullptr) = 0; - /// @deprecated + ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated") virtual IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const ConstTensor& biases, |