Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
40212582
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
40212582
编写于
10月 24, 2022
作者:
Y
yeliang2258
提交者:
GitHub
10月 24, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix compilation bug caused by incorrect log information (#47254)
* fix log bugs * more fix * fix bugs
上级
2e299ad0
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
13 addition
and
12 deletion
+13
-12
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
+2
-1
paddle/fluid/framework/ir/layer_norm_fuse_pass.cc
paddle/fluid/framework/ir/layer_norm_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc
paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc
...mework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc
+2
-2
paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc
paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc
+2
-2
paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc
...ramework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc
...framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc
...work/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc
paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc
...amework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc
+1
-1
未找到文件。
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
浏览文件 @
40212582
...
@@ -350,7 +350,8 @@ void FCGRUFusePass::ApplyImpl(ir::Graph* graph) const {
...
@@ -350,7 +350,8 @@ void FCGRUFusePass::ApplyImpl(ir::Graph* graph) const {
graph
,
name_scope_
,
param_scope
(),
true
/*with_fc_bias*/
);
graph
,
name_scope_
,
param_scope
(),
true
/*with_fc_bias*/
);
AddStatis
(
fusion_count
);
AddStatis
(
fusion_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
fusion_count
>
0
)
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
(
fusion_count
>
0
))
string
::
PrettyLogDetail
(
"--- fused %d pairs of fc gru patterns"
,
string
::
PrettyLogDetail
(
"--- fused %d pairs of fc gru patterns"
,
fusion_count
);
fusion_count
);
}
}
...
...
paddle/fluid/framework/ir/layer_norm_fuse_pass.cc
浏览文件 @
40212582
...
@@ -423,7 +423,7 @@ void LayerNormFusePass::ApplyImpl(Graph* graph) const {
...
@@ -423,7 +423,7 @@ void LayerNormFusePass::ApplyImpl(Graph* graph) const {
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_layer_norm_count
);
AddStatis
(
found_layer_norm_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_layer_norm_count
>
0
)
(
found_layer_norm_count
>
0
)
)
PrettyLogDetail
(
"--- Fused %d subgraphs into layer_norm op."
,
PrettyLogDetail
(
"--- Fused %d subgraphs into layer_norm op."
,
found_layer_norm_count
);
found_layer_norm_count
);
}
}
...
...
paddle/fluid/framework/ir/mkldnn/batch_norm_act_fuse_pass.cc
浏览文件 @
40212582
...
@@ -144,7 +144,7 @@ void FuseBatchNormActOneDNNPass::FuseBatchNormAct(
...
@@ -144,7 +144,7 @@ void FuseBatchNormActOneDNNPass::FuseBatchNormAct(
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_bn_act_count
);
AddStatis
(
found_bn_act_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_bn_act_count
>
0
)
(
found_bn_act_count
>
0
)
)
PrettyLogDetail
(
"--- fused %d batch norm with relu activation"
,
PrettyLogDetail
(
"--- fused %d batch norm with relu activation"
,
found_bn_act_count
);
found_bn_act_count
);
}
}
...
...
paddle/fluid/framework/ir/mkldnn/conv_elementwise_add_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -141,7 +141,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseConv(
...
@@ -141,7 +141,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseConv(
gpd
(
graph_with_stats
.
first
,
handler
);
gpd
(
graph_with_stats
.
first
,
handler
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_conv_count
>
0
)
{
(
found_conv_count
>
0
)
)
{
std
::
stringstream
msg_ss
;
std
::
stringstream
msg_ss
;
std
::
string
fusionMode
=
as_x
?
"x"
:
"y"
;
std
::
string
fusionMode
=
as_x
?
"x"
:
"y"
;
msg_ss
<<
"--- Fused "
<<
found_conv_count
<<
" conv (as "
<<
fusionMode
msg_ss
<<
"--- Fused "
<<
found_conv_count
<<
" conv (as "
<<
fusionMode
...
@@ -230,7 +230,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseProjectionConv(
...
@@ -230,7 +230,7 @@ GraphWithStats ResidualConnectionMKLDNNFusePass::FuseProjectionConv(
gpd
(
graph_with_stats
.
first
,
handler
);
gpd
(
graph_with_stats
.
first
,
handler
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_projection_conv_count
>
0
)
{
(
found_projection_conv_count
>
0
)
)
{
std
::
stringstream
msg_ss
;
std
::
stringstream
msg_ss
;
msg_ss
<<
"--- Fused "
<<
found_projection_conv_count
msg_ss
<<
"--- Fused "
<<
found_projection_conv_count
<<
" projection conv (as y) + elementwise_add patterns"
;
<<
" projection conv (as y) + elementwise_add patterns"
;
...
...
paddle/fluid/framework/ir/mkldnn/elt_act_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -99,8 +99,8 @@ void ElementwiseActivationOneDNNPass::FuseElementwiseAct(
...
@@ -99,8 +99,8 @@ void ElementwiseActivationOneDNNPass::FuseElementwiseAct(
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_elementwise_activation_count
);
AddStatis
(
found_elementwise_activation_count
);
if
((
!
Has
(
"disable_logs"
)
||
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
!
Get
<
bool
>
(
"disable_logs"
)
&&
found_elementwise_activation_count
>
0
))
(
found_elementwise_activation_count
>
0
))
PrettyLogDetail
(
"--- fused %d %s with %s activation"
,
PrettyLogDetail
(
"--- fused %d %s with %s activation"
,
found_elementwise_activation_count
,
found_elementwise_activation_count
,
elt_type
,
elt_type
,
...
...
paddle/fluid/framework/ir/mkldnn/fc_elementwise_add_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -133,7 +133,7 @@ GraphWithStats FCResidualConnectionMKLDNNFusePass::FuseFC(
...
@@ -133,7 +133,7 @@ GraphWithStats FCResidualConnectionMKLDNNFusePass::FuseFC(
gpd
(
graph_with_stats
.
first
,
handler
);
gpd
(
graph_with_stats
.
first
,
handler
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_fc_count
>
0
)
{
(
found_fc_count
>
0
)
)
{
std
::
stringstream
msg_ss
;
std
::
stringstream
msg_ss
;
std
::
string
fusionMode
=
fc_as_x
?
"x"
:
"y"
;
std
::
string
fusionMode
=
fc_as_x
?
"x"
:
"y"
;
msg_ss
<<
"--- Fused "
<<
found_fc_count
<<
" fc (as "
<<
fusionMode
msg_ss
<<
"--- Fused "
<<
found_fc_count
<<
" fc (as "
<<
fusionMode
...
...
paddle/fluid/framework/ir/mkldnn/matmul_activation_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -88,7 +88,7 @@ void MatmulActivationMkldnnFusePass::FuseMatmulAct(
...
@@ -88,7 +88,7 @@ void MatmulActivationMkldnnFusePass::FuseMatmulAct(
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_matmul_activation_count
);
AddStatis
(
found_matmul_activation_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_matmul_activation_count
>
0
)
{
(
found_matmul_activation_count
>
0
)
)
{
PrettyLogDetail
(
"--- fused %d %s with %s activation"
,
PrettyLogDetail
(
"--- fused %d %s with %s activation"
,
found_matmul_activation_count
,
found_matmul_activation_count
,
matmul_type
,
matmul_type
,
...
...
paddle/fluid/framework/ir/mkldnn/matmul_elementwise_add_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -83,7 +83,7 @@ void MatmulElementwiseAddMKLDNNFusePass::FuseMatmulElementwiseAdd(
...
@@ -83,7 +83,7 @@ void MatmulElementwiseAddMKLDNNFusePass::FuseMatmulElementwiseAdd(
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_matmul_elementwise_add_count
);
AddStatis
(
found_matmul_elementwise_add_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_matmul_elementwise_add_count
>
0
)
{
(
found_matmul_elementwise_add_count
>
0
)
)
{
PrettyLogDetail
(
"--- fused %d %s (as %s) with elementwise_add"
,
PrettyLogDetail
(
"--- fused %d %s (as %s) with elementwise_add"
,
found_matmul_elementwise_add_count
,
found_matmul_elementwise_add_count
,
matmul_type
,
matmul_type
,
...
...
paddle/fluid/framework/ir/mkldnn/scale_matmul_fuse_pass.cc
浏览文件 @
40212582
...
@@ -136,7 +136,7 @@ void ScaleMatmulFusePass::ApplyImpl(ir::Graph* graph) const {
...
@@ -136,7 +136,7 @@ void ScaleMatmulFusePass::ApplyImpl(ir::Graph* graph) const {
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_scale_matmul_fuse_count
);
AddStatis
(
found_scale_matmul_fuse_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_scale_matmul_fuse_count
>
0
)
(
found_scale_matmul_fuse_count
>
0
)
)
PrettyLogDetail
(
"--- fused %d scale with matmul"
,
PrettyLogDetail
(
"--- fused %d scale with matmul"
,
found_scale_matmul_fuse_count
);
found_scale_matmul_fuse_count
);
}
}
...
...
paddle/fluid/framework/ir/mkldnn/softplus_activation_mkldnn_fuse_pass.cc
浏览文件 @
40212582
...
@@ -95,7 +95,7 @@ void SoftplusActivationOneDNNPass::FuseSoftplusActivation(
...
@@ -95,7 +95,7 @@ void SoftplusActivationOneDNNPass::FuseSoftplusActivation(
gpd
(
graph
,
handler
);
gpd
(
graph
,
handler
);
AddStatis
(
found_softplus_activation_count
);
AddStatis
(
found_softplus_activation_count
);
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
if
((
!
Has
(
"disable_logs"
)
||
!
Get
<
bool
>
(
"disable_logs"
))
&&
found_softplus_activation_count
>
0
)
(
found_softplus_activation_count
>
0
)
)
PrettyLogDetail
(
"--- fused %d softplus with %s activation"
,
PrettyLogDetail
(
"--- fused %d softplus with %s activation"
,
found_softplus_activation_count
,
found_softplus_activation_count
,
act_type
);
act_type
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录