Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
1203ebc4
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1203ebc4
编写于
8月 06, 2017
作者:
T
tensor-tang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add mkldnn fc backward
上级
90d5be74
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
153 addition
and
3 deletion
+153
-3
paddle/gserver/layers/MkldnnFcLayer.cpp
paddle/gserver/layers/MkldnnFcLayer.cpp
+35
-2
paddle/gserver/layers/MkldnnLayer.cpp
paddle/gserver/layers/MkldnnLayer.cpp
+88
-0
paddle/gserver/layers/MkldnnLayer.h
paddle/gserver/layers/MkldnnLayer.h
+30
-1
未找到文件。
paddle/gserver/layers/MkldnnFcLayer.cpp
浏览文件 @
1203ebc4
...
...
@@ -77,7 +77,6 @@ void MkldnnFcLayer::reshape() {
void
MkldnnFcLayer
::
forward
(
PassType
passType
)
{
Layer
::
forward
(
passType
);
reshape
();
{
...
...
@@ -97,6 +96,40 @@ void MkldnnFcLayer::forward(PassType passType) {
}
void
MkldnnFcLayer
::
backward
(
const
UpdateCallback
&
callback
)
{
;
// bool hasBias = biases_ && biases_->getWGrad();
/* Do derivation */
{
REGISTER_TIMER_INFO
(
"BpActTimer"
,
getName
().
c_str
());
backwardActivation
();
}
bool
hasBias
=
biases_
&&
biases_
->
getWGrad
();
{
REGISTER_TIMER_INFO
(
"mkldnn_bwdTimer"
,
getName
().
c_str
());
real
*
inVal
=
getInputValue
(
0
)
->
getData
();
real
*
inGrad
=
getInputGrad
(
0
)
!=
nullptr
?
getInputGrad
(
0
)
->
getData
()
:
NULL
;
real
*
outGrad
=
getOutputGrad
()
->
getData
();
real
*
wgtGrad
=
weight_
->
getWGrad
()
->
getData
();
real
*
wgtVal
=
weight_
->
getW
()
->
getData
();
real
*
biasGrad
=
hasBias
?
biases_
->
getWGrad
()
->
getData
()
:
NULL
;
mkldnnBackwardFC
(
bs_
,
ic_
,
ih_
,
iw_
,
inGrad
,
inVal
,
oc_
,
outGrad
,
wgtGrad
,
wgtVal
,
biasGrad
);
}
{
REGISTER_TIMER_INFO
(
"WeightUpdate"
,
getName
().
c_str
());
weight_
->
getParameterPtr
()
->
incUpdate
(
callback
);
if
(
hasBias
)
{
biases_
->
getParameterPtr
()
->
incUpdate
(
callback
);
}
}
}
}
// namespace paddle
paddle/gserver/layers/MkldnnLayer.cpp
浏览文件 @
1203ebc4
...
...
@@ -88,6 +88,94 @@ void MkldnnLayer::mkldnnForwardFC(int bs,
stream_
->
submit
(
pipelineFwd_
);
}
void
MkldnnLayer
::
resetBackwardFC
(
int
bs
,
int
ic
,
int
ih
,
int
iw
,
real
*
botDiff
,
real
*
botData
,
int
oc
,
real
*
topDiff
,
real
*
wgtDiff
,
real
*
wgtData
,
real
*
biasDiff
)
{
bool
hasSpatial
=
ih
==
1
&&
iw
==
1
?
false
:
true
;
engine_
=
CpuEngine
::
Instance
().
getEngine
();
// backward weight
mem
::
desc
botMD
=
hasSpatial
?
createMD
({
bs
,
ic
,
ih
,
iw
},
format
::
nchw
)
:
createMD
({
bs
,
ic
},
format
::
nc
);
mem
::
desc
wgtMD
=
hasSpatial
?
createMD
({
oc
,
ic
,
ih
,
iw
},
format
::
oihw
)
:
createMD
({
oc
,
ic
},
format
::
oi
);
mem
::
desc
topMD
=
createMD
({
bs
,
oc
},
format
::
nc
);
mem
::
desc
biasMD
=
biasDiff
!=
NULL
?
createMD
({
oc
},
format
::
x
)
:
createMD
({},
format
::
format_undef
);
fc_fwd
::
desc
fwdDesc
=
fc_fwd
::
desc
(
mkldnn
::
prop_kind
::
forward
,
botMD
,
wgtMD
,
topMD
);
fc_fwd
::
primitive_desc
fwdPD
=
fc_fwd
::
primitive_desc
(
fwdDesc
,
engine_
);
fc_bwdWgt
::
desc
bwdWgtDesc
=
biasDiff
!=
NULL
?
fc_bwdWgt
::
desc
(
botMD
,
wgtMD
,
biasMD
,
topMD
)
:
fc_bwdWgt
::
desc
(
botMD
,
wgtMD
,
topMD
);
fc_bwdWgt
::
primitive_desc
bwdWgtPD
=
fc_bwdWgt
::
primitive_desc
(
bwdWgtDesc
,
engine_
,
fwdPD
);
mem
botVal
=
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botData
);
mem
wgtGrad
=
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtDiff
);
mem
topGrad
=
mem
(
mem
::
primitive_desc
(
topMD
,
engine_
),
topDiff
);
if
(
biasDiff
!=
NULL
)
{
mem
biasGrad
=
mem
(
mem
::
primitive_desc
(
biasMD
,
engine_
),
biasDiff
);
bwdWgt_
.
reset
(
new
fc_bwdWgt
(
bwdWgtPD
,
botVal
,
topGrad
,
wgtGrad
,
biasGrad
));
}
else
{
bwdWgt_
.
reset
(
new
fc_bwdWgt
(
bwdWgtPD
,
botVal
,
topGrad
,
wgtGrad
));
}
pipelineBwd_
.
clear
();
pipelineBwd_
.
push_back
(
*
bwdWgt_
);
// backward data
if
(
botDiff
==
NULL
)
{
return
;
}
fc_bwdData
::
desc
bwdDataDesc
=
fc_bwdData
::
desc
(
botMD
,
wgtMD
,
topMD
);
fc_bwdData
::
primitive_desc
bwdDataPD
=
fc_bwdData
::
primitive_desc
(
bwdDataDesc
,
engine_
,
fwdPD
);
mem
botGrad
=
mem
(
mem
::
primitive_desc
(
botMD
,
engine_
),
botDiff
);
mem
wgtVal
=
mem
(
mem
::
primitive_desc
(
wgtMD
,
engine_
),
wgtData
);
bwdData_
.
reset
(
new
fc_bwdData
(
bwdDataPD
,
topGrad
,
wgtVal
,
botGrad
));
pipelineBwd_
.
push_back
(
*
bwdData_
);
}
void
MkldnnLayer
::
mkldnnBackwardFC
(
int
bs
,
int
ic
,
int
ih
,
int
iw
,
real
*
botDiff
,
real
*
botData
,
int
oc
,
real
*
topDiff
,
real
*
wgtDiff
,
real
*
wgtData
,
real
*
biasDiff
)
{
// if input size changed, reset it
resetBackwardFC
(
bs
,
ic
,
ih
,
iw
,
botDiff
,
botData
,
oc
,
topDiff
,
wgtDiff
,
wgtData
,
biasDiff
);
// just forward
// update botdata
stream_
->
submit
(
pipelineBwd_
);
}
mem
::
desc
MkldnnLayer
::
createMD
(
mem
::
dims
dims
,
mem
::
format
fmt
,
mem
::
data_type
type
)
{
...
...
paddle/gserver/layers/MkldnnLayer.h
浏览文件 @
1203ebc4
...
...
@@ -42,6 +42,8 @@ protected:
std
::
shared_ptr
<
MkldnnStream
>
stream_
;
std
::
shared_ptr
<
mkldnn
::
primitive
>
fwd_
;
std
::
shared_ptr
<
mkldnn
::
primitive
>
bwdWgt_
;
std
::
shared_ptr
<
mkldnn
::
primitive
>
bwdData_
;
std
::
vector
<
mkldnn
::
primitive
>
pipelineFwd_
;
std
::
vector
<
mkldnn
::
primitive
>
pipelineBwd_
;
...
...
@@ -56,7 +58,10 @@ public:
oh_
(
0
),
ow_
(
0
),
engine_
(
mkldnn
::
engine
::
cpu
,
0
),
stream_
(
nullptr
)
{}
stream_
(
nullptr
),
fwd_
(
nullptr
),
bwdWgt_
(
nullptr
),
bwdData_
(
nullptr
)
{}
~
MkldnnLayer
()
{}
...
...
@@ -82,6 +87,30 @@ public:
real
*
wgtData
,
real
*
biasData
);
void
resetBackwardFC
(
int
bs
,
int
ic
,
int
ih
,
int
iw
,
real
*
botDiff
,
real
*
botData
,
int
oc
,
real
*
topDiff
,
real
*
wgtDiff
,
real
*
wgtData
,
real
*
biasDiff
);
void
mkldnnBackwardFC
(
int
bs
,
int
ic
,
int
ih
,
int
iw
,
real
*
botDiff
,
real
*
botData
,
int
oc
,
real
*
topDiff
,
real
*
wgtDiff
,
real
*
wgtData
,
real
*
biasDiff
);
// TODO(TJ): move to MkldnnMatrix
// create memory desc
inline
mkldnn
::
memory
::
desc
createMD
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录