Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
1de32f82
P
Paddle
项目概览
BaiXuePrincess
/
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看板
未验证
提交
1de32f82
编写于
12月 01, 2020
作者:
C
Chen Weihang
提交者:
GitHub
12月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Hot fix complle failed in gcc4.8 caused by complex impl (#29254)
* hot fix complle failed in gcc4.8 * fix failed unittest
上级
642abe2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
17 deletion
+37
-17
paddle/fluid/framework/details/nan_inf_utils_detail.cc
paddle/fluid/framework/details/nan_inf_utils_detail.cc
+35
-16
python/paddle/fluid/tests/unittests/test_nan_inf.py
python/paddle/fluid/tests/unittests/test_nan_inf.py
+2
-1
未找到文件。
paddle/fluid/framework/details/nan_inf_utils_detail.cc
浏览文件 @
1de32f82
...
@@ -152,14 +152,12 @@ static void PrintNanInf(const T* value, const size_t numel, int print_num,
...
@@ -152,14 +152,12 @@ static void PrintNanInf(const T* value, const size_t numel, int print_num,
static_cast
<
uint64_t
>
(
i
),
static_cast
<
float
>
(
value
[
i
]));
static_cast
<
uint64_t
>
(
i
),
static_cast
<
float
>
(
value
[
i
]));
}
}
}
}
bool
has_nan_inf
=
true
;
printf
(
"In cpu, there has %lu,%lu,%lu nan,inf,num
\n
"
,
printf
(
"In cpu, there has %lu,%lu,%lu nan,inf,num
\n
"
,
static_cast
<
uint64_t
>
(
nan_count
),
static_cast
<
uint64_t
>
(
inf_count
),
static_cast
<
uint64_t
>
(
nan_count
),
static_cast
<
uint64_t
>
(
inf_count
),
static_cast
<
uint64_t
>
(
num_count
));
static_cast
<
uint64_t
>
(
num_count
));
PADDLE_ENFORCE_EQ
(
has_nan_inf
,
false
,
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
platform
::
errors
::
PreconditionNotMet
(
"There are `nan` or `inf` in tensor (%s) of operator (%s)."
,
var_name
,
"===ERROR: in [op=%s] [tensor=%s] find nan or inf==="
,
op_type
));
op_type
,
var_name
));
}
}
// openmp 4.0, reduction with fp16
// openmp 4.0, reduction with fp16
...
@@ -231,14 +229,25 @@ template <>
...
@@ -231,14 +229,25 @@ template <>
void
CheckNanInf
<
paddle
::
platform
::
complex64
>
(
void
CheckNanInf
<
paddle
::
platform
::
complex64
>
(
const
paddle
::
platform
::
complex64
*
value
,
const
size_t
numel
,
int
print_num
,
const
paddle
::
platform
::
complex64
*
value
,
const
size_t
numel
,
int
print_num
,
const
std
::
string
&
op_type
,
const
std
::
string
&
var_name
)
{
const
std
::
string
&
op_type
,
const
std
::
string
&
var_name
)
{
paddle
::
platform
::
complex64
sum
(
0.0
,
0.0
)
;
float
real_sum
=
0.0
f
;
#pragma omp parallel for reduction(+ : sum)
#pragma omp parallel for reduction(+ :
real_
sum)
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
sum
+=
(
value
[
i
]
-
value
[
i
]
);
real_sum
+=
(
value
[
i
].
real
-
value
[
i
].
real
);
}
}
if
(
std
::
isnan
(
sum
)
||
std
::
isinf
(
sum
))
{
float
imag_sum
=
0.0
f
;
PrintNanInf
(
value
,
numel
,
print_num
,
op_type
,
var_name
);
#pragma omp parallel for reduction(+ : imag_sum)
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
imag_sum
+=
(
value
[
i
].
imag
-
value
[
i
].
imag
);
}
if
(
std
::
isnan
(
real_sum
)
||
std
::
isinf
(
real_sum
)
||
std
::
isnan
(
imag_sum
)
||
std
::
isinf
(
imag_sum
))
{
// hot fix for compile failed in gcc4.8
// here also need print detail info of nan or inf later
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"There are `nan` or `inf` in tensor (%s) of operator (%s)."
,
var_name
,
op_type
));
}
}
}
}
...
@@ -246,17 +255,27 @@ template <>
...
@@ -246,17 +255,27 @@ template <>
void
CheckNanInf
<
paddle
::
platform
::
complex128
>
(
void
CheckNanInf
<
paddle
::
platform
::
complex128
>
(
const
paddle
::
platform
::
complex128
*
value
,
const
size_t
numel
,
const
paddle
::
platform
::
complex128
*
value
,
const
size_t
numel
,
int
print_num
,
const
std
::
string
&
op_type
,
const
std
::
string
&
var_name
)
{
int
print_num
,
const
std
::
string
&
op_type
,
const
std
::
string
&
var_name
)
{
paddle
::
platform
::
complex128
sum
(
0.0
,
0.0
)
;
double
real_sum
=
0.0
;
#pragma omp parallel for reduction(+ : sum)
#pragma omp parallel for reduction(+ :
real_
sum)
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
sum
+=
(
value
[
i
]
-
value
[
i
]
);
real_sum
+=
(
value
[
i
].
real
-
value
[
i
].
real
);
}
}
if
(
std
::
isnan
(
sum
)
||
std
::
isinf
(
sum
))
{
double
imag_sum
=
0.0
;
PrintNanInf
(
value
,
numel
,
print_num
,
op_type
,
var_name
);
#pragma omp parallel for reduction(+ : imag_sum)
for
(
size_t
i
=
0
;
i
<
numel
;
++
i
)
{
imag_sum
+=
(
value
[
i
].
imag
-
value
[
i
].
imag
);
}
}
}
if
(
std
::
isnan
(
real_sum
)
||
std
::
isinf
(
real_sum
)
||
std
::
isnan
(
imag_sum
)
||
std
::
isinf
(
imag_sum
))
{
// hot fix for compile failed in gcc4.8
// here also need print detail info of nan or inf later
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"There are `nan` or `inf` in tensor (%s) of operator (%s)."
,
var_name
,
op_type
));
}
}
#endif
#endif
template
<
>
template
<
>
...
...
python/paddle/fluid/tests/unittests/test_nan_inf.py
浏览文件 @
1de32f82
...
@@ -50,7 +50,8 @@ class TestNanInf(unittest.TestCase):
...
@@ -50,7 +50,8 @@ class TestNanInf(unittest.TestCase):
assert
returncode
==
0
assert
returncode
==
0
# in python3, type(out+err) is 'bytes', need use encode
# in python3, type(out+err) is 'bytes', need use encode
assert
(
out
+
err
).
find
(
'find nan or inf'
.
encode
())
!=
-
1
assert
(
out
+
err
).
find
(
'There are `nan` or `inf` in tensor'
.
encode
())
!=
-
1
class
TestNanInfEnv
(
TestNanInf
):
class
TestNanInfEnv
(
TestNanInf
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录