From 1562be3e8a449360a90af75f6f1481a30d41be75 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 8 Mar 2018 19:09:19 +0000 Subject: COMPMID-998: Release unused trainable parameters. Change-Id: I361a520f34080016a25bc86e1e6789777c5152c1 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124432 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- .../runtime/CL/functions/CLDepthwiseConvolutionLayer.h | 10 ++++++++++ arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h | 11 ++++++++++- arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h | 10 ++++++++++ arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h | 9 +++++++++ .../runtime/NEON/functions/NEDepthwiseConvolutionLayer.h | 10 ++++++++++ arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h | 11 ++++++++++- arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h | 11 ++++++++++- arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h | 9 +++++++++ 8 files changed, 78 insertions(+), 3 deletions(-) (limited to 'arm_compute/runtime') diff --git a/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h index eb12fe4cca..d6fc8f0fcc 100644 --- a/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h @@ -83,6 +83,14 @@ class CLDepthwiseConvolutionLayer : public IFunction public: /** Default constructor */ CLDepthwiseConvolutionLayer(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLDepthwiseConvolutionLayer(const CLDepthwiseConvolutionLayer &) = delete; + /** Default move constructor */ + CLDepthwiseConvolutionLayer(CLDepthwiseConvolutionLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLDepthwiseConvolutionLayer &operator=(const CLDepthwiseConvolutionLayer &) = delete; + /** Default move assignment operator */ + CLDepthwiseConvolutionLayer &operator=(CLDepthwiseConvolutionLayer &&) = default; /** Initialize the function's source, destination, weights and convolution information. * * @param[in, out] input Source tensor. Data type supported: QASYMM8/F32. (Written to only for border filling). @@ -109,7 +117,9 @@ private: CLTensor _weights_reshaped; CLTensor _v2mm_output; CLTensor _output_reshaped; + bool _is_first_run; bool _is_quantized; + const ICLTensor *_original_weights; }; } #endif /*__ARM_COMPUTE_CLDEPTHWISECONVOLUTION_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h b/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h index 1e9ee492ad..ad821318e9 100644 --- a/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h +++ b/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -76,6 +76,14 @@ class CLFullyConnectedLayer : public IFunction public: /** Constructor */ CLFullyConnectedLayer(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLFullyConnectedLayer(const CLFullyConnectedLayer &) = delete; + /** Default move constructor */ + CLFullyConnectedLayer(CLFullyConnectedLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLFullyConnectedLayer &operator=(const CLFullyConnectedLayer &) = delete; + /** Default move assignment operator */ + CLFullyConnectedLayer &operator=(CLFullyConnectedLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. Data type supported: QS8/QASYMM8/QS16/F16/F32. @@ -121,6 +129,7 @@ private: bool _is_fc_after_conv; bool _accumulate_biases; bool _is_quantized; + const ICLTensor *_original_weights; }; } #endif /* __ARM_COMPUTE_CLFULLYCONNECTEDLAYER_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h index dc1211a51a..91d35ca0b2 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h @@ -103,6 +103,14 @@ public: * @param[in] memory_manager (Optional) Memory manager. */ CLGEMMConvolutionLayer(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMConvolutionLayer(const CLGEMMConvolutionLayer &) = delete; + /** Default move constructor */ + CLGEMMConvolutionLayer(CLGEMMConvolutionLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMConvolutionLayer &operator=(const CLGEMMConvolutionLayer &) = delete; + /** Default move assignment operator */ + CLGEMMConvolutionLayer &operator=(CLGEMMConvolutionLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -172,6 +180,8 @@ private: CLGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPoint _gemmlowp_output_stage; CLCol2ImKernel _col2im_kernel; + const ICLTensor *_original_weights; + CLTensor _im2col_output; CLTensor _weights_reshaped; CLTensor _gemm_output; diff --git a/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h b/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h index e5aafd8547..b7b2587454 100644 --- a/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h +++ b/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h @@ -53,6 +53,14 @@ class CLLocallyConnectedLayer : public IFunction public: /** Default constructor */ CLLocallyConnectedLayer(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLocallyConnectedLayer(const CLLocallyConnectedLayer &) = delete; + /** Default move constructor */ + CLLocallyConnectedLayer(CLLocallyConnectedLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLocallyConnectedLayer &operator=(const CLLocallyConnectedLayer &) = delete; + /** Default move assignment operator */ + CLLocallyConnectedLayer &operator=(CLLocallyConnectedLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -93,6 +101,7 @@ private: CLTensor _weights_reshaped; CLTensor _gemm_output; bool _is_first_run; + const ICLTensor *_original_weights; }; } #endif /* __ARM_COMPUTE_CLLOCALLYCONNECTEDLAYER_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h index f5805f5ad1..fe65ac1a43 100644 --- a/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h @@ -97,6 +97,14 @@ class NEDepthwiseConvolutionLayer : public IFunction public: /** Default constructor */ NEDepthwiseConvolutionLayer(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEDepthwiseConvolutionLayer(const NEDepthwiseConvolutionLayer &) = delete; + /** Default move constructor */ + NEDepthwiseConvolutionLayer(NEDepthwiseConvolutionLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEDepthwiseConvolutionLayer &operator=(const NEDepthwiseConvolutionLayer &) = delete; + /** Default move assignment operator */ + NEDepthwiseConvolutionLayer &operator=(NEDepthwiseConvolutionLayer &&) = default; /** Initialize the function's source, destination, weights and convolution information. * * @param[in, out] input Source tensor. Data type supported: QASYMM8/F32. (Written to only for border filling). @@ -123,7 +131,9 @@ private: Tensor _weights_reshaped; Tensor _v2mm_output; Tensor _output_reshaped; + bool _is_first_run; bool _is_quantized; + const ITensor *_original_weights; }; } #endif /* __ARM_COMPUTE_NEDEPTHWISECONVOLUTION_H__ */ \ No newline at end of file diff --git a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h index 9bc8d21fc4..071eecc3f7 100644 --- a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h +++ b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h @@ -94,6 +94,14 @@ class NEFullyConnectedLayer : public IFunction public: /** Constructor */ NEFullyConnectedLayer(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEFullyConnectedLayer(const NEFullyConnectedLayer &) = delete; + /** Default move constructor */ + NEFullyConnectedLayer(NEFullyConnectedLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEFullyConnectedLayer &operator=(const NEFullyConnectedLayer &) = delete; + /** Default move assignment operator */ + NEFullyConnectedLayer &operator=(NEFullyConnectedLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. Data type supported: QS8/QS16/F32. @@ -134,6 +142,7 @@ private: bool _is_batched_fc_layer; bool _linearize_input; bool _accumulate_biases; + const ITensor *_original_weights; }; -} +} // namespace arm_compute #endif /* __ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h index 43e9304414..e733fec4b6 100644 --- a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h @@ -101,7 +101,14 @@ class NEGEMMConvolutionLayer : public IFunction public: /** Constructor */ NEGEMMConvolutionLayer(const std::shared_ptr &memory_manager = nullptr); - + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEGEMMConvolutionLayer(const NEGEMMConvolutionLayer &) = delete; + /** Default move constructor */ + NEGEMMConvolutionLayer(NEGEMMConvolutionLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEGEMMConvolutionLayer &operator=(const NEGEMMConvolutionLayer &) = delete; + /** Default move assignment operator */ + NEGEMMConvolutionLayer &operator=(NEGEMMConvolutionLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -165,6 +172,8 @@ private: NEGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPoint _gemmlowp_output_stage; NECol2ImKernel _output_col2im_kernel; + const ITensor *_original_weights; + Tensor _input_im2col_reshaped; Tensor _input_interleaved_reshaped; Tensor _weights_reshaped; diff --git a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h index e07f09c588..18cd27414e 100644 --- a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h +++ b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h @@ -53,6 +53,14 @@ class NELocallyConnectedLayer : public IFunction public: /** Default constructor */ NELocallyConnectedLayer(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NELocallyConnectedLayer(const NELocallyConnectedLayer &) = delete; + /** Default move constructor */ + NELocallyConnectedLayer(NELocallyConnectedLayer &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NELocallyConnectedLayer &operator=(const NELocallyConnectedLayer &) = delete; + /** Default move assignment operator */ + NELocallyConnectedLayer &operator=(NELocallyConnectedLayer &&) = default; /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -93,6 +101,7 @@ private: Tensor _weights_reshaped; Tensor _gemm_output; bool _is_first_run; + const ITensor *_original_weights; }; } #endif /* __ARM_COMPUTE_NELOCALLYCONNECTEDLAYER_H__ */ -- cgit v1.2.1