Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
溜达小灰鼠
Paddle
提交
fbfa8295
P
Paddle
项目概览
溜达小灰鼠
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fbfa8295
编写于
10月 27, 2017
作者:
X
xzl
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of
https://github.com/PaddlePaddle/Paddle
into add_merge_model_scripts
上级
ebf606a2
6ef9da8e
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
154 addition
and
98 deletion
+154
-98
go/master/c/client.go
go/master/c/client.go
+2
-1
go/master/client.go
go/master/client.go
+14
-5
go/master/client_test.go
go/master/client_test.go
+1
-0
paddle/gserver/layers/MKLDNNBatchNormLayer.cpp
paddle/gserver/layers/MKLDNNBatchNormLayer.cpp
+8
-17
paddle/gserver/layers/MKLDNNConvLayer.cpp
paddle/gserver/layers/MKLDNNConvLayer.cpp
+26
-16
paddle/gserver/layers/MKLDNNLayer.cpp
paddle/gserver/layers/MKLDNNLayer.cpp
+3
-6
paddle/math/MKLDNNMatrix.h
paddle/math/MKLDNNMatrix.h
+6
-0
paddle/operators/auc_op.cc
paddle/operators/auc_op.cc
+13
-13
paddle/operators/sequence_pool_op.cc
paddle/operators/sequence_pool_op.cc
+9
-0
paddle/operators/sequence_pool_op.h
paddle/operators/sequence_pool_op.h
+20
-1
python/paddle/v2/framework/tests/test_auc_op.py
python/paddle/v2/framework/tests/test_auc_op.py
+3
-2
python/paddle/v2/framework/tests/test_huber_loss_op.py
python/paddle/v2/framework/tests/test_huber_loss_op.py
+3
-2
python/paddle/v2/framework/tests/test_seq_pool.py
python/paddle/v2/framework/tests/test_seq_pool.py
+38
-32
python/paddle/v2/reader/creator.py
python/paddle/v2/reader/creator.py
+8
-3
未找到文件。
go/master/c/client.go
浏览文件 @
fbfa8295
...
@@ -123,7 +123,8 @@ func paddle_set_dataset(client C.paddle_master_client, path **C.char, size C.int
...
@@ -123,7 +123,8 @@ func paddle_set_dataset(client C.paddle_master_client, path **C.char, size C.int
}
}
err
:=
c
.
SetDataset
(
paths
)
err
:=
c
.
SetDataset
(
paths
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"error set dataset"
,
log
.
Ctx
{
"error"
:
err
})
log
.
Error
(
"error set dataset"
,
log
.
Ctx
{
"error"
:
err
,
"paths"
:
paths
})
return
C
.
PADDLE_MASTER_ERROR
return
C
.
PADDLE_MASTER_ERROR
}
}
...
...
go/master/client.go
浏览文件 @
fbfa8295
...
@@ -121,6 +121,7 @@ func (c *Client) StartGetRecords(passID int) {
...
@@ -121,6 +121,7 @@ func (c *Client) StartGetRecords(passID int) {
}
}
func
(
c
*
Client
)
getRecords
(
passID
int
)
{
func
(
c
*
Client
)
getRecords
(
passID
int
)
{
i
:=
0
for
{
for
{
t
,
err
:=
c
.
getTask
(
passID
)
t
,
err
:=
c
.
getTask
(
passID
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -130,12 +131,20 @@ func (c *Client) getRecords(passID int) {
...
@@ -130,12 +131,20 @@ func (c *Client) getRecords(passID int) {
c
.
ch
<-
record
{
nil
,
err
}
c
.
ch
<-
record
{
nil
,
err
}
break
break
}
}
if
err
.
Error
()
==
ErrPassAfter
.
Error
()
{
// wait util last pass finishes
if
i
%
60
==
0
{
time
.
Sleep
(
time
.
Second
*
3
)
log
.
Debug
(
"getTask of passID error."
,
continue
log
.
Ctx
{
"error"
:
err
,
"passID"
:
passID
})
i
=
0
}
}
log
.
Error
(
"getTask error."
,
log
.
Ctx
{
"error"
:
err
})
// if err.Error() == ErrPassAfter.Error()
// wait util last pass finishes
// if other error such as network error
// wait to reconnect or task time out
time
.
Sleep
(
time
.
Second
*
3
)
i
+=
3
continue
}
}
for
_
,
chunk
:=
range
t
.
Chunks
{
for
_
,
chunk
:=
range
t
.
Chunks
{
...
...
go/master/client_test.go
浏览文件 @
fbfa8295
...
@@ -117,6 +117,7 @@ func TestNextRecord(t *testing.T) {
...
@@ -117,6 +117,7 @@ func TestNextRecord(t *testing.T) {
if
e
!=
nil
{
if
e
!=
nil
{
panic
(
e
)
panic
(
e
)
}
}
// test for n passes
// test for n passes
for
pass
:=
0
;
pass
<
10
;
pass
++
{
for
pass
:=
0
;
pass
<
10
;
pass
++
{
c
.
StartGetRecords
(
pass
)
c
.
StartGetRecords
(
pass
)
...
...
paddle/gserver/layers/MKLDNNBatchNormLayer.cpp
浏览文件 @
fbfa8295
...
@@ -216,17 +216,13 @@ void MKLDNNBatchNormLayer::resetFwdPD(
...
@@ -216,17 +216,13 @@ void MKLDNNBatchNormLayer::resetFwdPD(
}
}
auto
fwdDesc
=
bn_fwd
::
desc
(
pk
,
in
->
getMemoryDesc
(),
EPS
,
flags_
);
auto
fwdDesc
=
bn_fwd
::
desc
(
pk
,
in
->
getMemoryDesc
(),
EPS
,
flags_
);
pd
.
reset
(
new
bn_fwd
::
primitive_desc
(
fwdDesc
,
engine_
));
pd
.
reset
(
new
bn_fwd
::
primitive_desc
(
fwdDesc
,
engine_
));
// TODO(TJ): use check macro
CHECK_PRIMITIVE_DESC_EQ
(
out
,
pd
->
dst_primitive_desc
());
CHECK
(
out
);
CHECK
(
out
->
getPrimitiveDesc
()
==
pd
->
dst_primitive_desc
());
if
(
wgt
)
{
if
(
wgt
)
{
CHECK
(
wgt
->
getPrimitiveDesc
()
==
pd
->
weights_primitive_desc
());
CHECK
_PRIMITIVE_DESC_EQ
(
wgt
,
pd
->
weights_primitive_desc
());
}
}
if
(
passType_
!=
PASS_TEST
||
useGlobalStats_
)
{
if
(
passType_
!=
PASS_TEST
||
useGlobalStats_
)
{
CHECK
(
mean_
);
CHECK_PRIMITIVE_DESC_EQ
(
mean_
,
pd
->
mean_primitive_desc
());
CHECK
(
mean_
->
getPrimitiveDesc
()
==
pd
->
mean_primitive_desc
());
CHECK_PRIMITIVE_DESC_EQ
(
var_
,
pd
->
variance_primitive_desc
());
CHECK
(
var_
);
CHECK
(
var_
->
getPrimitiveDesc
()
==
pd
->
variance_primitive_desc
());
}
}
}
}
...
@@ -283,19 +279,14 @@ void MKLDNNBatchNormLayer::resetBwdPD(
...
@@ -283,19 +279,14 @@ void MKLDNNBatchNormLayer::resetBwdPD(
if
(
in
==
nullptr
)
{
if
(
in
==
nullptr
)
{
return
;
return
;
}
}
CHECK
(
out
);
CHECK_PRIMITIVE_DESC_EQ
(
out
,
in
->
getPrimitiveDesc
());
CHECK
(
out
->
getPrimitiveDesc
()
==
in
->
getPrimitiveDesc
());
auto
md
=
in
->
getMemoryDesc
();
auto
md
=
in
->
getMemoryDesc
();
auto
bwdDesc
=
bn_bwd
::
desc
(
prop_kind
::
backward
,
md
,
md
,
EPS
,
flags_
);
auto
bwdDesc
=
bn_bwd
::
desc
(
prop_kind
::
backward
,
md
,
md
,
EPS
,
flags_
);
pd
.
reset
(
new
bn_bwd
::
primitive_desc
(
bwdDesc
,
engine_
,
*
fwdPD_
));
pd
.
reset
(
new
bn_bwd
::
primitive_desc
(
bwdDesc
,
engine_
,
*
fwdPD_
));
// TODO(TJ): use check macro
CHECK
(
wgt
);
CHECK
(
wgt
->
getPrimitiveDesc
()
==
pd
->
diff_weights_primitive_desc
());
CHECK
(
pd
->
weights_primitive_desc
()
==
fwdPD_
->
weights_primitive_desc
());
CHECK
(
pd
->
weights_primitive_desc
()
==
fwdPD_
->
weights_primitive_desc
());
CHECK
(
mean_
);
CHECK_PRIMITIVE_DESC_EQ
(
wgt
,
pd
->
diff_weights_primitive_desc
());
CHECK
(
mean_
->
getPrimitiveDesc
()
==
pd
->
mean_primitive_desc
());
CHECK_PRIMITIVE_DESC_EQ
(
mean_
,
pd
->
mean_primitive_desc
());
CHECK
(
var_
);
CHECK_PRIMITIVE_DESC_EQ
(
var_
,
pd
->
variance_primitive_desc
());
CHECK
(
var_
->
getPrimitiveDesc
()
==
pd
->
variance_primitive_desc
());
}
}
void
MKLDNNBatchNormLayer
::
resetBwdPipeline
(
void
MKLDNNBatchNormLayer
::
resetBwdPipeline
(
...
...
paddle/gserver/layers/MKLDNNConvLayer.cpp
浏览文件 @
fbfa8295
...
@@ -262,12 +262,15 @@ void MKLDNNConvLayer::resetBwdWgtPD(
...
@@ -262,12 +262,15 @@ void MKLDNNConvLayer::resetBwdWgtPD(
padR
,
padR
,
padKind
);
padKind
);
pd
.
reset
(
new
conv_bwdWgt
::
primitive_desc
(
bwdWgtDesc
,
engine_
,
*
fwdPD_
));
pd
.
reset
(
new
conv_bwdWgt
::
primitive_desc
(
bwdWgtDesc
,
engine_
,
*
fwdPD_
));
CHECK
(
pd
->
src_primitive_desc
()
==
inVal_
->
getPrimitiveDesc
())
CHECK_PRIMITIVE_DESC_EQ
(
inVal_
,
pd
->
src_primitive_desc
());
<<
"primitive desc of in value should equal"
;
CHECK_PRIMITIVE_DESC_EQ
(
CHECK
(
pd
->
diff_dst_primitive_desc
()
==
outVal_
->
getPrimitiveDesc
())
outVal_
,
<<
"primitive desc of out grad should equal the out value"
;
pd
->
diff_dst_primitive_desc
(),
CHECK
(
pd
->
diff_weights_primitive_desc
()
==
wgtVal_
->
getPrimitiveDesc
())
"primitive desc of out value and grad should be equal"
);
<<
"primitive desc of weight grad should equal the weight value"
;
CHECK_PRIMITIVE_DESC_EQ
(
wgtVal_
,
pd
->
diff_weights_primitive_desc
(),
"primitive desc of weight value and grad should be equal"
);
}
}
void
MKLDNNConvLayer
::
resetBwdDataPD
(
void
MKLDNNConvLayer
::
resetBwdDataPD
(
...
@@ -292,10 +295,14 @@ void MKLDNNConvLayer::resetBwdDataPD(
...
@@ -292,10 +295,14 @@ void MKLDNNConvLayer::resetBwdDataPD(
padR
,
padR
,
padding_kind
::
zero
);
padding_kind
::
zero
);
pd
.
reset
(
new
conv_bwdData
::
primitive_desc
(
bwdDataDesc
,
engine_
,
*
fwdPD_
));
pd
.
reset
(
new
conv_bwdData
::
primitive_desc
(
bwdDataDesc
,
engine_
,
*
fwdPD_
));
CHECK
(
pd
->
diff_src_primitive_desc
()
==
inVal_
->
getPrimitiveDesc
())
CHECK_PRIMITIVE_DESC_EQ
(
<<
"primitive desc of in grad should equal the in value"
;
inVal_
,
CHECK
(
pd
->
diff_dst_primitive_desc
()
==
outVal_
->
getPrimitiveDesc
())
pd
->
diff_src_primitive_desc
(),
<<
"primitive desc of out grad should equal"
;
"primitive desc of in value and grad should be equal"
);
CHECK_PRIMITIVE_DESC_EQ
(
outVal_
,
pd
->
diff_dst_primitive_desc
(),
"primitive desc of out value and grad should be equal"
);
}
}
void
MKLDNNConvLayer
::
resetBwdBuffers
(
void
MKLDNNConvLayer
::
resetBwdBuffers
(
...
@@ -310,17 +317,20 @@ void MKLDNNConvLayer::resetBwdBuffers(
...
@@ -310,17 +317,20 @@ void MKLDNNConvLayer::resetBwdBuffers(
resetWithMatrix
(
resetWithMatrix
(
wgt
,
weight_
->
getWGrad
(),
wgtPD
->
diff_weights_primitive_desc
());
wgt
,
weight_
->
getWGrad
(),
wgtPD
->
diff_weights_primitive_desc
());
CHECK
(
wgtVal_
!=
nullptr
&&
CHECK_PRIMITIVE_DESC_EQ
(
wgt
->
getPrimitiveDesc
()
==
wgtVal_
->
getPrimitiveDesc
())
wgtVal_
,
<<
"primitive desc of weight grad and value should be equal"
;
wgt
->
getPrimitiveDesc
(),
"primitive desc of weight grad and value should be equal"
);
bias
=
nullptr
;
bias
=
nullptr
;
if
(
biases_
&&
biases_
->
getWGrad
())
{
if
(
biases_
&&
biases_
->
getWGrad
())
{
resetWithMatrix
(
resetWithMatrix
(
bias
,
biases_
->
getWGrad
(),
wgtPD
->
diff_bias_primitive_desc
());
bias
,
biases_
->
getWGrad
(),
wgtPD
->
diff_bias_primitive_desc
());
CHECK
(
bias
&&
biasVal_
&&
CHECK
(
bias
);
bias
->
getPrimitiveDesc
()
==
biasVal_
->
getPrimitiveDesc
())
CHECK_PRIMITIVE_DESC_EQ
(
<<
"primitive desc of bias grad should equal the bias value"
;
biasVal_
,
bias
->
getPrimitiveDesc
(),
"primitive desc of bias grad and value should be equal"
);
}
}
if
(
dataPD
==
nullptr
)
{
if
(
dataPD
==
nullptr
)
{
...
...
paddle/gserver/layers/MKLDNNLayer.cpp
浏览文件 @
fbfa8295
...
@@ -235,8 +235,7 @@ void MKLDNNLayer::resetInGrad(MKLDNNMatrixPtr& in,
...
@@ -235,8 +235,7 @@ void MKLDNNLayer::resetInGrad(MKLDNNMatrixPtr& in,
in
=
MKLDNNMatrix
::
create
(
intPD
,
inMat
);
in
=
MKLDNNMatrix
::
create
(
intPD
,
inMat
);
Argument
&
arg
=
input
->
getOutput
(
this
->
getName
());
Argument
&
arg
=
input
->
getOutput
(
this
->
getName
());
arg
.
grad
=
std
::
dynamic_pointer_cast
<
Matrix
>
(
in
);
arg
.
grad
=
std
::
dynamic_pointer_cast
<
Matrix
>
(
in
);
CHECK
(
inVal_
);
CHECK_PRIMITIVE_DESC_EQ
(
inVal_
,
intPD
);
CHECK
(
inVal_
->
getPrimitiveDesc
()
==
intPD
)
<<
"the primitive desc must equal"
;
if
(
inputIsOnlyMKLDNN
())
{
if
(
inputIsOnlyMKLDNN
())
{
return
;
return
;
}
}
...
@@ -250,8 +249,7 @@ void MKLDNNLayer::resetInGrad(MKLDNNMatrixPtr& in,
...
@@ -250,8 +249,7 @@ void MKLDNNLayer::resetInGrad(MKLDNNMatrixPtr& in,
CHECK
(
extInVal_
!=
nullptr
&&
isPaddleFormat
(
extInVal_
->
getFormat
()))
CHECK
(
extInVal_
!=
nullptr
&&
isPaddleFormat
(
extInVal_
->
getFormat
()))
<<
"should have external input value and the format must be nchw(nc)"
;
<<
"should have external input value and the format must be nchw(nc)"
;
extInGrad_
=
MKLDNNMatrix
::
create
(
extInVal_
->
getPrimitiveDesc
(),
inMat
);
extInGrad_
=
MKLDNNMatrix
::
create
(
extInVal_
->
getPrimitiveDesc
(),
inMat
);
CHECK
(
inVal_
!=
nullptr
&&
inVal_
->
getPrimitiveDesc
()
==
intPD
)
CHECK_PRIMITIVE_DESC_EQ
(
inVal_
,
intPD
);
<<
"should have internal input value and primitive desc must equal"
;
in
=
MKLDNNMatrix
::
create
(
intPD
);
in
=
MKLDNNMatrix
::
create
(
intPD
);
cvtInGrad_
=
MKLDNNMatrix
::
createReorder
(
in
,
extInGrad_
);
cvtInGrad_
=
MKLDNNMatrix
::
createReorder
(
in
,
extInGrad_
);
CHECK
(
cvtInGrad_
);
CHECK
(
cvtInGrad_
);
...
@@ -277,8 +275,7 @@ void MKLDNNLayer::resetOutGrad(MKLDNNMatrixPtr& out,
...
@@ -277,8 +275,7 @@ void MKLDNNLayer::resetOutGrad(MKLDNNMatrixPtr& out,
CHECK
(
extOutVal_
!=
nullptr
&&
isPaddleFormat
(
extOutVal_
->
getFormat
()))
CHECK
(
extOutVal_
!=
nullptr
&&
isPaddleFormat
(
extOutVal_
->
getFormat
()))
<<
"should have external output value and the format must be nchw(nc)"
;
<<
"should have external output value and the format must be nchw(nc)"
;
extOutGrad_
=
MKLDNNMatrix
::
create
(
extOutVal_
->
getPrimitiveDesc
(),
outMat
);
extOutGrad_
=
MKLDNNMatrix
::
create
(
extOutVal_
->
getPrimitiveDesc
(),
outMat
);
CHECK
(
outVal_
!=
nullptr
&&
outVal_
->
getPrimitiveDesc
()
==
intPD
)
CHECK_PRIMITIVE_DESC_EQ
(
outVal_
,
intPD
);
<<
"should have internal output value and primitive desc must equal"
;
out
=
MKLDNNMatrix
::
create
(
intPD
);
out
=
MKLDNNMatrix
::
create
(
intPD
);
cvtOutGrad_
=
MKLDNNMatrix
::
createReorder
(
extOutGrad_
,
out
);
cvtOutGrad_
=
MKLDNNMatrix
::
createReorder
(
extOutGrad_
,
out
);
CHECK
(
cvtOutGrad_
);
CHECK
(
cvtOutGrad_
);
...
...
paddle/math/MKLDNNMatrix.h
浏览文件 @
fbfa8295
...
@@ -24,6 +24,12 @@ namespace paddle {
...
@@ -24,6 +24,12 @@ namespace paddle {
class
MKLDNNMatrix
;
class
MKLDNNMatrix
;
typedef
std
::
shared_ptr
<
MKLDNNMatrix
>
MKLDNNMatrixPtr
;
typedef
std
::
shared_ptr
<
MKLDNNMatrix
>
MKLDNNMatrixPtr
;
#define CHECK_PRIMITIVE_DESC_EQ(MAT, PD, ...) \
CHECK(MAT) << " can not be empty."; \
CHECK(MAT->getPrimitiveDesc() == PD) \
<< #MAT "->getPrimitiveDesc() and " #PD " should be equal.\n " \
<< "" __VA_ARGS__;
/**
/**
* @brief MKLDNN Matrix.
* @brief MKLDNN Matrix.
*
*
...
...
paddle/operators/auc_op.cc
浏览文件 @
fbfa8295
...
@@ -22,7 +22,7 @@ class AucOp : public framework::OperatorWithKernel {
...
@@ -22,7 +22,7 @@ class AucOp : public framework::OperatorWithKernel {
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
protected:
protected:
void
InferShape
(
framework
::
InferShapeContext
Base
*
ctx
)
const
override
{
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Inference"
),
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Inference"
),
"Input of Inference must be initialized."
);
"Input of Inference must be initialized."
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Label"
),
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Label"
),
...
@@ -62,18 +62,18 @@ class AucOpMaker : public framework::OpProtoAndCheckerMaker {
...
@@ -62,18 +62,18 @@ class AucOpMaker : public framework::OpProtoAndCheckerMaker {
AddComment
(
AddComment
(
R"DOC(Computes the AUC according forward output and label.
R"DOC(Computes the AUC according forward output and label.
Best to use for binary classification evaluations.
Best to use for binary classification evaluations.
If input label contains values other than 0 and 1, it will be cast
If input label contains values other than 0 and 1, it will be cast
to bool.
to bool.
You can find the definations here:
You can find the definations here:
https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve
https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve
Possible curves are:
Possible curves are:
- ROC: Receiver operating characteristic
- ROC: Receiver operating characteristic
- PR: Precision Recall
- PR: Precision Recall
)DOC"
);
)DOC"
);
}
}
};
};
...
...
paddle/operators/sequence_pool_op.cc
浏览文件 @
fbfa8295
...
@@ -47,6 +47,15 @@ class SequencePoolOpMaker : public framework::OpProtoAndCheckerMaker {
...
@@ -47,6 +47,15 @@ class SequencePoolOpMaker : public framework::OpProtoAndCheckerMaker {
AddComment
(
R"DOC(
AddComment
(
R"DOC(
SequencePoolOp pools features of all time-steps of each instance.
SequencePoolOp pools features of all time-steps of each instance.
It supports six pooling strategy:
- AVERAGE: Out[i] = average_{for each instance in i-th sequence}{X[i]}
- SUM: Out[i] = sum_{for each instance in i-th sequence}{X[i]}
- SQRT: Out[i] = sum_{for each instance in i-th sequence}{X[i]}
/ sqrt(i-th sequence length)
- LAST: Out[i] = last instance in i-th sequence X[i]
- FIRST: Out[i] = first instance in i-th sequence X[i]
- MAX: Out[i] = max_{for each instance in i-th sequence}{X[i]}
For a mini-batch of 3 variable-length sentences, containing 2, 3, and 2 time-steps:
For a mini-batch of 3 variable-length sentences, containing 2, 3, and 2 time-steps:
Assume X is a [7,M,N] LoDTensor, and X->lod()[0] = [0, 2, 5, 7], 7=2+3+2.
Assume X is a [7,M,N] LoDTensor, and X->lod()[0] = [0, 2, 5, 7], 7=2+3+2.
...
...
paddle/operators/sequence_pool_op.h
浏览文件 @
fbfa8295
...
@@ -82,6 +82,9 @@ class SequencePoolKernel : public framework::OpKernel<T> {
...
@@ -82,6 +82,9 @@ class SequencePoolKernel : public framework::OpKernel<T> {
out_e
.
device
(
place
)
=
in_e
.
sum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}))
/
out_e
.
device
(
place
)
=
in_e
.
sum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}))
/
std
::
sqrt
(
static_cast
<
T
>
(
h
));
std
::
sqrt
(
static_cast
<
T
>
(
h
));
break
;
break
;
case
MAX
:
out_e
.
device
(
place
)
=
in_e
.
maximum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}));
break
;
case
LAST
:
case
LAST
:
out_e
.
device
(
place
)
=
in_e
.
chip
(
h
-
1
,
0
);
out_e
.
device
(
place
)
=
in_e
.
chip
(
h
-
1
,
0
);
break
;
break
;
...
@@ -100,8 +103,8 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
...
@@ -100,8 +103,8 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
public:
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
in
=
context
.
Input
<
LoDTensor
>
(
"X"
);
auto
*
in
=
context
.
Input
<
LoDTensor
>
(
"X"
);
auto
*
out_g
=
context
.
Input
<
LoDTensor
>
(
framework
::
GradVarName
(
"Out"
));
auto
*
in_g
=
context
.
Output
<
LoDTensor
>
(
framework
::
GradVarName
(
"X"
));
auto
*
in_g
=
context
.
Output
<
LoDTensor
>
(
framework
::
GradVarName
(
"X"
));
auto
*
out_g
=
context
.
Input
<
LoDTensor
>
(
framework
::
GradVarName
(
"Out"
));
int
strategy
=
context
.
Attr
<
int
>
(
"strategy"
);
int
strategy
=
context
.
Attr
<
int
>
(
"strategy"
);
auto
dims
=
in
->
dims
();
auto
dims
=
in
->
dims
();
...
@@ -135,6 +138,22 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
...
@@ -135,6 +138,22 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
in_g_e
.
device
(
place
)
=
in_g_e
.
device
(
place
)
=
(
out_g_e
/
std
::
sqrt
(
static_cast
<
T
>
(
h
))).
broadcast
(
bcast
);
(
out_g_e
/
std
::
sqrt
(
static_cast
<
T
>
(
h
))).
broadcast
(
bcast
);
break
;
break
;
case
MAX
:
{
auto
in_t
=
in
->
Slice
(
static_cast
<
int
>
(
lod
[
i
]),
static_cast
<
int
>
(
lod
[
i
+
1
]));
Eigen
::
Map
<
const
Eigen
::
Matrix
<
T
,
Eigen
::
Dynamic
,
Eigen
::
Dynamic
>>
in_t_map
(
in_t
.
data
<
T
>
(),
h
,
w
);
int
row_id
;
Eigen
::
array
<
int
,
2
>
extents
=
{
1
,
1
};
for
(
int
col_id
=
0
;
col_id
<
w
;
col_id
++
)
{
in_t_map
.
col
(
col_id
).
maxCoeff
(
&
row_id
);
Eigen
::
array
<
int
,
2
>
in_offsets
=
{
row_id
,
col_id
};
Eigen
::
array
<
int
,
2
>
out_offsets
=
{
0
,
col_id
};
in_g_e
.
slice
(
in_offsets
,
extents
).
device
(
place
)
=
out_g_e
.
slice
(
out_offsets
,
extents
);
}
break
;
}
case
LAST
:
case
LAST
:
in_g_e
.
chip
(
h
-
1
,
0
).
device
(
place
)
=
out_g_e
;
in_g_e
.
chip
(
h
-
1
,
0
).
device
(
place
)
=
out_g_e
;
break
;
break
;
...
...
python/paddle/v2/framework/tests/test_auc_op.py
浏览文件 @
fbfa8295
...
@@ -62,5 +62,6 @@ class TestAucOp(OpTest):
...
@@ -62,5 +62,6 @@ class TestAucOp(OpTest):
self
.
check_output
()
self
.
check_output
()
if
__name__
==
"__main__"
:
# TODO(typhoonzero): add this back till we fix it
unittest
.
main
()
#if __name__ == "__main__":
# unittest.main()
python/paddle/v2/framework/tests/test_huber_loss_op.py
浏览文件 @
fbfa8295
...
@@ -43,5 +43,6 @@ class TestHuberLossOp(OpTest):
...
@@ -43,5 +43,6 @@ class TestHuberLossOp(OpTest):
[
'X'
],
'Out'
,
max_relative_error
=
0.008
,
no_grad_set
=
set
(
'residual'
))
[
'X'
],
'Out'
,
max_relative_error
=
0.008
,
no_grad_set
=
set
(
'residual'
))
if
__name__
==
'__main__'
:
# TODO(typhoonzero): should add this back till we fix it
unittest
.
main
()
#if __name__ == '__main__':
# unittest.main()
python/paddle/v2/framework/tests/test_seq_pool.py
浏览文件 @
fbfa8295
...
@@ -22,18 +22,17 @@ class TestSeqAvgPool(OpTest):
...
@@ -22,18 +22,17 @@ class TestSeqAvgPool(OpTest):
out
=
np
.
zeros
((
4
,
23
)).
astype
(
'float32'
)
out
=
np
.
zeros
((
4
,
23
)).
astype
(
'float32'
)
self
.
outputs
=
{
'Out'
:
out
}
self
.
outputs
=
{
'Out'
:
out
}
return
x
,
lod
,
out
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
AVERAGE
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
AVERAGE
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
sub_x
.
mean
(
axis
=
0
)
out
[
i
]
=
sub_x
.
mean
(
axis
=
0
)
def
setUp
(
self
):
def
setUp
(
self
):
self
.
set_data
()
x
,
lod
,
out
=
self
.
set_data
()
self
.
compute
()
self
.
compute
(
x
,
lod
,
out
)
def
test_check_output
(
self
):
def
test_check_output
(
self
):
self
.
check_output
()
self
.
check_output
()
...
@@ -52,41 +51,34 @@ class TestSeqAvgPool2D(TestSeqAvgPool):
...
@@ -52,41 +51,34 @@ class TestSeqAvgPool2D(TestSeqAvgPool):
out
=
np
.
zeros
((
4
,
3
,
17
)).
astype
(
'float32'
)
out
=
np
.
zeros
((
4
,
3
,
17
)).
astype
(
'float32'
)
self
.
outputs
=
{
'Out'
:
out
}
self
.
outputs
=
{
'Out'
:
out
}
return
x
,
lod
,
out
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
AVERAGE
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
AVERAGE
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
.
mean
(
axis
=
0
),
(
3
,
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
.
mean
(
axis
=
0
),
(
3
,
17
))
class
TestSeqSumPool
(
TestSeqAvgPool
):
class
TestSeqSumPool
(
TestSeqAvgPool
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SUM
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SUM
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
sub_x
.
sum
(
axis
=
0
)
out
[
i
]
=
sub_x
.
sum
(
axis
=
0
)
class
TestSeqSumPool2D
(
TestSeqAvgPool2D
):
class
TestSeqSumPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SUM
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SUM
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
.
sum
(
axis
=
0
),
(
3
,
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
.
sum
(
axis
=
0
),
(
3
,
17
))
class
TestSeqSqrtPool
(
TestSeqAvgPool
):
class
TestSeqSqrtPool
(
TestSeqAvgPool
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SQRT
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SQRT
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
len
=
lod
[
0
][
i
+
1
]
-
lod
[
0
][
i
]
len
=
lod
[
0
][
i
+
1
]
-
lod
[
0
][
i
]
...
@@ -94,10 +86,8 @@ class TestSeqSqrtPool(TestSeqAvgPool):
...
@@ -94,10 +86,8 @@ class TestSeqSqrtPool(TestSeqAvgPool):
class
TestSeqSqrtPool2D
(
TestSeqAvgPool2D
):
class
TestSeqSqrtPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SQRT
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
SQRT
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
len
=
lod
[
0
][
i
+
1
]
-
lod
[
0
][
i
]
len
=
lod
[
0
][
i
+
1
]
-
lod
[
0
][
i
]
...
@@ -107,41 +97,57 @@ class TestSeqSqrtPool2D(TestSeqAvgPool2D):
...
@@ -107,41 +97,57 @@ class TestSeqSqrtPool2D(TestSeqAvgPool2D):
self
.
check_grad
([
"X"
],
"Out"
,
max_relative_error
=
0.06
)
self
.
check_grad
([
"X"
],
"Out"
,
max_relative_error
=
0.06
)
class
TestSeqMaxPool
(
TestSeqAvgPool
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
MAX
}
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
np
.
amax
(
sub_x
,
axis
=
0
)
def
test_check_grad
(
self
):
# Remove MaxPool2D from gradient check to confirm the success of CI.
return
class
TestSeqMaxPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
MAX
}
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
np
.
amax
(
sub_x
,
axis
=
0
),
(
3
,
17
))
def
test_check_grad
(
self
):
# Remove MaxPool2D from gradient check to confirm the success of CI.
return
class
TestSeqLastPool
(
TestSeqAvgPool
):
class
TestSeqLastPool
(
TestSeqAvgPool
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
sub_x
[
-
1
,
:]
out
[
i
]
=
sub_x
[
-
1
,
:]
class
TestSeqLastPool2D
(
TestSeqAvgPool2D
):
class
TestSeqLastPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
[
-
1
,
:],
(
3
,
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
[
-
1
,
:],
(
3
,
17
))
class
TestSeqFirstPool
(
TestSeqAvgPool
):
class
TestSeqFirstPool
(
TestSeqAvgPool
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
sub_x
[
0
,
:]
out
[
i
]
=
sub_x
[
0
,
:]
class
TestSeqFirstPool2D
(
TestSeqAvgPool2D
):
class
TestSeqFirstPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
def
compute
(
self
,
x
,
lod
,
out
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
[
0
,
:],
(
3
,
17
))
out
[
i
]
=
np
.
reshape
(
sub_x
[
0
,
:],
(
3
,
17
))
...
...
python/paddle/v2/reader/creator.py
浏览文件 @
fbfa8295
...
@@ -61,7 +61,7 @@ def recordio(paths, buf_size=100):
...
@@ -61,7 +61,7 @@ def recordio(paths, buf_size=100):
"""
"""
Creates a data reader from given RecordIO file paths separated by ",",
Creates a data reader from given RecordIO file paths separated by ",",
glob pattern is supported.
glob pattern is supported.
:path: path of recordio files.
:path: path of recordio files
, can be a string or a string list
.
:returns: data reader of recordio files.
:returns: data reader of recordio files.
"""
"""
...
@@ -92,7 +92,7 @@ def cloud_reader(paths, etcd_endpoints, timeout_sec=5, buf_size=64):
...
@@ -92,7 +92,7 @@ def cloud_reader(paths, etcd_endpoints, timeout_sec=5, buf_size=64):
"""
"""
Create a data reader that yield a record one by one from
Create a data reader that yield a record one by one from
the paths:
the paths:
:path
: path of recordio files
.
:path
s: path of recordio files, can be a string or a string list
.
:etcd_endpoints: the endpoints for etcd cluster
:etcd_endpoints: the endpoints for etcd cluster
:returns: data reader of recordio files.
:returns: data reader of recordio files.
...
@@ -107,7 +107,12 @@ def cloud_reader(paths, etcd_endpoints, timeout_sec=5, buf_size=64):
...
@@ -107,7 +107,12 @@ def cloud_reader(paths, etcd_endpoints, timeout_sec=5, buf_size=64):
import
cPickle
as
pickle
import
cPickle
as
pickle
import
paddle.v2.master
as
master
import
paddle.v2.master
as
master
c
=
master
.
client
(
etcd_endpoints
,
timeout_sec
,
buf_size
)
c
=
master
.
client
(
etcd_endpoints
,
timeout_sec
,
buf_size
)
c
.
set_dataset
(
paths
)
if
isinstance
(
paths
,
basestring
):
path
=
[
paths
]
else
:
path
=
paths
c
.
set_dataset
(
path
)
def
reader
():
def
reader
():
global
pass_num
global
pass_num
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录