From 402125821499c80f44ded78bf3810a639dc2aa50 Mon Sep 17 00:00:00 2001 From: yeliang2258 <30516196+yeliang2258@users.noreply.github.com> Date: Mon, 24 Oct 2022 17:28:09 +0800 Subject: [PATCH] Fix compilation bug caused by incorrect log information (#47254) * fix log bugs * more fix * fix bugs --- paddle/fluid/framework/ir/fc_gru_fuse_pass.cc | 3 ++- paddle/fluid/framework/ir/layer_norm_fuse_pass.cc | 2 +- paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc | 2 +- .../ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc | 4 ++-- paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc | 4 ++-- .../ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc | 2 +- .../framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc | 2 +- .../ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc | 2 +- paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc | 2 +- .../ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/paddle/fluid/framework/ir/fc_gru_fuse_pass.cc b/paddle/fluid/framework/ir/fc_gru_fuse_pass.cc index e195870250..72bdd53cba 100644 --- a/paddle/fluid/framework/ir/fc_gru_fuse_pass.cc +++ b/paddle/fluid/framework/ir/fc_gru_fuse_pass.cc @@ -350,7 +350,8 @@ void FCGRUFusePass::ApplyImpl(ir::Graph* graph) const { graph, name_scope_, param_scope(), true /*with_fc_bias*/); AddStatis(fusion_count); - if ((!Has("disable_logs") || !Get("disable_logs")) && fusion_count > 0) + if ((!Has("disable_logs") || !Get("disable_logs")) && + (fusion_count > 0)) string::PrettyLogDetail("--- fused %d pairs of fc gru patterns", fusion_count); } diff --git a/paddle/fluid/framework/ir/layer_norm_fuse_pass.cc b/paddle/fluid/framework/ir/layer_norm_fuse_pass.cc index 5df2306935..260fcda378 100644 --- a/paddle/fluid/framework/ir/layer_norm_fuse_pass.cc +++ b/paddle/fluid/framework/ir/layer_norm_fuse_pass.cc @@ -423,7 +423,7 @@ void LayerNormFusePass::ApplyImpl(Graph* graph) const { gpd(graph, handler); AddStatis(found_layer_norm_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_layer_norm_count > 0) + (found_layer_norm_count > 0)) PrettyLogDetail("--- Fused %d subgraphs into layer_norm op.", found_layer_norm_count); } diff --git a/paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc index 02a394cafd..daaef03f11 100644 --- a/paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc @@ -144,7 +144,7 @@ void FuseBatchNormActOneDNNPass::FuseBatchNormAct( gpd(graph, handler); AddStatis(found_bn_act_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_bn_act_count > 0) + (found_bn_act_count > 0)) PrettyLogDetail("--- fused %d batch norm with relu activation", found_bn_act_count); } diff --git a/paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc index 6a3a24648d..dcaba82106 100644 --- a/paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc @@ -141,7 +141,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseConv( gpd(graph_with_stats.first, handler); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_conv_count > 0) { + (found_conv_count > 0)) { std::stringstream msg_ss; std::string fusionMode = as_x ? "x" : "y"; msg_ss << "--- Fused " << found_conv_count << " conv (as " << fusionMode @@ -230,7 +230,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseProjectionConv( gpd(graph_with_stats.first, handler); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_projection_conv_count > 0) { + (found_projection_conv_count > 0)) { std::stringstream msg_ss; msg_ss << "--- Fused " << found_projection_conv_count << " projection conv (as y) + elementwise_add patterns"; diff --git a/paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc index ab481b2b94..55ff71ba2e 100644 --- a/paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc @@ -99,8 +99,8 @@ void ElementwiseActivationOneDNNPass::FuseElementwiseAct( gpd(graph, handler); AddStatis(found_elementwise_activation_count); - if ((!Has("disable_logs") || - !Get("disable_logs") && found_elementwise_activation_count > 0)) + if ((!Has("disable_logs") || !Get("disable_logs")) && + (found_elementwise_activation_count > 0)) PrettyLogDetail("--- fused %d %s with %s activation", found_elementwise_activation_count, elt_type, diff --git a/paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc index 52e3e9b5d7..7b0951b9c7 100644 --- a/paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc @@ -133,7 +133,7 @@ GraphWithStats FCResidualConnectionMKLDNNFusePass::FuseFC( gpd(graph_with_stats.first, handler); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_fc_count > 0) { + (found_fc_count > 0)) { std::stringstream msg_ss; std::string fusionMode = fc_as_x ? "x" : "y"; msg_ss << "--- Fused " << found_fc_count << " fc (as " << fusionMode diff --git a/paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc index 3609466cb4..3f1478e3fe 100644 --- a/paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc @@ -88,7 +88,7 @@ void MatmulActivationMkldnnFusePass::FuseMatmulAct( gpd(graph, handler); AddStatis(found_matmul_activation_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_matmul_activation_count > 0) { + (found_matmul_activation_count > 0)) { PrettyLogDetail("--- fused %d %s with %s activation", found_matmul_activation_count, matmul_type, diff --git a/paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc index a2a67c3aaf..795ecce2ee 100644 --- a/paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc @@ -83,7 +83,7 @@ void MatmulElementwiseAddMKLDNNFusePass::FuseMatmulElementwiseAdd( gpd(graph, handler); AddStatis(found_matmul_elementwise_add_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_matmul_elementwise_add_count > 0) { + (found_matmul_elementwise_add_count > 0)) { PrettyLogDetail("--- fused %d %s (as %s) with elementwise_add", found_matmul_elementwise_add_count, matmul_type, diff --git a/paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc index e464d8d8db..bcc44a53fe 100644 --- a/paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc @@ -136,7 +136,7 @@ void ScaleMatmulFusePass::ApplyImpl(ir::Graph* graph) const { gpd(graph, handler); AddStatis(found_scale_matmul_fuse_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_scale_matmul_fuse_count > 0) + (found_scale_matmul_fuse_count > 0)) PrettyLogDetail("--- fused %d scale with matmul", found_scale_matmul_fuse_count); } diff --git a/paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc index 90a886aece..fb3cc64e54 100644 --- a/paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc @@ -95,7 +95,7 @@ void SoftplusActivationOneDNNPass::FuseSoftplusActivation( gpd(graph, handler); AddStatis(found_softplus_activation_count); if ((!Has("disable_logs") || !Get("disable_logs")) && - found_softplus_activation_count > 0) + (found_softplus_activation_count > 0)) PrettyLogDetail("--- fused %d softplus with %s activation", found_softplus_activation_count, act_type); -- GitLab