Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
马赛克医院
Paddle
提交
f5c2d175
P
Paddle
项目概览
马赛克医院
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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,发现更多精彩内容 >>
提交
f5c2d175
编写于
12月 28, 2017
作者:
Y
Yang Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refine
上级
6f5e64af
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
36 addition
and
12 deletion
+36
-12
paddle/framework/executor.cc
paddle/framework/executor.cc
+5
-4
paddle/framework/tensor_impl.h
paddle/framework/tensor_impl.h
+11
-2
paddle/framework/variable.h
paddle/framework/variable.h
+1
-0
paddle/operators/fill_constant_op.cc
paddle/operators/fill_constant_op.cc
+1
-0
paddle/operators/shrink_rnn_memory_op.cc
paddle/operators/shrink_rnn_memory_op.cc
+3
-2
paddle/operators/sum_op.h
paddle/operators/sum_op.h
+1
-3
paddle/operators/tensor_array_read_write_op.cc
paddle/operators/tensor_array_read_write_op.cc
+1
-1
paddle/operators/while_op.cc
paddle/operators/while_op.cc
+13
-0
未找到文件。
paddle/framework/executor.cc
浏览文件 @
f5c2d175
...
...
@@ -59,15 +59,16 @@ static void CreateTensor(Variable* var, proto::VarDesc::VarType var_type) {
static
void
CheckTensorNANOrInf
(
const
std
::
string
&
name
,
const
framework
::
Tensor
&
tensor
)
{
if
(
tensor
.
type
().
hash_code
()
!=
typeid
(
float
).
hash_code
()
&&
tensor
.
type
().
hash_code
()
!=
typeid
(
double
).
hash_code
())
{
if
(
tensor
.
memory_size
()
==
0
)
{
return
;
}
if
(
tensor
.
memory_size
()
==
0
)
{
if
(
tensor
.
type
().
hash_code
()
!=
typeid
(
float
).
hash_code
()
&&
tensor
.
type
().
hash_code
()
!=
typeid
(
double
).
hash_code
())
{
return
;
}
PADDLE_ENFORCE
(
!
framework
::
HasInf
(
tensor
),
"Tensor %s has Inf"
,
name
);
PADDLE_ENFORCE
(
!
framework
::
HasNAN
(
tensor
),
"Tensor %s has NAN"
,
name
);
PADDLE_ENFORCE
(
!
framework
::
HasNAN
(
tensor
),
"Tensor %s has NAN, %p"
,
name
,
&
tensor
);
}
void
Executor
::
Run
(
const
ProgramDesc
&
pdesc
,
Scope
*
scope
,
int
block_id
,
...
...
paddle/framework/tensor_impl.h
浏览文件 @
f5c2d175
...
...
@@ -134,8 +134,17 @@ inline void* Tensor::mutable_data(platform::Place place, std::type_index type) {
#endif
offset_
=
0
;
}
return
reinterpret_cast
<
void
*>
(
reinterpret_cast
<
uintptr_t
>
(
holder_
->
ptr
())
+
offset_
);
void
*
buf
=
reinterpret_cast
<
void
*>
(
reinterpret_cast
<
uintptr_t
>
(
holder_
->
ptr
())
+
offset_
);
if
(
type
.
hash_code
()
==
typeid
(
float
).
hash_code
()
||
type
.
hash_code
()
==
typeid
(
double
).
hash_code
())
{
float
*
tmp
=
(
float
*
)(
buf
);
for
(
int64_t
i
=
0
;
i
<
numel
();
++
i
)
{
tmp
[
i
]
=
NAN
;
}
}
return
buf
;
}
inline
void
*
Tensor
::
mutable_data
(
platform
::
Place
place
)
{
...
...
paddle/framework/variable.h
浏览文件 @
f5c2d175
...
...
@@ -35,6 +35,7 @@ class Variable {
template
<
typename
T
>
T
*
GetMutable
()
{
if
(
!
IsType
<
T
>
())
{
VLOG
(
10
)
<<
"Resetting "
<<
*
this
->
name_
;
holder_
.
reset
(
new
PlaceholderImpl
<
T
>
(
new
T
()));
}
return
static_cast
<
T
*>
(
holder_
->
Ptr
());
...
...
paddle/operators/fill_constant_op.cc
浏览文件 @
f5c2d175
...
...
@@ -51,6 +51,7 @@ class FillConstantOp : public framework::OperatorBase {
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
&
dev_ctx
=
*
pool
.
Get
(
dev_place
);
VLOG
(
10
)
<<
"FillConstant to "
<<
&
out
;
math
::
set_constant
(
dev_ctx
,
&
out
,
value
);
}
};
...
...
paddle/operators/shrink_rnn_memory_op.cc
浏览文件 @
f5c2d175
...
...
@@ -116,9 +116,10 @@ class ShrinkRNNMemoryGradOp : public ArrayOp {
auto
height
=
dout_tensor
.
dims
()[
0
];
auto
slice
=
dx_tensor
.
Slice
(
0
,
static_cast
<
int
>
(
height
));
framework
::
CopyFrom
(
dout_tensor
,
dout_tensor
.
place
(),
dev_ctx
,
&
slice
);
if
(
dx_tensor
.
dims
()[
0
]
<
height
)
{
VLOG
(
10
)
<<
dx_tensor
.
dims
()[
0
]
<<
", "
<<
height
;
if
(
dx_tensor
.
dims
()[
0
]
>
height
)
{
auto
rest_tensor
=
dx_tensor
.
Slice
(
static_cast
<
int
>
(
height
),
static_cast
<
int
>
(
d
out
_tensor
.
dims
()[
0
]));
static_cast
<
int
>
(
height
),
static_cast
<
int
>
(
d
x
_tensor
.
dims
()[
0
]));
math
::
set_constant
(
dev_ctx
,
&
rest_tensor
,
0.0
f
);
}
}
...
...
paddle/operators/sum_op.h
浏览文件 @
f5c2d175
...
...
@@ -38,11 +38,9 @@ class SumKernel : public framework::OpKernel<T> {
if
(
out_var
->
IsType
<
framework
::
LoDTensor
>
())
{
auto
*
out
=
context
.
Output
<
Tensor
>
(
"Out"
);
out
->
mutable_data
<
T
>
(
context
.
GetPlace
());
auto
result
=
EigenVector
<
T
>::
Flatten
(
*
out
);
if
(
!
in_place
)
{
out
->
mutable_data
<
T
>
(
context
.
GetPlace
());
math
::
SetConstant
<
DeviceContext
,
T
>
constant_functor
;
constant_functor
(
context
.
template
device_context
<
DeviceContext
>(),
out
,
0.0
);
...
...
paddle/operators/tensor_array_read_write_op.cc
浏览文件 @
f5c2d175
...
...
@@ -130,9 +130,9 @@ class ReadFromArrayOp : public ArrayOp {
auto
&
x_array
=
x
->
Get
<
framework
::
LoDTensorArray
>
();
auto
*
out
=
scope
.
FindVar
(
Output
(
"Out"
));
PADDLE_ENFORCE
(
out
!=
nullptr
,
"Out must be set"
);
auto
*
out_tensor
=
out
->
GetMutable
<
framework
::
LoDTensor
>
();
size_t
offset
=
GetOffset
(
scope
,
place
);
if
(
offset
<
x_array
.
size
())
{
auto
*
out_tensor
=
out
->
GetMutable
<
framework
::
LoDTensor
>
();
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
&
dev_ctx
=
*
pool
.
Get
(
place
);
...
...
paddle/operators/while_op.cc
浏览文件 @
f5c2d175
...
...
@@ -194,14 +194,27 @@ class WhileGradOp : public framework::OperatorBase {
}
}
auto
check_var_no_nan
=
[](
const
framework
::
Scope
&
scope
,
const
std
::
string
&
var_name
)
{
auto
*
var
=
scope
.
FindVar
(
var_name
);
if
(
var
->
IsType
<
LoDTensor
>
())
{
VLOG
(
10
)
<<
"Checking "
<<
var_name
;
PADDLE_ENFORCE
(
!
framework
::
HasNAN
(
var
->
Get
<
framework
::
LoDTensor
>
()),
"%s has NAN"
,
var_name
);
}
};
check_var_no_nan
(
cur_scope
,
inside_grad_name
);
auto
new_inside_name
=
cur_scope
.
Rename
(
inside_grad_name
);
check_var_no_nan
(
cur_scope
,
new_inside_name
);
auto
sum_op
=
framework
::
OpRegistry
::
CreateOp
(
"sum"
,
{{
"X"
,
{
pg_names
[
param_id
],
new_inside_name
}}},
{{
"Out"
,
{
pg_names
[
param_id
]}}},
framework
::
AttributeMap
{});
sum_op
->
Run
(
cur_scope
,
dev_place
);
check_var_no_nan
(
cur_scope
,
pg_names
[
param_id
]);
cur_scope
.
Rename
(
new_inside_name
,
inside_grad_name
);
}
}
VLOG
(
1
)
<<
"Complete WhileOpGrad"
;
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录