diff --git a/src/framework/cl/cl_engine.h b/src/framework/cl/cl_engine.h index 21c6620c9515c1e7723601ac64ff67c1a9d02a4d..0f8046f8f151d53480cf8054763c4a4ec9209ec1 100644 --- a/src/framework/cl/cl_engine.h +++ b/src/framework/cl/cl_engine.h @@ -19,8 +19,8 @@ limitations under the License. */ #include "CL/cl.h" #include "common/enforce.h" -#include "framework/cl/cl_tool.h" #include "framework/cl/cl_deleter.h" +#include "framework/cl/cl_tool.h" namespace paddle_mobile { namespace framework { diff --git a/src/io/paddle_mobile.cpp b/src/io/paddle_mobile.cpp index 9b868fbf169f6eecb1e2388164f4f6a525f24051..8bea4412ac0b371e029f5aa8914bcb2d6eeb547b 100644 --- a/src/io/paddle_mobile.cpp +++ b/src/io/paddle_mobile.cpp @@ -68,9 +68,10 @@ bool PaddleMobile::Load(const std::string &model_path, } template -bool PaddleMobile::LoadCombinedMemory( - size_t model_len, const uint8_t *model_buf, size_t combined_params_len, - uint8_t *combined_params_buf) { +bool PaddleMobile::LoadCombinedMemory(size_t model_len, + const uint8_t *model_buf, + size_t combined_params_len, + uint8_t *combined_params_buf) { int batch_size = 1; bool optimise = true; bool quantification = false; diff --git a/src/operators/kernel/cl/conv_add_bn_relu_kernel.cpp b/src/operators/kernel/cl/conv_add_bn_relu_kernel.cpp index 93e1debeca321ce03ab4b9183ad67c98f3391acd..e62041d3f47aae8dbc9078d49beb84d45c2d9423 100644 --- a/src/operators/kernel/cl/conv_add_bn_relu_kernel.cpp +++ b/src/operators/kernel/cl/conv_add_bn_relu_kernel.cpp @@ -56,7 +56,8 @@ bool ConvAddBNReluKernel::Init( framework::CLImage *new_scale = new framework::CLImage(); - new_scale->Init(this->cl_helper_.CLContext(), new_scale_ptr, variance->dims()); + new_scale->Init(this->cl_helper_.CLContext(), new_scale_ptr, + variance->dims()); framework::CLImage *new_bias = new framework::CLImage(); diff --git a/src/operators/kernel/cl/conv_add_kernel.cpp b/src/operators/kernel/cl/conv_add_kernel.cpp index 092b16736cf100e95aa2303986094fc6c5651a25..74de92e4c28709a5fdffa99402b1214982475511 100644 --- a/src/operators/kernel/cl/conv_add_kernel.cpp +++ b/src/operators/kernel/cl/conv_add_kernel.cpp @@ -21,11 +21,10 @@ namespace operators { template <> bool ConvAddKernel::Init(FusionConvAddParam *param) { - PADDLE_MOBILE_ENFORCE( - param->Filter()->dims()[2] == param->Filter()->dims()[3] && + param->Filter()->dims()[2] == param->Filter()->dims()[3] && param->Paddings()[0] == param->Paddings()[1], - "need equal"); + "need equal"); int offset = static_cast(param->Filter()->dims()[2]) / 2 - static_cast(param->Paddings()[1]); param->SetOffset(offset); diff --git a/src/operators/kernel/cl/conv_kernel.cpp b/src/operators/kernel/cl/conv_kernel.cpp index 157759d8893d96ef0c8ecbddf50343e0ea22b1aa..ec265b7992cd62fd4f77399698c377570c2b7a61 100644 --- a/src/operators/kernel/cl/conv_kernel.cpp +++ b/src/operators/kernel/cl/conv_kernel.cpp @@ -21,11 +21,10 @@ namespace operators { template <> bool ConvKernel::Init(ConvParam *param) { - PADDLE_MOBILE_ENFORCE( - param->Filter()->dims()[2] == param->Filter()->dims()[3] && + param->Filter()->dims()[2] == param->Filter()->dims()[3] && param->Paddings()[0] == param->Paddings()[1], - "need equal"); + "need equal"); int offset = static_cast(param->Filter()->dims()[2]) / 2 - static_cast(param->Paddings()[1]); param->SetOffset(offset);