diff --git a/lite/kernels/opencl/activation_buffer_compute.cc b/lite/kernels/opencl/activation_buffer_compute.cc index 03ccdac99e5f11e1c056374463f7a8068dbd4f56..7ca2c663d1cfd360a72a176182adcaa9c2e9b168 100644 --- a/lite/kernels/opencl/activation_buffer_compute.cc +++ b/lite/kernels/opencl/activation_buffer_compute.cc @@ -62,6 +62,7 @@ class ReluCompute CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange{count}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -77,7 +78,7 @@ class ReluCompute std::string kernel_func_name_{"relu"}; std::string build_options_{"-DCL_DTYPE_float -DRELU"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; class SigmoidCompute @@ -120,6 +121,7 @@ class SigmoidCompute CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange{count}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -135,7 +137,7 @@ class SigmoidCompute std::string kernel_func_name_{"sigmoid"}; std::string build_options_{"-DCL_DTYPE_float -DSIGMOID"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/activation_image_compute.cc b/lite/kernels/opencl/activation_image_compute.cc index a99e588eccd79eb35a5e7c0f3da73471849ab581..3b663cbd7d29da19122f2273c802bf47b4e1ebac 100644 --- a/lite/kernels/opencl/activation_image_compute.cc +++ b/lite/kernels/opencl/activation_image_compute.cc @@ -147,6 +147,7 @@ class ActivationComputeImageDefault auto& context = ctx_->As(); CHECK(context.cl_context() != nullptr); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -174,7 +175,7 @@ class ActivationComputeImageDefault static_cast(1), static_cast(1), static_cast(1)}; std::string build_options_{"-DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl } // namespace kernels diff --git a/lite/kernels/opencl/bilinear_interp_image_compute.cc b/lite/kernels/opencl/bilinear_interp_image_compute.cc index 53f260789e12a94dc39f785df12a8e988d08bcbe..d5143da9bd32941e7be5e4d46ca95261e83a9a90 100644 --- a/lite/kernels/opencl/bilinear_interp_image_compute.cc +++ b/lite/kernels/opencl/bilinear_interp_image_compute.cc @@ -142,6 +142,7 @@ class BilinearInterpImageCompute static_cast(default_work_size[1]), static_cast(default_work_size[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -162,7 +163,7 @@ class BilinearInterpImageCompute std::string kernel_func_name_{"bilinear_interp"}; std::string build_options_{"-DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/box_coder_image_compute.cc b/lite/kernels/opencl/box_coder_image_compute.cc index 81ad858df0834f58b84b55ef594d71442a27f186..d44610faaa4107031a7d225bbeaaf38144f52a17 100644 --- a/lite/kernels/opencl/box_coder_image_compute.cc +++ b/lite/kernels/opencl/box_coder_image_compute.cc @@ -120,6 +120,7 @@ class BoxCoderComputeImage : public KernelLite(default_work_size[0]), static_cast(default_work_size[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -141,7 +142,7 @@ class BoxCoderComputeImage : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/concat_buffer_compute.cc b/lite/kernels/opencl/concat_buffer_compute.cc index 414f62ff0c4f86f29756b933817de2a7682ecd4c..aebffe3a5764f7207b47b938ee724424f648a987 100644 --- a/lite/kernels/opencl/concat_buffer_compute.cc +++ b/lite/kernels/opencl/concat_buffer_compute.cc @@ -123,6 +123,7 @@ class ConcatCompute : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -156,6 +157,7 @@ class ConcatCompute : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -180,7 +182,7 @@ class ConcatCompute : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/concat_image_compute.cc b/lite/kernels/opencl/concat_image_compute.cc index 60d1ac628ab1474d7e82f1861067bca838548569..9d248d0718ee468cbfca032c5270853d78ad8019 100644 --- a/lite/kernels/opencl/concat_image_compute.cc +++ b/lite/kernels/opencl/concat_image_compute.cc @@ -187,6 +187,7 @@ class ConcatComputeImage : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -230,6 +231,7 @@ class ConcatComputeImage : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -254,7 +256,7 @@ class ConcatComputeImage : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/conv_buffer_compute.cc b/lite/kernels/opencl/conv_buffer_compute.cc index 4c118e1263c0d3c23eb223b01b98a8d9a53bac0e..51e3eab352ef92ae8547e52691afcc8c5889f446 100644 --- a/lite/kernels/opencl/conv_buffer_compute.cc +++ b/lite/kernels/opencl/conv_buffer_compute.cc @@ -205,6 +205,7 @@ void ConvCompute::GemmlikeConv2d() { CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange{static_cast(out_stride)}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( img2col_kernel, cl::NullRange, @@ -300,6 +301,7 @@ void ConvCompute::GemmBatched(cl::Kernel& kernel, status = kernel.setArg(++arg_idx, batch_size); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, diff --git a/lite/kernels/opencl/conv_buffer_compute.h b/lite/kernels/opencl/conv_buffer_compute.h index 3dabe906f128ef96fb03dfa82ab3847febaeeed5..531ffb5402cee45ddfd4bdd5346ec151c33b217a 100644 --- a/lite/kernels/opencl/conv_buffer_compute.h +++ b/lite/kernels/opencl/conv_buffer_compute.h @@ -57,7 +57,7 @@ class ConvCompute std::vector kernel_func_paths_{}; std::vector build_options_{}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/conv_image_compute.cc b/lite/kernels/opencl/conv_image_compute.cc index 3780b3448efffcbafb70d73be844bce1de0ab678..7b0e26cf43bb081994c3f92931ebfa51f0962bc0 100644 --- a/lite/kernels/opencl/conv_image_compute.cc +++ b/lite/kernels/opencl/conv_image_compute.cc @@ -544,6 +544,7 @@ void ConvImageCompute::Conv2d1x1opt(bool is_turn) { status = kernel.setArg(++arg_idx, default_w_blk_); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -709,6 +710,7 @@ void ConvImageCompute::Conv2d3x3(bool is_turn) { << global_work_size_[1] << "," << global_work_size_[2] << "}"; #endif + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -836,6 +838,7 @@ void ConvImageCompute::Conv2d3x3opt(bool is_turn) { << global_work_size_[1] << "," << global_work_size_[2] << "}"; #endif + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -967,6 +970,7 @@ void ConvImageCompute::Conv2d5x5(bool is_turn) { << global_work_size_[1] << "," << global_work_size_[2] << "}"; #endif + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1086,6 +1090,7 @@ void ConvImageCompute::Conv2d5x5opt(bool is_turn) { // VLOG(4) << "out_image: " << out_image; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1217,6 +1222,7 @@ void ConvImageCompute::Conv2d7x7(bool is_turn) { << global_work_size_[1] << "," << global_work_size_[2] << "}"; #endif + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1333,6 +1339,7 @@ void ConvImageCompute::Conv2d7x7opt(bool is_turn) { status = kernel.setArg(++arg_idx, output_height); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1417,6 +1424,7 @@ void ConvImageCompute::DepthwiseConv2d3x3s1(bool is_turn) { status = kernel.setArg(++arg_idx, static_cast(output_dims[2])); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1515,6 +1523,7 @@ void ConvImageCompute::DepthwiseConv2d3x3(bool is_turn) { status = kernel.setArg(++arg_idx, static_cast(output_dims[2])); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -1652,6 +1661,7 @@ void ConvImageCompute::DepthwiseConv2d(bool is_turn) { << global_work_size_[1] << "," << global_work_size_[2] << "}"; #endif + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, diff --git a/lite/kernels/opencl/conv_image_compute.h b/lite/kernels/opencl/conv_image_compute.h index 0695125d04db7b222b29c92cd2fc23a5277e563f..fbc659b50d55b3289209228e2ac52a3a19504d57 100644 --- a/lite/kernels/opencl/conv_image_compute.h +++ b/lite/kernels/opencl/conv_image_compute.h @@ -58,7 +58,7 @@ class ConvImageCompute : public KernelLite kernel_func_paths_{}; std::vector build_options_{}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; std::unique_ptr filter_gpu_image_{nullptr}; std::unique_ptr bias_gpu_image_{nullptr}; cl::NDRange global_work_size_ = cl::NDRange{ diff --git a/lite/kernels/opencl/depthwise_conv2d_buffer_compute.cc b/lite/kernels/opencl/depthwise_conv2d_buffer_compute.cc index afe2aa1c66c04d2bdf180a77362e5d6f1271c1f6..5f7950b060ac77b7d28053ef209c26b9bd9cf24f 100644 --- a/lite/kernels/opencl/depthwise_conv2d_buffer_compute.cc +++ b/lite/kernels/opencl/depthwise_conv2d_buffer_compute.cc @@ -108,6 +108,7 @@ class DepthwiseConv2dCompute status = kernel.setArg(++arg_idx, *bias_buf); CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange(static_cast(numel)); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -123,7 +124,7 @@ class DepthwiseConv2dCompute std::string kernel_func_name_{"depthwise_conv2d"}; std::string build_options_{"-DCL_DTYPE_float"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/dropout_image_compute.cc b/lite/kernels/opencl/dropout_image_compute.cc index 2be5af2ef0bf3e30d1c586d57ed6c3d40d625b14..27c7ebaa5a3f2abee2fc58cf3e137fe250ddd6bf 100644 --- a/lite/kernels/opencl/dropout_image_compute.cc +++ b/lite/kernels/opencl/dropout_image_compute.cc @@ -89,6 +89,7 @@ class DropoutComputeImage2D : public KernelLite(default_work_size.data()[1]), static_cast(default_work_size.data()[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -104,7 +105,7 @@ class DropoutComputeImage2D : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/elementwise_add_buffer_compute.cc b/lite/kernels/opencl/elementwise_add_buffer_compute.cc index b70f7d1ee017566e399ac86d35df56bd4ba4d383..f8ae61bacbba9a9595b96435e47d36107d8fc74a 100644 --- a/lite/kernels/opencl/elementwise_add_buffer_compute.cc +++ b/lite/kernels/opencl/elementwise_add_buffer_compute.cc @@ -63,6 +63,7 @@ void ElementwiseAddCompute::Run() { CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange{channels_, batch_}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, diff --git a/lite/kernels/opencl/elementwise_add_buffer_compute.h b/lite/kernels/opencl/elementwise_add_buffer_compute.h index 7dbe5d0e8d5172386418d547812bf4e6c269f043..4a26e283fd02a4f7c4f7ade20de79a3fe7838019 100644 --- a/lite/kernels/opencl/elementwise_add_buffer_compute.h +++ b/lite/kernels/opencl/elementwise_add_buffer_compute.h @@ -48,7 +48,7 @@ class ElementwiseAddCompute std::string kernel_func_name_{"elementwise_add"}; std::string build_options_{"-DCL_DTYPE_float"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/elementwise_add_image_compute.cc b/lite/kernels/opencl/elementwise_add_image_compute.cc index 51d488d51b72dd9af8225b45a7ee56063312d055..3b848954439d95eaa39616a22e6c6af67dc7d5fa 100644 --- a/lite/kernels/opencl/elementwise_add_image_compute.cc +++ b/lite/kernels/opencl/elementwise_add_image_compute.cc @@ -153,6 +153,7 @@ void ElementwiseAddImageCompute::Run() { auto& context = ctx_->As(); CHECK(context.cl_context() != nullptr); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, diff --git a/lite/kernels/opencl/elementwise_add_image_compute.h b/lite/kernels/opencl/elementwise_add_image_compute.h index a92a1b448176628381a3c65b838f6bba529eb4e0..196e3c499e700022c56f8cae919c67235e7b09db 100644 --- a/lite/kernels/opencl/elementwise_add_image_compute.h +++ b/lite/kernels/opencl/elementwise_add_image_compute.h @@ -63,7 +63,7 @@ class ElementwiseAddImageCompute cl::Kernel kernel_; cl::NDRange global_work_size_ = cl::NDRange{ static_cast(1), static_cast(1), static_cast(1)}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/elementwise_mul_compute.cc b/lite/kernels/opencl/elementwise_mul_compute.cc index d096f05278e7dbc2187dd4aaf1b5e945e5b2f395..19d8cfa03668cbfc7ffb951479ae7d84c1fc03c0 100644 --- a/lite/kernels/opencl/elementwise_mul_compute.cc +++ b/lite/kernels/opencl/elementwise_mul_compute.cc @@ -150,7 +150,8 @@ void ElementwiseMulFloatImageCompute::Run() { auto global_work_size = cl::NDRange{static_cast(x_img_width), static_cast(x_img_height)}; - auto status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( + event_ = std::shared_ptr(new cl::Event); + auto status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel kernel, cl::NullRange, global_work_size, diff --git a/lite/kernels/opencl/elementwise_mul_image_compute.cc b/lite/kernels/opencl/elementwise_mul_image_compute.cc index 96dc2de1affba7c36be6c9c0e952b85be726fca8..23b0a20ba39b0890ee10dc03b6e80756f5724419 100644 --- a/lite/kernels/opencl/elementwise_mul_image_compute.cc +++ b/lite/kernels/opencl/elementwise_mul_image_compute.cc @@ -185,6 +185,7 @@ class ElementwiseMulImageCompute auto global_work_size = cl::NDRange{static_cast(x_img_width), static_cast(x_img_height)}; + event_ = std::shared_ptr(new cl::Event); auto status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -204,7 +205,7 @@ class ElementwiseMulImageCompute std::string kernel_func_name_{"elementwise_mul"}; std::string build_options_{"-DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/elementwise_sub_image_compute.cc b/lite/kernels/opencl/elementwise_sub_image_compute.cc index b93167b99c064a2f9eb2256291adad99f3912baf..33cb55b6966bb7e04070289614ac83cc898f05c4 100644 --- a/lite/kernels/opencl/elementwise_sub_image_compute.cc +++ b/lite/kernels/opencl/elementwise_sub_image_compute.cc @@ -138,6 +138,7 @@ void ElementwiseSubImageCompute::Run() { VLOG(4) << "global_work_size:[2D]:" << x_img_width << " " << x_img_height; #endif + event_ = std::shared_ptr(new cl::Event); auto status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, diff --git a/lite/kernels/opencl/elementwise_sub_image_compute.h b/lite/kernels/opencl/elementwise_sub_image_compute.h index db3e1db9813bffd985a41abbac14e5c89e574397..29507a9775aafe202bcdf58187966317a1902ff3 100644 --- a/lite/kernels/opencl/elementwise_sub_image_compute.h +++ b/lite/kernels/opencl/elementwise_sub_image_compute.h @@ -46,7 +46,7 @@ class ElementwiseSubImageCompute std::string kernel_func_name_{"elementwise_sub"}; std::string build_options_{"-DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/fc_buffer_compute.cc b/lite/kernels/opencl/fc_buffer_compute.cc index 0fb83db2fe76e27baf7a096395369cb92b995072..1e24020f2ad3f4a6f8dda4348c9a291b7a04868f 100644 --- a/lite/kernels/opencl/fc_buffer_compute.cc +++ b/lite/kernels/opencl/fc_buffer_compute.cc @@ -123,6 +123,7 @@ class FcCompute auto& context = ctx_->As(); CHECK(context.cl_context() != nullptr); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -144,7 +145,7 @@ class FcCompute DDim last_x_dims_; cl::NDRange global_work_size_; cl::Kernel kernel_; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/grid_sampler_image_compute.cc b/lite/kernels/opencl/grid_sampler_image_compute.cc index 4fb13a61181ba282f7005ea158768ee18b94b7a0..0d2cc348960ff5ef6412bf58dd7ce9a4f2ecc19d 100644 --- a/lite/kernels/opencl/grid_sampler_image_compute.cc +++ b/lite/kernels/opencl/grid_sampler_image_compute.cc @@ -130,6 +130,7 @@ class GridSamplerImageCompute : public KernelLiteAs(); CHECK(context.cl_context() != nullptr); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -153,7 +154,7 @@ class GridSamplerImageCompute : public KernelLite(1), static_cast(1), static_cast(1)}; std::string build_options_{"-DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/instance_norm_image_compute.cc b/lite/kernels/opencl/instance_norm_image_compute.cc index c5e02ae0ed4ae9facf36747d99ee825e6eab6515..41acb5f8d457d047c0396c563006b4b4a31268b8 100644 --- a/lite/kernels/opencl/instance_norm_image_compute.cc +++ b/lite/kernels/opencl/instance_norm_image_compute.cc @@ -137,6 +137,7 @@ class InstanceNormImageCompute : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -259,6 +260,7 @@ class InstanceNormImageCompute : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -276,7 +278,7 @@ class InstanceNormImageCompute : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; Tensor scale_image_; Tensor bias_image_; }; diff --git a/lite/kernels/opencl/layout_image_compute.cc b/lite/kernels/opencl/layout_image_compute.cc index 22b3533e123bc248b0ec59df593cd51fe0ad1391..e35cd6e5fb59cfada85fb5beaff758d6262f51b4 100644 --- a/lite/kernels/opencl/layout_image_compute.cc +++ b/lite/kernels/opencl/layout_image_compute.cc @@ -122,6 +122,7 @@ class LayoutComputeBufferChwToImageDefault cl::NDRange{static_cast((new_dims[1] + 3) / 4), static_cast(new_dims[3]), static_cast(new_dims[0] * new_dims[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -141,7 +142,7 @@ class LayoutComputeBufferChwToImageDefault private: std::string kernel_func_name_{"buffer_to_image2d"}; std::string build_options_{"-DCL_DTYPE_float"}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; // [ImageDefault] -> [NCHW] @@ -229,6 +230,7 @@ class LayoutComputeImageDefaultToBufferChw cl::NDRange{static_cast((new_dims[1] + 3) / 4), static_cast(new_dims[3]), static_cast(new_dims[0] * new_dims[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -248,7 +250,7 @@ class LayoutComputeImageDefaultToBufferChw private: std::string kernel_func_name_{"image2d_to_buffer"}; std::string build_options_{"-DCL_DTYPE_float"}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; // [NCHW] -> [ImageDW] @@ -323,6 +325,7 @@ class LayoutComputeBufferChwToImage2DNw cl::NDRange{static_cast((out_N + 3) / 4), // N blocks static_cast(out_W), // w static_cast(out_C * out_H)}; // ch + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -341,7 +344,7 @@ class LayoutComputeBufferChwToImage2DNw private: std::string kernel_func_name_{"buffer_to_image2d_nw"}; std::string build_options_{"-DCL_DTYPE_float "}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/lrn_image_compute.cc b/lite/kernels/opencl/lrn_image_compute.cc index 0e01bdc107c4fcb4a0caf943cfb1b768557dd671..1595987495f4a37ec89a8c9f91e9403c72c45b79 100644 --- a/lite/kernels/opencl/lrn_image_compute.cc +++ b/lite/kernels/opencl/lrn_image_compute.cc @@ -128,6 +128,7 @@ class LrnImageCompute : public KernelLite(default_work_size[1]), static_cast(default_work_size[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -153,7 +154,7 @@ class LrnImageCompute : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/mul_buffer_compute.cc b/lite/kernels/opencl/mul_buffer_compute.cc index e8edb359898fb47cf47919a25e521ca9f8353104..4ca760b76087112f111f6be71a99c888493c39a1 100644 --- a/lite/kernels/opencl/mul_buffer_compute.cc +++ b/lite/kernels/opencl/mul_buffer_compute.cc @@ -91,6 +91,7 @@ class MulCompute auto global_work_size = cl::NDRange{static_cast((m_ + 3) / 4), static_cast((n_ + 3) / 4)}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -107,7 +108,7 @@ class MulCompute std::string kernel_func_name_{"mat_mul"}; std::string build_options_{"-DCL_DTYPE_float"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/nearest_interp_image_compute.cc b/lite/kernels/opencl/nearest_interp_image_compute.cc index 17637e2569556d1eeb8b6002c0073223345ac7ec..b61b585e441e9e39ca0fbbec4f7f20c28614df43 100644 --- a/lite/kernels/opencl/nearest_interp_image_compute.cc +++ b/lite/kernels/opencl/nearest_interp_image_compute.cc @@ -109,6 +109,7 @@ class NearestInterpComputeImageDefault cl::NDRange{static_cast(default_work_size.data()[0]), static_cast(default_work_size.data()[1]), static_cast(default_work_size.data()[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -124,7 +125,7 @@ class NearestInterpComputeImageDefault std::string kernel_func_name_{"nearest_interp"}; std::string build_options_{" -DCL_DTYPE_half"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/pad2d_image_compute.cc b/lite/kernels/opencl/pad2d_image_compute.cc index f16642d449d29c2afd3db7097432945c73d107e3..a22622af1ee79ffce5ecdee278482e5e96f482cf 100644 --- a/lite/kernels/opencl/pad2d_image_compute.cc +++ b/lite/kernels/opencl/pad2d_image_compute.cc @@ -142,6 +142,7 @@ class Pad2dCompute : public KernelLite(default_work_size[1]), static_cast(default_work_size[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -162,7 +163,7 @@ class Pad2dCompute : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/pool_buffer_compute.cc b/lite/kernels/opencl/pool_buffer_compute.cc index aeba4bcd2ea1d9b1f14ac86509ab9dbec2509ad0..7de86869ed37940756abde15c825da85924b5b3f 100644 --- a/lite/kernels/opencl/pool_buffer_compute.cc +++ b/lite/kernels/opencl/pool_buffer_compute.cc @@ -105,6 +105,7 @@ class PoolCompute status = kernel.setArg(++arg_idx, *output_buf); CL_CHECK_FATAL(status); auto global_work_size = cl::NDRange(static_cast(numel)); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -120,7 +121,7 @@ class PoolCompute std::string kernel_func_name_{"pool_"}; std::string build_options_{"-DCL_DTYPE_float"}; std::string time_stamp_{GetTimeStamp()}; - std::shared_ptr event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/pool_image_compute.cc b/lite/kernels/opencl/pool_image_compute.cc index 34524122c8e475df63db02eae32b7d100abfa2d9..83f9107d31cdfa3f73a98e08126b792bde828383 100644 --- a/lite/kernels/opencl/pool_image_compute.cc +++ b/lite/kernels/opencl/pool_image_compute.cc @@ -150,6 +150,7 @@ class PoolComputeImage2D : public KernelLite(paddings[0])); CL_CHECK_FATAL(status); + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -165,7 +166,7 @@ class PoolComputeImage2D : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/reshape_image_compute.cc b/lite/kernels/opencl/reshape_image_compute.cc index febb1c33d9c4df2cb58580a03bda1eff93ed4da7..9feffed20461dc49a5d95c7b3092eb195e1e0dc6 100644 --- a/lite/kernels/opencl/reshape_image_compute.cc +++ b/lite/kernels/opencl/reshape_image_compute.cc @@ -154,6 +154,7 @@ class ReshapeComputeFloatImage : public KernelLite(default_work_size.data()[1]), static_cast(default_work_size.data()[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -169,7 +170,7 @@ class ReshapeComputeFloatImage : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl diff --git a/lite/kernels/opencl/scale_image_compute.cc b/lite/kernels/opencl/scale_image_compute.cc index 97b56e68d47fcdf1647433f5e267c264fb36c5c2..4f5b7f754686eada24a0cc3389e73b06218a0f94 100644 --- a/lite/kernels/opencl/scale_image_compute.cc +++ b/lite/kernels/opencl/scale_image_compute.cc @@ -93,6 +93,7 @@ class ScaleComputeImage2D : public KernelLite(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -108,7 +109,7 @@ class ScaleComputeImage2D : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; param_t* scale_param_{nullptr}; cl::Kernel kernel_; diff --git a/lite/kernels/opencl/slice_image_compute.cc b/lite/kernels/opencl/slice_image_compute.cc index dd231ec8647ba88ab0f953661af47bc36c948e8b..b9f1da22578a51c69b625af62cac1260f2650ba2 100644 --- a/lite/kernels/opencl/slice_image_compute.cc +++ b/lite/kernels/opencl/slice_image_compute.cc @@ -96,6 +96,7 @@ class SliceComputeImage2D : public KernelLite(default_work_size.data()[1]), static_cast(default_work_size.data()[2])}; + event_ = std::shared_ptr(new cl::Event); status = context.cl_context()->GetCommandQueue().enqueueNDRangeKernel( kernel, cl::NullRange, @@ -111,7 +112,7 @@ class SliceComputeImage2D : public KernelLite event_{new cl::Event}; + std::shared_ptr event_{nullptr}; }; } // namespace opencl