Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
迷途归一
Paddle
提交
01425309
P
Paddle
项目概览
迷途归一
/
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,发现更多精彩内容 >>
未验证
提交
01425309
编写于
11月 07, 2017
作者:
Y
Yang Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename shrink_state -> shrink_rnn_memory
Follow comments
上级
b4dddb29
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
41 deletion
+33
-41
paddle/operators/shrink_rnn_memory_op.cc
paddle/operators/shrink_rnn_memory_op.cc
+30
-37
paddle/operators/tensor_array_read_write_op.cc
paddle/operators/tensor_array_read_write_op.cc
+0
-1
python/paddle/v2/framework/layers.py
python/paddle/v2/framework/layers.py
+1
-1
python/paddle/v2/framework/tests/test_shrink_rnn_memory.py
python/paddle/v2/framework/tests/test_shrink_rnn_memory.py
+2
-2
未找到文件。
paddle/operators/shrink_
state
_op.cc
→
paddle/operators/shrink_
rnn_memory
_op.cc
浏览文件 @
01425309
...
...
@@ -18,12 +18,12 @@
namespace
paddle
{
namespace
operators
{
class
Shrink
State
Op
:
public
ArrayOp
{
class
Shrink
RNNMemory
Op
:
public
ArrayOp
{
public:
Shrink
State
Op
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
const
framework
::
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
)
Shrink
RNNMemory
Op
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
const
framework
::
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
)
:
ArrayOp
(
type
,
inputs
,
outputs
,
attrs
)
{}
void
Run
(
const
framework
::
Scope
&
scope
,
...
...
@@ -36,18 +36,12 @@ class ShrinkStateOp : public ArrayOp {
PADDLE_ENFORCE
(
rank_table_var
!=
nullptr
,
"RankTable must be set"
);
auto
&
rank_table
=
rank_table_var
->
Get
<
framework
::
LoDRankTable
>
();
int
dst_num_rows
=
0
;
{
auto
&
rank_items
=
rank_table
.
items
();
for
(
auto
&
rank_item
:
rank_items
)
{
if
(
offset
<
rank_item
.
length
)
{
++
dst_num_rows
;
}
else
{
break
;
}
}
}
auto
&
rank_items
=
rank_table
.
items
();
int
dst_num_rows
=
std
::
lower_bound
(
rank_items
.
begin
(),
rank_items
.
end
(),
offset
,
[](
const
framework
::
LoDRankTable
::
TableItem
&
a
,
size_t
b
)
{
return
a
.
length
>
b
;
})
-
rank_items
.
begin
();
auto
*
out_var
=
scope
.
FindVar
(
Output
(
"Out"
));
PADDLE_ENFORCE
(
out_var
!=
nullptr
,
"Output Out must be set"
);
...
...
@@ -58,10 +52,10 @@ class ShrinkStateOp : public ArrayOp {
}
};
class
Shrink
State
OpProtoMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
class
Shrink
RNNMemory
OpProtoMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
Shrink
State
OpProtoMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
Shrink
RNNMemory
OpProtoMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
AddInput
(
"X"
,
""
);
AddInput
(
"RankTable"
,
""
);
...
...
@@ -71,7 +65,7 @@ class ShrinkStateOpProtoMaker : public framework::OpProtoAndCheckerMaker {
}
};
class
Shrink
StateOp
InferShape
:
public
framework
::
InferShapeBase
{
class
Shrink
RNNMemory
InferShape
:
public
framework
::
InferShapeBase
{
public:
void
operator
()(
framework
::
InferShapeContext
*
context
)
const
override
{
PADDLE_ENFORCE
(
context
->
HasInput
(
"X"
));
...
...
@@ -81,19 +75,18 @@ class ShrinkStateOpInferShape : public framework::InferShapeBase {
}
};
class
Shrink
State
GradOp
:
public
ArrayOp
{
class
Shrink
RNNMemory
GradOp
:
public
ArrayOp
{
public:
Shrink
State
GradOp
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
const
framework
::
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
)
Shrink
RNNMemory
GradOp
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
const
framework
::
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
)
:
ArrayOp
(
type
,
inputs
,
outputs
,
attrs
)
{}
void
Run
(
const
framework
::
Scope
&
scope
,
const
platform
::
DeviceContext
&
dev_ctx
)
const
override
{
auto
*
dout_var
=
scope
.
FindVar
(
Input
(
framework
::
GradVarName
(
"Out"
)));
auto
dx_name
=
Output
(
framework
::
GradVarName
(
"X"
));
auto
*
dx_var
=
scope
.
FindVar
(
dx_name
);
auto
*
dx_var
=
scope
.
FindVar
(
Output
(
framework
::
GradVarName
(
"X"
)));
PADDLE_ENFORCE
(
dx_var
!=
nullptr
,
"Input Gradient should not be nullptr"
);
auto
*
x_var
=
scope
.
FindVar
(
Input
(
"X"
));
PADDLE_ENFORCE
(
x_var
!=
nullptr
);
...
...
@@ -110,7 +103,7 @@ class ShrinkStateGradOp : public ArrayOp {
auto
height
=
dout_tensor
.
dims
()[
0
];
dx_tensor
.
Slice
(
0
,
static_cast
<
int
>
(
height
))
.
CopyFrom
(
dout_tensor
,
dout_tensor
.
place
(),
dev_ctx
);
if
(
height
<
dout_tensor
.
dims
()[
0
]
)
{
if
(
dx_tensor
.
dims
()[
0
]
<
height
)
{
auto
rest_tensor
=
dx_tensor
.
Slice
(
static_cast
<
int
>
(
height
),
static_cast
<
int
>
(
dout_tensor
.
dims
()[
0
]));
math
::
set_constant
(
dev_ctx
,
&
rest_tensor
,
0.0
f
);
...
...
@@ -119,7 +112,7 @@ class ShrinkStateGradOp : public ArrayOp {
}
};
class
Shri
kState
GradInferShape
:
public
framework
::
InferShapeBase
{
class
Shri
nkRNNMemory
GradInferShape
:
public
framework
::
InferShapeBase
{
public:
void
operator
()(
framework
::
InferShapeContext
*
context
)
const
override
{
PADDLE_ENFORCE
(
context
->
HasInput
(
"X"
));
...
...
@@ -129,14 +122,14 @@ class ShrikStateGradInferShape : public framework::InferShapeBase {
}
};
class
Shrink
State
GradOpMaker
:
public
framework
::
SingleGradOpDescMaker
{
class
Shrink
RNN
GradOpMaker
:
public
framework
::
SingleGradOpDescMaker
{
public:
using
framework
::
SingleGradOpDescMaker
::
SingleGradOpDescMaker
;
protected:
std
::
unique_ptr
<
framework
::
OpDescBind
>
Apply
()
const
override
{
auto
*
op
=
new
framework
::
OpDescBind
();
op
->
SetType
(
"shrink_
state
_grad"
);
op
->
SetType
(
"shrink_
rnn_memory
_grad"
);
op
->
SetInput
(
"X"
,
Input
(
"X"
));
op
->
SetInput
(
framework
::
GradVarName
(
"Out"
),
OutputGrad
(
"Out"
));
op
->
SetOutput
(
framework
::
GradVarName
(
"X"
),
InputGrad
(
"X"
));
...
...
@@ -149,8 +142,8 @@ class ShrinkStateGradOpMaker : public framework::SingleGradOpDescMaker {
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OPERATOR
(
shrink_
state
,
ops
::
ShrinkState
Op
,
ops
::
Shrink
StateOpInferShape
,
ops
::
ShrinkStateOpProtoMaker
,
ops
::
Shrink
State
GradOpMaker
);
REGISTER_OPERATOR
(
shrink_
state_grad
,
ops
::
ShrinkState
GradOp
,
ops
::
Shri
kState
GradInferShape
);
REGISTER_OPERATOR
(
shrink_
rnn_memory
,
ops
::
ShrinkRNNMemory
Op
,
ops
::
Shrink
RNNMemoryInferShape
,
ops
::
Shrink
RNNMemoryOpProtoMaker
,
ops
::
ShrinkRNN
GradOpMaker
);
REGISTER_OPERATOR
(
shrink_
rnn_memory_grad
,
ops
::
ShrinkRNNMemory
GradOp
,
ops
::
Shri
nkRNNMemory
GradInferShape
);
paddle/operators/tensor_array_read_write_op.cc
浏览文件 @
01425309
...
...
@@ -85,7 +85,6 @@ class WriteToArrayInferVarType : public framework::VarTypeInference {
public:
void
operator
()(
const
framework
::
OpDescBind
&
op_desc
,
framework
::
BlockDescBind
*
block
)
const
override
{
VLOG
(
10
)
<<
"I am here?"
;
for
(
auto
&
out_var
:
op_desc
.
OutputArgumentNames
())
{
VLOG
(
10
)
<<
"Set Variable "
<<
out_var
<<
" as LOD_TENSOR_ARRAY"
;
block
->
Var
(
out_var
)
->
SetType
(
framework
::
VarDesc
::
LOD_TENSOR_ARRAY
);
...
...
python/paddle/v2/framework/layers.py
浏览文件 @
01425309
...
...
@@ -844,7 +844,7 @@ def shrink_memory(x, i, table, main_program=None):
helper
=
LayerHelper
(
'shrink_memory'
,
**
locals
())
out
=
helper
.
create_tmp_variable
(
dtype
=
x
.
data_type
)
helper
.
append_op
(
type
=
'shrink_
state
'
,
type
=
'shrink_
rnn_memory
'
,
inputs
=
{
'X'
:
[
x
],
'I'
:
[
i
],
'RankTable'
:
[
table
]},
...
...
python/paddle/v2/framework/tests/test_shrink_
state
.py
→
python/paddle/v2/framework/tests/test_shrink_
rnn_memory
.py
浏览文件 @
01425309
...
...
@@ -7,8 +7,8 @@ from paddle.v2.framework.framework import g_main_program
import
numpy
class
TestShrink
State
(
unittest
.
TestCase
):
def
test_shrink_
state
(
self
):
class
TestShrink
RNNMemory
(
unittest
.
TestCase
):
def
test_shrink_
rnn_memory
(
self
):
x
=
layers
.
data
(
'x'
,
shape
=
[
100
],
data_type
=
'float32'
)
x
.
stop_gradient
=
False
table
=
layers
.
lod_rank_table
(
x
=
x
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录