From ec67a0f08e0f96a5aebf3cac65331c67f6649f5e Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 25 Nov 2022 13:55:24 +0000 Subject: IVGCVSW-7209 Remove deprecated code due to be removed in 23.02 * Removed weights and bias from Convolution, DepthwiseConv & FullyConnected layers * Removed the weight and bias ConstTensorHandles from the QueueDescriptors * Updated Workloads to take tensors from WorkloadInfo rather than the QueueDescriptors * Removed unused RedirectMembersToConstantInputs optimization and tests. Signed-off-by: Teresa Charlin Signed-off-by: Mike Kelly Change-Id: I9ffcdc4a1c0dff725539dd69fc435b700bd98a56 --- src/armnn/layers/DepthwiseConvolution2dLayer.hpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/armnn/layers/DepthwiseConvolution2dLayer.hpp') diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp index baae7f122a..ef7410f1d3 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -15,12 +15,6 @@ class ScopedTensorHandle; class DepthwiseConvolution2dLayer : public LayerWithParameters { public: - /// A unique pointer to store Weight values. - /// @Note Deprecated. Removal date is 23.02. Weights are stored in ConstantLayers now. - std::shared_ptr m_Weight; - /// A unique pointer to store Bias values. - /// @Note Deprecated. Removal date is 23.02. Bias are stored in ConstantLayers now. - std::shared_ptr m_Bias; /// Makes a workload for the DepthwiseConvolution2d type. /// @param [in] graph The graph where this layer can be found. @@ -47,6 +41,10 @@ public: void SerializeLayerParameters(ParameterStringifyFunction& fn) const override; + /// This layer does not have any data stored, weights and bias are now stored in constant layers. + /// We do not want to release the data in the constant layer, that is why we override with an empty function. + void ReleaseConstantData() override {} + protected: /// Constructor to create a DepthwiseConvolution2dLayer. /// @param [in] param DepthwiseConvolution2dDescriptor to configure the depthwise convolution2d. @@ -56,10 +54,8 @@ protected: /// Default destructor ~DepthwiseConvolution2dLayer() = default; - /// Retrieve the handles to the constant values stored by the layer. - /// @return A vector of the constant tensors stored by this layer. - /// @Note Deprecated. GetConstantTensorsByRef is deprecated. m_Weights and m_Bias - /// should be connected to layer as Constant Layers instead." + /// Retrieve the handles to the constant values connected to the layer. + /// @return A vector of the constant tensors connected to the layer. ConstantTensors GetConstantTensorsByRef() override; }; -- cgit v1.2.1