From 72219330fd85b1271e714d4ba894d6d8e26340c9 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 5 Jun 2018 14:56:06 +0100 Subject: COMPMID-1145: (API) Introduce prepare() stage (NEON/CL/GLES) Change-Id: I5b46764f9c3154ec3e3b9c951cc9e6dfbcb81dfb Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/134255 Reviewed-by: Anthony Barbier Tested-by: Jenkins Reviewed-by: Pablo Tello Reviewed-by: Michele DiGiorgio --- arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h | 2 ++ .../runtime/CL/functions/CLDepthwiseConvolutionLayer.h | 3 ++- .../CL/functions/CLDepthwiseSeparableConvolutionLayer.h | 3 ++- arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h | 1 - .../runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h | 14 ++++++++++++-- arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h | 3 ++- arm_compute/runtime/CL/functions/CLRNNLayer.h | 2 ++ 7 files changed, 22 insertions(+), 6 deletions(-) (limited to 'arm_compute/runtime/CL/functions') diff --git a/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h index 82969301b0..7767b73e10 100644 --- a/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h @@ -94,12 +94,14 @@ public: // Inherited methods overridden: void run() override; + void prepare() override; private: CLMemoryGroup _memory_group; CLDeconvolutionLayerUpsample _scale_f; CLConvolutionLayer _conv_f; CLTensor _scaled_output; + bool _is_prepared; }; } #endif /* __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h index b1eb4b9e04..229fb24010 100644 --- a/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h @@ -140,6 +140,7 @@ public: // Inherited methods overriden: void run() override; + void prepare() override; private: CLDepthwiseIm2ColKernel _im2col_kernel; @@ -153,7 +154,7 @@ private: CLTensor _weights_reshaped; CLTensor _v2mm_output; CLTensor _output_reshaped; - bool _is_first_run; + bool _is_prepared; bool _is_quantized; const ICLTensor *_original_weights; }; diff --git a/arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h index 27cee5ed3b..a43461048a 100644 --- a/arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -70,6 +70,7 @@ public: // Inherited methods overriden: void run() override; + void prepare() override; private: CLDepthwiseConvolutionLayer _depthwise_conv; diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h index aaa432616d..3dde52989b 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h @@ -195,7 +195,6 @@ private: bool _is_quantized; bool _is_activationlayer_enabled; bool _is_prepared; - bool _retain_internal_weights; }; } #endif /* __ARM_COMPUTE_CLGEMMCONVOLUTIONLAYER_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h b/arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h index 3976704907..f404ccdf4c 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h +++ b/arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -53,6 +53,14 @@ class CLGEMMLowpMatrixMultiplyCore : public IFunction public: /** Constructor */ CLGEMMLowpMatrixMultiplyCore(std::shared_ptr memory_manager = nullptr); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMLowpMatrixMultiplyCore(const CLGEMMLowpMatrixMultiplyCore &) = delete; + /** Default move constructor */ + CLGEMMLowpMatrixMultiplyCore(CLGEMMLowpMatrixMultiplyCore &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMLowpMatrixMultiplyCore &operator=(const CLGEMMLowpMatrixMultiplyCore &) = delete; + /** Default move assignment operator */ + CLGEMMLowpMatrixMultiplyCore &operator=(CLGEMMLowpMatrixMultiplyCore &&) = default; /** Initialise the kernel's inputs, output * * @note GEMM_LOWP: low precision GEMM kernel @@ -83,6 +91,7 @@ public: // Inherited methods overridden: void run() override; + void prepare() override; private: CLMemoryGroup _memory_group; @@ -96,11 +105,12 @@ private: CLTensor _vector_sum_row; CLTensor _tmp_a; CLTensor _tmp_b; + const ICLTensor *_original_b; int32_t _a_offset; int32_t _b_offset; bool _is_interleaved_transposed; - bool _is_first_run; bool _reshape_b_only_on_first_run; + bool _is_prepared; }; } #endif /*__ARM_COMPUTE_CLGEMMLOWPMATRIXMULTIPLYCORE_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h b/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h index b7b2587454..c2bb47c550 100644 --- a/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h +++ b/arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h @@ -90,6 +90,7 @@ public: // Inherited methods overridden: void run() override; + void prepare() override; private: CLMemoryGroup _memory_group; @@ -100,7 +101,7 @@ private: CLTensor _input_im2col_reshaped; CLTensor _weights_reshaped; CLTensor _gemm_output; - bool _is_first_run; + bool _is_prepared; const ICLTensor *_original_weights; }; } diff --git a/arm_compute/runtime/CL/functions/CLRNNLayer.h b/arm_compute/runtime/CL/functions/CLRNNLayer.h index 9f239a9e64..ab7407dbfc 100644 --- a/arm_compute/runtime/CL/functions/CLRNNLayer.h +++ b/arm_compute/runtime/CL/functions/CLRNNLayer.h @@ -69,6 +69,7 @@ public: // Inherited methods overridden: void run() override; + void prepare() override; private: CLMemoryGroup _memory_group; @@ -80,6 +81,7 @@ private: CLTensor _fully_connected_out; CLTensor _gemm_output; CLTensor _add_output; + bool _is_prepared; }; } #endif /* __ARM_COMPUTE_CLRNN_LAYER_H__ */ -- cgit v1.2.1