From 770dfeb04b6fd89afde2005bd46caa6ff0858f3e Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Wed, 4 Nov 2020 18:55:34 +0000 Subject: COMPMID-3953: Move assignment operator failures on android Signed-off-by: Michalis Spyrou Change-Id: Id37d90e29749c50eb58084ae9a1ef78e84dbdcd7 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4326 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- .../runtime/NEON/functions/NEDeconvolutionLayer.h | 8 ++++---- .../runtime/NEON/functions/NEFFTConvolutionLayer.h | 8 ++++---- .../runtime/NEON/functions/NEFullyConnectedLayer.h | 8 ++++---- .../runtime/NEON/functions/NEGEMMConvolutionLayer.h | 16 ++++++++-------- arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h | 8 ++++---- .../runtime/NEON/functions/NELSTMLayerQuantized.h | 8 ++++---- .../runtime/NEON/functions/NELocallyConnectedLayer.h | 8 ++++---- arm_compute/runtime/NEON/functions/NEQLSTMLayer.h | 8 ++++---- arm_compute/runtime/NEON/functions/NERNNLayer.h | 8 ++++---- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h index 378fce70b3..97b1a47f64 100644 --- a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h @@ -82,10 +82,10 @@ public: NEDeconvolutionLayer(const NEDeconvolutionLayer &) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEDeconvolutionLayer &operator=(const NEDeconvolutionLayer &) = delete; - /** Allow instances of this class to be moved */ - NEDeconvolutionLayer(NEDeconvolutionLayer &&) = default; - /** Allow instances of this class to be moved */ - NEDeconvolutionLayer &operator=(NEDeconvolutionLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEDeconvolutionLayer(NEDeconvolutionLayer &&) = delete; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEDeconvolutionLayer &operator=(NEDeconvolutionLayer &&) = delete; /** Default destructor */ virtual ~NEDeconvolutionLayer() = default; diff --git a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h index b3e98fc2d6..37750e243b 100644 --- a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h @@ -63,12 +63,12 @@ public: NEFFTConvolutionLayer(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NEFFTConvolutionLayer(const NEFFTConvolutionLayer &) = delete; - /** Default move constructor */ - NEFFTConvolutionLayer(NEFFTConvolutionLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains non movable objects) */ + NEFFTConvolutionLayer(NEFFTConvolutionLayer &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEFFTConvolutionLayer &operator=(const NEFFTConvolutionLayer &) = delete; - /** Default move assignment operator */ - NEFFTConvolutionLayer &operator=(NEFFTConvolutionLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains non movable objects) */ + NEFFTConvolutionLayer &operator=(NEFFTConvolutionLayer &&) = delete; /** Default destructor */ ~NEFFTConvolutionLayer(); /** Set the input and output tensors. diff --git a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h index 3ab3d81262..0a7748a94b 100644 --- a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h +++ b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h @@ -127,12 +127,12 @@ public: NEFullyConnectedLayer(std::shared_ptr memory_manager = nullptr, IWeightsManager *weights_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 moved (As this class contains pointers) */ + NEFullyConnectedLayer(NEFullyConnectedLayer &&) = delete; /** 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; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEFullyConnectedLayer &operator=(NEFullyConnectedLayer &&) = delete; /** Default destructor */ ~NEFullyConnectedLayer(); /** Set the input and output tensors. diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h index 6bcf56fb0b..59d83ed68d 100644 --- a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h @@ -54,12 +54,12 @@ public: NEConvolutionLayerReshapeWeights(); /** Prevent instances of this class from being copied (As this class contains pointers) */ NEConvolutionLayerReshapeWeights(const NEConvolutionLayerReshapeWeights &) = delete; - /** Default move constructor */ - NEConvolutionLayerReshapeWeights(NEConvolutionLayerReshapeWeights &&) = default; + /** Prevent instances of this class from being moved (As this class contains non movable objects) */ + NEConvolutionLayerReshapeWeights(NEConvolutionLayerReshapeWeights &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEConvolutionLayerReshapeWeights &operator=(const NEConvolutionLayerReshapeWeights &) = delete; - /** Default move assignment operator */ - NEConvolutionLayerReshapeWeights &operator=(NEConvolutionLayerReshapeWeights &&) = default; + /** Prevent instances of this class from being moved (As this class contains non movable objects) */ + NEConvolutionLayerReshapeWeights &operator=(NEConvolutionLayerReshapeWeights &&) = delete; /** Default destructor */ ~NEConvolutionLayerReshapeWeights(); /** Set the input and output tensors. @@ -167,12 +167,12 @@ public: NEGEMMConvolutionLayer(const std::shared_ptr &memory_manager = nullptr, IWeightsManager *weights_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 moved (As this class contains non movable objects) */ + NEGEMMConvolutionLayer(NEGEMMConvolutionLayer &&) = delete; /** 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; + /** Prevent instances of this class from being moved (As this class contains non movable objects) */ + NEGEMMConvolutionLayer &operator=(NEGEMMConvolutionLayer &&) = delete; /** Default destructor */ ~NEGEMMConvolutionLayer(); /** Set the input and output tensors. diff --git a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h index 0fb3edd490..f273e55e77 100644 --- a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h +++ b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h @@ -62,12 +62,12 @@ public: NEHOGMultiDetection(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NEHOGMultiDetection(const NEHOGMultiDetection &) = delete; - /** Default move constructor */ - NEHOGMultiDetection(NEHOGMultiDetection &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEHOGMultiDetection(NEHOGMultiDetection &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEHOGMultiDetection &operator=(const NEHOGMultiDetection &) = delete; - /** Default move assignment operator */ - NEHOGMultiDetection &operator=(NEHOGMultiDetection &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEHOGMultiDetection &operator=(NEHOGMultiDetection &&) = delete; /** Default destructor */ ~NEHOGMultiDetection(); /** Initialise the function's source, destination, detection window strides, border mode, threshold and non-maxima suppression diff --git a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h index 39fafef773..a354a4df7b 100644 --- a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h +++ b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h @@ -67,12 +67,12 @@ public: NELSTMLayerQuantized(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NELSTMLayerQuantized(const NELSTMLayerQuantized &) = delete; - /** Default move constructor */ - NELSTMLayerQuantized(NELSTMLayerQuantized &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NELSTMLayerQuantized(NELSTMLayerQuantized &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NELSTMLayerQuantized &operator=(const NELSTMLayerQuantized &) = delete; - /** Default move assignment operator */ - NELSTMLayerQuantized &operator=(NELSTMLayerQuantized &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NELSTMLayerQuantized &operator=(NELSTMLayerQuantized &&) = delete; /** Default destructor */ ~NELSTMLayerQuantized(); /** Initialize function's tensors. diff --git a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h index e9f3e93474..86e6300130 100644 --- a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h +++ b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h @@ -55,12 +55,12 @@ public: 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 moved (As this class contains pointers) */ + NELocallyConnectedLayer(NELocallyConnectedLayer &&) = delete; /** 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; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NELocallyConnectedLayer &operator=(NELocallyConnectedLayer &&) = delete; /** Default destructor */ ~NELocallyConnectedLayer(); /** Set the input and output tensors. diff --git a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h index 17ad5a354b..fcabc1d0c4 100644 --- a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h +++ b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h @@ -67,12 +67,12 @@ public: NEQLSTMLayer(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NEQLSTMLayer(const NEQLSTMLayer &) = delete; - /** Default move constructor */ - NEQLSTMLayer(NEQLSTMLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEQLSTMLayer(NEQLSTMLayer &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEQLSTMLayer &operator=(const NEQLSTMLayer &) = delete; - /** Default move assignment operator */ - NEQLSTMLayer &operator=(NEQLSTMLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NEQLSTMLayer &operator=(NEQLSTMLayer &&) = delete; /** Default destructor */ ~NEQLSTMLayer(); /** Initialize function's tensors. diff --git a/arm_compute/runtime/NEON/functions/NERNNLayer.h b/arm_compute/runtime/NEON/functions/NERNNLayer.h index 74fdc59af6..c42b303a89 100644 --- a/arm_compute/runtime/NEON/functions/NERNNLayer.h +++ b/arm_compute/runtime/NEON/functions/NERNNLayer.h @@ -44,12 +44,12 @@ public: NERNNLayer(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NERNNLayer(const NERNNLayer &) = delete; - /** Default move constructor */ - NERNNLayer(NERNNLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NERNNLayer(NERNNLayer &&) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ NERNNLayer &operator=(const NERNNLayer &) = delete; - /** Default move assignment operator */ - NERNNLayer &operator=(NERNNLayer &&) = default; + /** Prevent instances of this class from being moved (As this class contains pointers) */ + NERNNLayer &operator=(NERNNLayer &&) = delete; /** Default destructor */ ~NERNNLayer(); /** Initialize the function -- cgit v1.2.1