Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
c6f888e5
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c6f888e5
编写于
1月 19, 2020
作者:
Z
zhupengyang
提交者:
Tao Luo
1月 19, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update unittest accuracy to float64 for relu, prelu, maxout (#22273)
上级
0d8b222b
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
21 addition
and
22 deletion
+21
-22
paddle/fluid/operators/maxout_op.cc
paddle/fluid/operators/maxout_op.cc
+4
-2
paddle/fluid/operators/prelu_op.cc
paddle/fluid/operators/prelu_op.cc
+4
-3
python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py
...fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py
+2
-1
python/paddle/fluid/tests/unittests/ngraph/test_activation_ngraph_op.py
...fluid/tests/unittests/ngraph/test_activation_ngraph_op.py
+2
-1
python/paddle/fluid/tests/unittests/test_maxout_op.py
python/paddle/fluid/tests/unittests/test_maxout_op.py
+3
-4
python/paddle/fluid/tests/unittests/test_prelu_op.py
python/paddle/fluid/tests/unittests/test_prelu_op.py
+6
-8
python/paddle/fluid/tests/unittests/white_list/op_accuracy_white_list.py
...luid/tests/unittests/white_list/op_accuracy_white_list.py
+0
-3
未找到文件。
paddle/fluid/operators/maxout_op.cc
浏览文件 @
c6f888e5
...
@@ -118,7 +118,9 @@ REGISTER_OPERATOR(
...
@@ -118,7 +118,9 @@ REGISTER_OPERATOR(
paddle
::
framework
::
DefaultGradOpMaker
<
paddle
::
imperative
::
OpBase
,
true
>
);
paddle
::
framework
::
DefaultGradOpMaker
<
paddle
::
imperative
::
OpBase
,
true
>
);
REGISTER_OPERATOR
(
maxout_grad
,
ops
::
MaxOutOpGrad
);
REGISTER_OPERATOR
(
maxout_grad
,
ops
::
MaxOutOpGrad
);
REGISTER_OP_CPU_KERNEL
(
REGISTER_OP_CPU_KERNEL
(
maxout
,
ops
::
MaxOutKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
);
maxout
,
ops
::
MaxOutKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
ops
::
MaxOutKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
REGISTER_OP_CPU_KERNEL
(
REGISTER_OP_CPU_KERNEL
(
maxout_grad
,
maxout_grad
,
ops
::
MaxOutGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
);
ops
::
MaxOutGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
ops
::
MaxOutGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
paddle/fluid/operators/prelu_op.cc
浏览文件 @
c6f888e5
...
@@ -161,7 +161,8 @@ REGISTER_OPERATOR(prelu, ops::PReluOp, ops::PReluOpMaker,
...
@@ -161,7 +161,8 @@ REGISTER_OPERATOR(prelu, ops::PReluOp, ops::PReluOpMaker,
ops
::
PReluGradOpMaker
<
paddle
::
imperative
::
OpBase
>
);
ops
::
PReluGradOpMaker
<
paddle
::
imperative
::
OpBase
>
);
REGISTER_OPERATOR
(
prelu_grad
,
ops
::
PReluGradOp
);
REGISTER_OPERATOR
(
prelu_grad
,
ops
::
PReluGradOp
);
REGISTER_OP_CPU_KERNEL
(
REGISTER_OP_CPU_KERNEL
(
prelu
,
ops
::
PReluKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
);
prelu
,
ops
::
PReluKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
ops
::
PReluKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
REGISTER_OP_CPU_KERNEL
(
REGISTER_OP_CPU_KERNEL
(
prelu_grad
,
prelu_grad
,
ops
::
PReluGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
ops
::
PReluGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
);
ops
::
PReluGradKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py
浏览文件 @
c6f888e5
...
@@ -17,7 +17,7 @@ from __future__ import print_function
...
@@ -17,7 +17,7 @@ from __future__ import print_function
import
unittest
import
unittest
import
numpy
as
np
import
numpy
as
np
import
paddle.fluid.core
as
core
import
paddle.fluid.core
as
core
from
paddle.fluid.tests.unittests.op_test
import
OpTest
from
paddle.fluid.tests.unittests.op_test
import
OpTest
,
skip_check_grad_ci
from
paddle.fluid.tests.unittests.test_activation_op
import
TestRelu
,
TestTanh
,
TestSqrt
,
TestAbs
,
TestLeakyRelu
from
paddle.fluid.tests.unittests.test_activation_op
import
TestRelu
,
TestTanh
,
TestSqrt
,
TestAbs
,
TestLeakyRelu
from
mkldnn_op_test
import
check_if_mkldnn_primitives_exist_in_bwd
from
mkldnn_op_test
import
check_if_mkldnn_primitives_exist_in_bwd
...
@@ -111,6 +111,7 @@ class TestMKLDNNAbsDim2(TestAbs):
...
@@ -111,6 +111,7 @@ class TestMKLDNNAbsDim2(TestAbs):
[
'X'
],
'Out'
,
max_relative_error
=
0.007
,
check_dygraph
=
False
)
[
'X'
],
'Out'
,
max_relative_error
=
0.007
,
check_dygraph
=
False
)
@
skip_check_grad_ci
(
reason
=
"Use float32 in mkldnn relu op."
)
class
TestMKLDNNReluDim4
(
TestRelu
):
class
TestMKLDNNReluDim4
(
TestRelu
):
def
setUp
(
self
):
def
setUp
(
self
):
super
(
TestMKLDNNReluDim4
,
self
).
setUp
()
super
(
TestMKLDNNReluDim4
,
self
).
setUp
()
...
...
python/paddle/fluid/tests/unittests/ngraph/test_activation_ngraph_op.py
浏览文件 @
c6f888e5
...
@@ -17,10 +17,11 @@ from __future__ import print_function
...
@@ -17,10 +17,11 @@ from __future__ import print_function
import
unittest
,
sys
import
unittest
,
sys
sys
.
path
.
append
(
"../"
)
sys
.
path
.
append
(
"../"
)
import
numpy
as
np
import
numpy
as
np
from
op_test
import
OpTest
from
op_test
import
OpTest
,
skip_check_grad_ci
from
test_activation_op
import
TestAbs
,
TestGelu
,
TestSigmoid
,
TestSquare
,
TestRelu
,
TestTanh
from
test_activation_op
import
TestAbs
,
TestGelu
,
TestSigmoid
,
TestSquare
,
TestRelu
,
TestTanh
@
skip_check_grad_ci
(
reason
=
"Use float32 in ngraph relu op."
)
class
TestNGRAPHReluDim4
(
TestRelu
):
class
TestNGRAPHReluDim4
(
TestRelu
):
def
setUp
(
self
):
def
setUp
(
self
):
super
(
TestNGRAPHReluDim4
,
self
).
setUp
()
super
(
TestNGRAPHReluDim4
,
self
).
setUp
()
...
...
python/paddle/fluid/tests/unittests/test_maxout_op.py
浏览文件 @
c6f888e5
...
@@ -34,14 +34,13 @@ class TestMaxOutOp(OpTest):
...
@@ -34,14 +34,13 @@ class TestMaxOutOp(OpTest):
def
setUp
(
self
):
def
setUp
(
self
):
self
.
op_type
=
"maxout"
self
.
op_type
=
"maxout"
self
.
init_test_case
()
self
.
init_test_case
()
input
=
np
.
random
.
random
(
self
.
shape
).
astype
(
"float32"
)
input
=
np
.
random
.
random
(
self
.
shape
)
output
=
self
.
MaxOut_forward_naive
(
input
,
self
.
groups
,
output
=
self
.
MaxOut_forward_naive
(
input
,
self
.
groups
,
self
.
axis
)
self
.
axis
).
astype
(
"float32"
)
self
.
inputs
=
{
'X'
:
input
}
self
.
inputs
=
{
'X'
:
input
}
self
.
attrs
=
{
'groups'
:
self
.
groups
,
'axis'
:
self
.
axis
}
self
.
attrs
=
{
'groups'
:
self
.
groups
,
'axis'
:
self
.
axis
}
self
.
outputs
=
{
'Out'
:
output
.
astype
(
'float32'
)
}
self
.
outputs
=
{
'Out'
:
output
}
def
test_check_output
(
self
):
def
test_check_output
(
self
):
self
.
check_output
()
self
.
check_output
()
...
...
python/paddle/fluid/tests/unittests/test_prelu_op.py
浏览文件 @
c6f888e5
...
@@ -26,20 +26,18 @@ class PReluTest(OpTest):
...
@@ -26,20 +26,18 @@ class PReluTest(OpTest):
self
.
init_attr
()
self
.
init_attr
()
self
.
op_type
=
"prelu"
self
.
op_type
=
"prelu"
x_np
=
np
.
random
.
uniform
(
-
1
,
1
,
self
.
x_shape
)
.
astype
(
"float32"
)
x_np
=
np
.
random
.
uniform
(
-
1
,
1
,
self
.
x_shape
)
# Since zero point in prelu is not differentiable, avoid randomize
# Since zero point in prelu is not differentiable, avoid randomize
# zero.
# zero.
x_np
[
np
.
abs
(
x_np
)
<
0.005
]
=
0.02
x_np
[
np
.
abs
(
x_np
)
<
0.005
]
=
0.02
if
self
.
attrs
==
{
'mode'
:
"all"
}:
if
self
.
attrs
==
{
'mode'
:
"all"
}:
alpha_np
=
np
.
random
.
rand
(
1
).
astype
(
"float32"
)
alpha_np
=
np
.
random
.
uniform
(
-
1
,
-
0.5
,
(
1
))
self
.
inputs
=
{
'X'
:
x_np
,
'Alpha'
:
alpha_np
}
elif
self
.
attrs
==
{
'mode'
:
"channel"
}:
elif
self
.
attrs
==
{
'mode'
:
"channel"
}:
alpha_np
=
np
.
random
.
rand
(
1
,
x_np
.
shape
[
1
],
1
,
1
).
astype
(
"float32"
)
alpha_np
=
np
.
random
.
uniform
(
-
1
,
-
0.5
,
(
1
,
x_np
.
shape
[
1
],
1
,
1
))
self
.
inputs
=
{
'X'
:
x_np
,
'Alpha'
:
alpha_np
}
else
:
else
:
alpha_np
=
np
.
random
.
rand
(
1
,
x_np
.
shape
[
1
],
x_np
.
shape
[
2
],
alpha_np
=
np
.
random
.
uniform
(
-
1
,
-
0.5
,
\
x_np
.
shape
[
3
]).
astype
(
"float32"
)
(
1
,
x_np
.
shape
[
1
],
x_np
.
shape
[
2
],
x_np
.
shape
[
3
])
)
self
.
inputs
=
{
'X'
:
x_np
,
'Alpha'
:
alpha_np
}
self
.
inputs
=
{
'X'
:
x_np
,
'Alpha'
:
alpha_np
}
out_np
=
np
.
maximum
(
self
.
inputs
[
'X'
],
0.
)
out_np
=
np
.
maximum
(
self
.
inputs
[
'X'
],
0.
)
...
...
python/paddle/fluid/tests/unittests/white_list/op_accuracy_white_list.py
浏览文件 @
c6f888e5
...
@@ -46,7 +46,6 @@ NO_FP64_CHECK_GRAD_OP_LIST = [
...
@@ -46,7 +46,6 @@ NO_FP64_CHECK_GRAD_OP_LIST = [
'matmul'
,
\
'matmul'
,
\
'max_pool2d_with_index'
,
\
'max_pool2d_with_index'
,
\
'max_pool3d_with_index'
,
\
'max_pool3d_with_index'
,
\
'maxout'
,
\
'minus'
,
\
'minus'
,
\
'modified_huber_loss'
,
\
'modified_huber_loss'
,
\
'mul'
,
\
'mul'
,
\
...
@@ -56,12 +55,10 @@ NO_FP64_CHECK_GRAD_OP_LIST = [
...
@@ -56,12 +55,10 @@ NO_FP64_CHECK_GRAD_OP_LIST = [
'pad_constant_like'
,
\
'pad_constant_like'
,
\
'pool2d'
,
\
'pool2d'
,
\
'pool3d'
,
\
'pool3d'
,
\
'prelu'
,
\
'prroi_pool'
,
\
'prroi_pool'
,
\
'rank_loss'
,
\
'rank_loss'
,
\
'reduce_max'
,
\
'reduce_max'
,
\
'reduce_min'
,
\
'reduce_min'
,
\
'relu'
,
\
'reshape2'
,
\
'reshape2'
,
\
'roi_perspective_transform'
,
\
'roi_perspective_transform'
,
\
'row_conv'
,
\
'row_conv'
,
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录