diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-09-28 10:25:40 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-09-28 09:57:11 +0000 |
commit | 71b386dcfaf1190fd703e9f332398a64584bf103 (patch) | |
tree | edf551127047793a6e92aeae79eeaec08493c387 /src/armnn | |
parent | 7804481027056c6a2aec406d4cb2ab9c39e8418d (diff) | |
download | armnn-71b386dcfaf1190fd703e9f332398a64584bf103.tar.gz |
IVGCVSW-7209 Delay one release the removal of weights and bias
* This affects only to the layers (not workloads) Conv, DWConv and FC
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I66a91ed1a78bc0464e00423c7fc7c28c91d199ce
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/Network.hpp | 6 | ||||
-rw-r--r-- | src/armnn/layers/Convolution2dLayer.hpp | 4 | ||||
-rw-r--r-- | src/armnn/layers/DepthwiseConvolution2dLayer.hpp | 4 | ||||
-rw-r--r-- | src/armnn/layers/FullyConnectedLayer.hpp | 4 | ||||
-rw-r--r-- | src/armnn/optimizations/FoldPadIntoLayer2d.hpp | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 19a0286e95..8bd56d367b 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -76,18 +76,18 @@ public: IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const char* name = nullptr); - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.11") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "23.02") IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, const char* name = nullptr); - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.11") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "23.02") IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const char* name = nullptr); - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.11") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "23.02") IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const ConstTensor& biases, diff --git a/src/armnn/layers/Convolution2dLayer.hpp b/src/armnn/layers/Convolution2dLayer.hpp index 185a67252d..02ae05f83b 100644 --- a/src/armnn/layers/Convolution2dLayer.hpp +++ b/src/armnn/layers/Convolution2dLayer.hpp @@ -17,10 +17,10 @@ class Convolution2dLayer : public LayerWithParameters<Convolution2dDescriptor> public: /// A unique pointer to store Weight values. - /// @Note: Deprecated. Removal date is 22.11. Weights are stored in ConstantLayers now. + /// @Note: Deprecated. Removal date is 23.02. Weights are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Weight; /// A unique pointer to store Bias values. - /// @Note: Deprecated. Removal date is 22.11. Bias are stored in ConstantLayers now. + /// @Note: Deprecated. Removal date is 23.02. Bias are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Bias; /// Makes a workload for the Convolution2d type. diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp index 9b0e6ad8c6..baae7f122a 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp @@ -16,10 +16,10 @@ class DepthwiseConvolution2dLayer : public LayerWithParameters<DepthwiseConvolut { public: /// A unique pointer to store Weight values. - /// @Note Deprecated. Bias are stored in ConstantLayers now. + /// @Note Deprecated. Removal date is 23.02. Weights are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Weight; /// A unique pointer to store Bias values. - /// @Note Deprecated. Bias are stored in ConstantLayers now. + /// @Note Deprecated. Removal date is 23.02. Bias are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Bias; /// Makes a workload for the DepthwiseConvolution2d type. diff --git a/src/armnn/layers/FullyConnectedLayer.hpp b/src/armnn/layers/FullyConnectedLayer.hpp index 09dbb5f33a..07f4a936f9 100644 --- a/src/armnn/layers/FullyConnectedLayer.hpp +++ b/src/armnn/layers/FullyConnectedLayer.hpp @@ -16,10 +16,10 @@ class FullyConnectedLayer : public LayerWithParameters<FullyConnectedDescriptor> { public: /// A unique pointer to store Weight values. - /// @Note: Deprecated. Weights are stored in ConstantLayers now. + /// @Note: Deprecated. Removal date is 23.02. Weights are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Weight; /// A unique pointer to store Bias values. - /// @Note: Deprecated. Bias are stored in ConstantLayers now. + /// @Note: Deprecated. Removal date is 23.02. Bias are stored in ConstantLayers now. std::shared_ptr<ConstTensorHandle> m_Bias; /// Makes a workload for the FullyConnected type. diff --git a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp index 4c4bd80d41..7a50c4ac06 100644 --- a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp +++ b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp @@ -200,7 +200,7 @@ public: ARMNN_ASSERT_MSG(newConv2dLayer->GetInputSlot(1).GetConnection() != nullptr, "FoldPadIntoConvolution2d: New convolution layer is missing connection to weights layer"); - // Deprecated 22.11 + // Deprecated. Removal date is 23.02. newConv2dLayer->m_Weight = std::move(conv2dLayer->m_Weight); if (conv2dLayer->GetParameters().m_BiasEnabled) @@ -209,7 +209,7 @@ public: "FoldPadIntoConvolution2d: New convolution layer is missing " "connection to bias layer."); - // Deprecated 22.11 + // Deprecated. Removal date is 23.02. newConv2dLayer->m_Bias = std::move(conv2dLayer->m_Bias); } } @@ -234,7 +234,7 @@ public: ARMNN_ASSERT_MSG(newConv2dLayer->GetInputSlot(1).GetConnection() != nullptr, "FoldPadIntoDepthwiseConvolution2d: New convolution layer is missing connection to weights layer"); - // Deprecated 22.11 + // Deprecated. Removal date is 23.02. newConv2dLayer->m_Weight = std::move(conv2dLayer->m_Weight); if (conv2dLayer->GetParameters().m_BiasEnabled) @@ -242,7 +242,7 @@ public: ARMNN_ASSERT_MSG(newConv2dLayer->GetInputSlot(2).GetConnection() != nullptr, "FoldPadIntoConvolution2d: New convolution layer is missing " "connection to bias layer."); - // Deprecated 22.11 + // Deprecated. Removal date is 23.02. newConv2dLayer->m_Bias = std::move(conv2dLayer->m_Bias); } } |