From bdd6ff452f91e5043c5a5230610ccb9793a45634 Mon Sep 17 00:00:00 2001 From: yejianwu Date: Wed, 28 Mar 2018 11:34:25 +0800 Subject: [PATCH] format code --- mace/core/runtime/opencl/opencl_runtime.cc | 2 +- mace/core/runtime/opencl/opencl_runtime.h | 2 +- mace/kernels/opencl/bias_add_opencl.cc | 3 ++- mace/kernels/opencl/concat.cc | 2 +- mace/kernels/opencl/fully_connected_opencl.cc | 3 ++- mace/kernels/opencl/helper.cc | 16 ++++++++++------ mace/kernels/reorganize.h | 1 - 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mace/core/runtime/opencl/opencl_runtime.cc b/mace/core/runtime/opencl/opencl_runtime.cc index 02fa29a0..d5ba7010 100644 --- a/mace/core/runtime/opencl/opencl_runtime.cc +++ b/mace/core/runtime/opencl/opencl_runtime.cc @@ -361,7 +361,7 @@ const GPU_TYPE OpenCLRuntime::GetGPUType() const { return gpu_type_; } -const std::string &OpenCLRuntime::GetOpenclVersion() { +const std::string &OpenCLRuntime::GetOpenclVersion() const { return opencl_version_; } diff --git a/mace/core/runtime/opencl/opencl_runtime.h b/mace/core/runtime/opencl/opencl_runtime.h index 1b257e6b..d3cc5cc7 100644 --- a/mace/core/runtime/opencl/opencl_runtime.h +++ b/mace/core/runtime/opencl/opencl_runtime.h @@ -56,7 +56,7 @@ class OpenCLRuntime { uint64_t GetKernelMaxWorkGroupSize(const cl::Kernel &kernel); uint64_t GetKernelWaveSize(const cl::Kernel &kernel); const GPU_TYPE GetGPUType() const; - const std::string &GetOpenclVersion(); + const std::string &GetOpenclVersion() const; cl::Kernel BuildKernel(const std::string &program_name, const std::string &kernel_name, const std::set &build_options); diff --git a/mace/kernels/opencl/bias_add_opencl.cc b/mace/kernels/opencl/bias_add_opencl.cc index ce0e5965..2fb1252b 100644 --- a/mace/kernels/opencl/bias_add_opencl.cc +++ b/mace/kernels/opencl/bias_add_opencl.cc @@ -71,7 +71,8 @@ void BiasAddFunctor::operator()(const Tensor *input, } error = runtime->command_queue().enqueueNDRangeKernel( - kernel_, cl::NullRange, cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), + kernel_, cl::NullRange, + cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), cl::NDRange(lws[0], lws[1], lws[2]), nullptr, &event); } MACE_CHECK(error == CL_SUCCESS); diff --git a/mace/kernels/opencl/concat.cc b/mace/kernels/opencl/concat.cc index 1ddf37bc..ce5a7718 100644 --- a/mace/kernels/opencl/concat.cc +++ b/mace/kernels/opencl/concat.cc @@ -122,7 +122,7 @@ static void ConcatN(cl::Kernel *kernel, kernel->setArg(idx++, gws[2]); chan_blk_offset += input_channel_blk; - const uint32_t kwg_size = + const uint32_t kwg_size = static_cast(runtime->GetKernelMaxWorkGroupSize(*kernel)); const std::vector lws = {8, kwg_size / 64, 8, 1}; std::stringstream ss; diff --git a/mace/kernels/opencl/fully_connected_opencl.cc b/mace/kernels/opencl/fully_connected_opencl.cc index 208f4025..e49226d0 100644 --- a/mace/kernels/opencl/fully_connected_opencl.cc +++ b/mace/kernels/opencl/fully_connected_opencl.cc @@ -111,7 +111,8 @@ void FCWXKernel(cl::Kernel *kernel, cl::Event event; cl_int error = runtime->command_queue().enqueueNDRangeKernel( - *kernel, cl::NullRange, cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), + *kernel, cl::NullRange, + cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), cl::NDRange((*lws)[0], (*lws)[1], (*lws)[2]), nullptr, &event); MACE_CHECK(error == CL_SUCCESS) << "Error code: " << error; diff --git a/mace/kernels/opencl/helper.cc b/mace/kernels/opencl/helper.cc index 641abd66..b386cfc6 100644 --- a/mace/kernels/opencl/helper.cc +++ b/mace/kernels/opencl/helper.cc @@ -249,7 +249,7 @@ void TuningOrRun3DKernel(const cl::Kernel &kernel, << "Tuning parameters of 3D kernel must be 4D"; cl_int error = CL_SUCCESS; std::vector roundup_gws(3); - if(!is_qualcomm_opencl200) { + if (!is_qualcomm_opencl200) { for (size_t i = 0; i < 3; ++i) { roundup_gws[i] = RoundUp(gws[i], params[i]); } @@ -284,7 +284,8 @@ void TuningOrRun3DKernel(const cl::Kernel &kernel, cl::NDRange(params[0], params[1], params[2]), nullptr, &event); } else { error = runtime->command_queue().enqueueNDRangeKernel( - kernel, cl::NullRange, cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), + kernel, cl::NullRange, + cl::NDRange(roundup_gws[0], roundup_gws[1], roundup_gws[2]), cl::NDRange(params[0], params[1], params[2]), nullptr, &event); } MACE_CHECK(error == CL_SUCCESS) << "Error code: " << error; @@ -387,7 +388,8 @@ void TuningOrRun2DKernel(const cl::Kernel &kernel, } else { uint32_t roundup_gws1 = RoundUp(gws1, params[1]); error = runtime->command_queue().enqueueNDRangeKernel( - kernel, cl::NDRange(0, i * block_size), cl::NDRange(roundup_gws[0], roundup_gws1), + kernel, cl::NDRange(0, i * block_size), + cl::NDRange(roundup_gws[0], roundup_gws1), cl::NDRange(params[0], params[1]), nullptr, &event); } MACE_CHECK(error == CL_SUCCESS) << "Error code: " << error; @@ -420,12 +422,14 @@ void TuningOrRun2DKernel(const cl::Kernel &kernel, (i == num_blocks - 1) ? (gws[1] - (i * block_size)) : block_size; if (is_qualcomm_opencl200) { error = runtime->command_queue().enqueueNDRangeKernel( - kernel, cl::NDRange(0, i * block_size), cl::NDRange(gws[0], gws1), - cl::NDRange(params[0], params[1]), nullptr, &event); + kernel, cl::NDRange(0, i * block_size), + cl::NDRange(gws[0], gws1), cl::NDRange(params[0], params[1]), + nullptr, &event); } else { uint32_t roundup_gws1 = RoundUp(gws1, params[1]); error = runtime->command_queue().enqueueNDRangeKernel( - kernel, cl::NDRange(0, i * block_size), cl::NDRange(roundup_gws[0], roundup_gws1), + kernel, cl::NDRange(0, i * block_size), + cl::NDRange(roundup_gws[0], roundup_gws1), cl::NDRange(params[0], params[1]), nullptr, &event); } MACE_CHECK(error == CL_SUCCESS) << "Error code: " << error; diff --git a/mace/kernels/reorganize.h b/mace/kernels/reorganize.h index 68c77209..a64d55b9 100644 --- a/mace/kernels/reorganize.h +++ b/mace/kernels/reorganize.h @@ -74,7 +74,6 @@ struct ReOrganizeFunctor { } } } - } }; -- GitLab