From d8734b55d89f05901ba9a75349761a9c955d9243 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 22 Dec 2017 15:27:52 +0000 Subject: COMPMID-793 : Add graph intermediate representation Change-Id: Ic1685de4e19e0ac79669ef2da64e1dc96c7ea0bf Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115248 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- arm_compute/runtime/CL/CLSubTensor.h | 2 ++ arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h | 10 ++-------- arm_compute/runtime/SubTensor.h | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'arm_compute/runtime') diff --git a/arm_compute/runtime/CL/CLSubTensor.h b/arm_compute/runtime/CL/CLSubTensor.h index b6e9a29df4..9c37f8be7c 100644 --- a/arm_compute/runtime/CL/CLSubTensor.h +++ b/arm_compute/runtime/CL/CLSubTensor.h @@ -37,6 +37,8 @@ class ITensorInfo; class CLSubTensor : public ICLTensor { public: + /** Default Constructor */ + CLSubTensor(); /** Constructor * * @param[in] parent Parent tensor diff --git a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h index 5f8830a361..ca805d90f1 100644 --- a/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h @@ -49,13 +49,12 @@ class ICLTensor; /** Function to reshape and transpose the weights. This function calls the following kernels: * -# @ref CLWeightsReshapeKernel - * -# @ref CLGEMMTranspose1xWKernel */ class CLConvolutionLayerReshapeWeights : public IFunction { public: /** Constructor */ - CLConvolutionLayerReshapeWeights(std::shared_ptr memory_manager = nullptr); + CLConvolutionLayerReshapeWeights(); /** Set the input and output tensors. * * @param[in] weights Weights tensor. Weights are 4D tensor with dimensions [kernel_x, kernel_y, IFM, OFM]. @@ -78,10 +77,7 @@ public: void run() override; private: - CLMemoryGroup _memory_group; - CLWeightsReshapeKernel _weights_reshape_kernel; - CLGEMMTranspose1xWKernel _weights_transposed_kernel; - CLTensor _weights_reshaped; + CLWeightsReshapeKernel _weights_reshape_kernel; }; /** Basic function to compute the convolution layer. This function calls the following OpenCL kernels/functions: @@ -169,9 +165,7 @@ private: CLCol2ImKernel _col2im_kernel; CLTensor _im2col_output; - CLTensor _interleave_output; CLTensor _weights_reshaped; - CLTensor _weights_transposed; CLTensor _gemm_output; CLTensor _tmp_output; diff --git a/arm_compute/runtime/SubTensor.h b/arm_compute/runtime/SubTensor.h index ba2f8682af..603783fa1e 100644 --- a/arm_compute/runtime/SubTensor.h +++ b/arm_compute/runtime/SubTensor.h @@ -37,6 +37,8 @@ class ITensorInfo; class SubTensor : public ITensor { public: + /** Default Constructor */ + SubTensor(); /** Constructor * * @param[in] parent Parent tensor -- cgit v1.2.1