Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
e18fbd82
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e18fbd82
编写于
8月 08, 2017
作者:
T
tensor-tang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
skip reset mkldnn when input size does not change
上级
6373291c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
6 deletion
+24
-6
paddle/gserver/layers/MkldnnLayer.cpp
paddle/gserver/layers/MkldnnLayer.cpp
+24
-6
未找到文件。
paddle/gserver/layers/MkldnnLayer.cpp
浏览文件 @
e18fbd82
...
@@ -49,7 +49,6 @@ void MkldnnLayer::resetForwardFC(int bs,
...
@@ -49,7 +49,6 @@ void MkldnnLayer::resetForwardFC(int bs,
real
*
wgtData
,
real
*
wgtData
,
real
*
biasData
)
{
real
*
biasData
)
{
bool
hasSpatial
=
ih
==
1
&&
iw
==
1
?
false
:
true
;
bool
hasSpatial
=
ih
==
1
&&
iw
==
1
?
false
:
true
;
mem
::
desc
botMD
=
hasSpatial
?
createMD
({
bs
,
ic
,
ih
,
iw
},
format
::
nchw
)
mem
::
desc
botMD
=
hasSpatial
?
createMD
({
bs
,
ic
,
ih
,
iw
},
format
::
nchw
)
:
createMD
({
bs
,
ic
},
format
::
nc
);
:
createMD
({
bs
,
ic
},
format
::
nc
);
mem
::
desc
wgtMD
=
hasSpatial
?
createMD
({
oc
,
ic
,
ih
,
iw
},
format
::
oihw
)
mem
::
desc
wgtMD
=
hasSpatial
?
createMD
({
oc
,
ic
,
ih
,
iw
},
format
::
oihw
)
...
@@ -58,7 +57,12 @@ void MkldnnLayer::resetForwardFC(int bs,
...
@@ -58,7 +57,12 @@ void MkldnnLayer::resetForwardFC(int bs,
:
createMD
({},
format
::
format_undef
);
:
createMD
({},
format
::
format_undef
);
mem
::
desc
topMD
=
createMD
({
bs
,
oc
},
format
::
nc
);
mem
::
desc
topMD
=
createMD
({
bs
,
oc
},
format
::
nc
);
inVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botData
));
mem
::
primitive_desc
botPD
=
mem
::
primitive_desc
(
botMD
,
engine_
);
if
(
inVal_
&&
inVal_
->
get_primitive_desc
()
==
botPD
)
{
return
;
}
inVal_
.
reset
(
new
mem
(
botPD
,
botData
));
wgtVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtData
));
wgtVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtData
));
outVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
topMD
,
engine_
),
topData
));
outVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
topMD
,
engine_
),
topData
));
...
@@ -111,7 +115,6 @@ void MkldnnLayer::resetBackwardFC(int bs,
...
@@ -111,7 +115,6 @@ void MkldnnLayer::resetBackwardFC(int bs,
real
*
wgtData
,
real
*
wgtData
,
real
*
biasDiff
)
{
real
*
biasDiff
)
{
bool
hasSpatial
=
ih
==
1
&&
iw
==
1
?
false
:
true
;
bool
hasSpatial
=
ih
==
1
&&
iw
==
1
?
false
:
true
;
engine_
=
CpuEngine
::
Instance
().
getEngine
();
// backward weight
// backward weight
mem
::
desc
botMD
=
hasSpatial
?
createMD
({
bs
,
ic
,
ih
,
iw
},
format
::
nchw
)
mem
::
desc
botMD
=
hasSpatial
?
createMD
({
bs
,
ic
,
ih
,
iw
},
format
::
nchw
)
...
@@ -122,9 +125,19 @@ void MkldnnLayer::resetBackwardFC(int bs,
...
@@ -122,9 +125,19 @@ void MkldnnLayer::resetBackwardFC(int bs,
mem
::
desc
biasMD
=
biasDiff
!=
NULL
?
createMD
({
oc
},
format
::
x
)
mem
::
desc
biasMD
=
biasDiff
!=
NULL
?
createMD
({
oc
},
format
::
x
)
:
createMD
({},
format
::
format_undef
);
:
createMD
({},
format
::
format_undef
);
inVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botData
));
mem
::
primitive_desc
topPD
=
mem
::
primitive_desc
(
botMD
,
engine_
);
if
(
outGrad_
&&
outGrad_
->
get_primitive_desc
()
==
topPD
)
{
return
;
}
if
(
inVal_
)
{
// update data
inVal_
->
set_data_handle
(
botData
);
}
else
{
inVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botData
));
}
wgtGrad_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtDiff
));
wgtGrad_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtDiff
));
outGrad_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
topMD
,
engine_
)
,
topDiff
));
outGrad_
.
reset
(
new
mem
(
topPD
,
topDiff
));
fc_fwd
::
desc
fwdDesc
=
fc_fwd
::
desc
fwdDesc
=
fc_fwd
::
desc
(
mkldnn
::
prop_kind
::
forward
,
botMD
,
wgtMD
,
topMD
);
fc_fwd
::
desc
(
mkldnn
::
prop_kind
::
forward
,
botMD
,
wgtMD
,
topMD
);
...
@@ -154,7 +167,12 @@ void MkldnnLayer::resetBackwardFC(int bs,
...
@@ -154,7 +167,12 @@ void MkldnnLayer::resetBackwardFC(int bs,
fc_bwdData
::
primitive_desc
bwdDataPD
=
fc_bwdData
::
primitive_desc
bwdDataPD
=
fc_bwdData
::
primitive_desc
(
bwdDataDesc
,
engine_
,
fwdPD
);
fc_bwdData
::
primitive_desc
(
bwdDataDesc
,
engine_
,
fwdPD
);
inGrad_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botDiff
));
inGrad_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botDiff
));
wgtVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtData
));
if
(
wgtVal_
)
{
// update data
wgtVal_
->
set_data_handle
(
wgtData
);
}
else
{
wgtVal_
.
reset
(
new
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtData
));
}
bwdData_
.
reset
(
new
fc_bwdData
(
bwdDataPD
,
*
outGrad_
,
*
wgtVal_
,
*
inGrad_
));
bwdData_
.
reset
(
new
fc_bwdData
(
bwdDataPD
,
*
outGrad_
,
*
wgtVal_
,
*
inGrad_
));
pipelineBwd_
.
push_back
(
*
bwdData_
);
pipelineBwd_
.
push_back
(
*
bwdData_
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录