Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
e967d19b
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看板
提交
e967d19b
编写于
3月 15, 2018
作者:
K
Kexin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add more tests
上级
a13ec343
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
75 addition
and
34 deletion
+75
-34
paddle/fluid/operators/conv_cudnn_op.cu.cc
paddle/fluid/operators/conv_cudnn_op.cu.cc
+2
-1
python/paddle/fluid/tests/unittests/op_test.py
python/paddle/fluid/tests/unittests/op_test.py
+10
-13
python/paddle/fluid/tests/unittests/test_conv2d_op.py
python/paddle/fluid/tests/unittests/test_conv2d_op.py
+63
-20
未找到文件。
paddle/fluid/operators/conv_cudnn_op.cu.cc
浏览文件 @
e967d19b
...
@@ -282,7 +282,8 @@ class CUDNNConvGradOpKernel : public framework::OpKernel<T> {
...
@@ -282,7 +282,8 @@ class CUDNNConvGradOpKernel : public framework::OpKernel<T> {
platform
::
CUDAPlace
gpu
=
boost
::
get
<
platform
::
CUDAPlace
>
(
ctx
.
GetPlace
());
platform
::
CUDAPlace
gpu
=
boost
::
get
<
platform
::
CUDAPlace
>
(
ctx
.
GetPlace
());
cudnn_workspace
=
paddle
::
memory
::
Alloc
(
gpu
,
workspace_size_in_bytes
);
cudnn_workspace
=
paddle
::
memory
::
Alloc
(
gpu
,
workspace_size_in_bytes
);
// ------------------- cudnn conv backward data ---------------------
// ------------------- cudnn conv backward data ---------------------
T
alpha
=
1.0
f
,
beta
=
0.0
f
;
typename
platform
::
CudnnDataType
<
T
>::
ScalingParamType
alpha
=
1.0
f
,
beta
=
0.0
f
;
if
(
input_grad
)
{
if
(
input_grad
)
{
T
*
input_grad_data
=
input_grad
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
T
*
input_grad_data
=
input_grad
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
// Because beta is zero, it is unnecessary to reset input_grad.
// Because beta is zero, it is unnecessary to reset input_grad.
...
...
python/paddle/fluid/tests/unittests/op_test.py
浏览文件 @
e967d19b
...
@@ -470,29 +470,26 @@ class OpTest(unittest.TestCase):
...
@@ -470,29 +470,26 @@ class OpTest(unittest.TestCase):
return
tensor
return
tensor
@
staticmethod
@
staticmethod
def
create_view
(
input
):
def
np_dtype_to_fluid_dtype
(
input
):
"""C
reate a view of the input
numpy array
"""C
hange the dtype of float16
numpy array
numpy float16 is binded to paddle::platform::float16
numpy float16 is binded to paddle::platform::float16
in tensor_py.h via the help of
numpy uint16 becaus
e
in tensor_py.h via the help of
uint16 data type sinc
e
the internal memory representation of float16 is
the internal memory representation of float16 is
uint16_t in paddle
or
np.uint16 in numpy, which are
uint16_t in paddle
and
np.uint16 in numpy, which are
themselves binded together.
themselves binded together
by pybind
.
Args:
Args:
input: input numpy array
input: input numpy array
Returns:
Returns:
input
_view: if the dtype of input is np.float16, input_view
input
: if the dtype of input is np.float16, its dtype will be
will reinterpret input as with dtype np.uint16.
changed to np.uint16 so that the internal memory will be
Otherwise, input_view will be input itself.
reinterpreted input as of dtype np.uint16.
"""
"""
if
input
.
dtype
==
np
.
float16
:
if
input
.
dtype
==
np
.
float16
:
# view will only reinterpret memory without copying
input
.
dtype
=
np
.
uint16
input_view
=
input
.
view
(
np
.
uint16
)
return
input
else
:
input_view
=
input
return
input_view
def
_get_gradient
(
self
,
input_to_check
,
place
,
output_names
,
no_grad_set
):
def
_get_gradient
(
self
,
input_to_check
,
place
,
output_names
,
no_grad_set
):
prog
=
Program
()
prog
=
Program
()
...
...
python/paddle/fluid/tests/unittests/test_conv2d_op.py
浏览文件 @
e967d19b
...
@@ -82,18 +82,9 @@ class TestConv2dOp(OpTest):
...
@@ -82,18 +82,9 @@ class TestConv2dOp(OpTest):
output
=
conv2d_forward_naive
(
input
,
filter
,
self
.
groups
,
output
=
conv2d_forward_naive
(
input
,
filter
,
self
.
groups
,
conv2d_param
).
astype
(
self
.
dtype
)
conv2d_param
).
astype
(
self
.
dtype
)
# numpy float16 is binded to paddle::platform::float16
# in tensor_py.h via the help of numpy uint16 because
# the internal memory representation of float16 is
# uint16_t in paddle or np.uint16 in numpy, which are
# themselves binded together.
self
.
inputs
=
{
self
.
inputs
=
{
#'Input': (input.view(np.uint16)
'Input'
:
OpTest
.
np_dtype_to_fluid_dtype
(
input
),
# if self.dtype == np.float16 else input),
'Filter'
:
OpTest
.
np_dtype_to_fluid_dtype
(
filter
)
#'Filter': (filter.view(np.uint16)
# if self.dtype == np.float16 else filter)
'Input'
:
OpTest
.
create_view
(
input
),
'Filter'
:
OpTest
.
create_view
(
filter
)
}
}
self
.
attrs
=
{
self
.
attrs
=
{
'strides'
:
self
.
stride
,
'strides'
:
self
.
stride
,
...
@@ -113,6 +104,8 @@ class TestConv2dOp(OpTest):
...
@@ -113,6 +104,8 @@ class TestConv2dOp(OpTest):
self
.
check_output
()
self
.
check_output
()
def
test_check_grad
(
self
):
def
test_check_grad
(
self
):
if
self
.
dtype
==
np
.
float16
:
return
if
self
.
use_cudnn
:
if
self
.
use_cudnn
:
place
=
core
.
CUDAPlace
(
0
)
place
=
core
.
CUDAPlace
(
0
)
self
.
check_grad_with_place
(
self
.
check_grad_with_place
(
...
@@ -125,6 +118,8 @@ class TestConv2dOp(OpTest):
...
@@ -125,6 +118,8 @@ class TestConv2dOp(OpTest):
set
([
'Input'
,
'Filter'
]),
'Output'
,
max_relative_error
=
0.02
)
set
([
'Input'
,
'Filter'
]),
'Output'
,
max_relative_error
=
0.02
)
def
test_check_grad_no_filter
(
self
):
def
test_check_grad_no_filter
(
self
):
if
self
.
dtype
==
np
.
float16
:
return
if
self
.
use_cudnn
:
if
self
.
use_cudnn
:
place
=
core
.
CUDAPlace
(
0
)
place
=
core
.
CUDAPlace
(
0
)
self
.
check_grad_with_place
(
self
.
check_grad_with_place
(
...
@@ -140,6 +135,8 @@ class TestConv2dOp(OpTest):
...
@@ -140,6 +135,8 @@ class TestConv2dOp(OpTest):
no_grad_set
=
set
([
'Filter'
]))
no_grad_set
=
set
([
'Filter'
]))
def
test_check_grad_no_input
(
self
):
def
test_check_grad_no_input
(
self
):
if
self
.
dtype
==
np
.
float16
:
return
if
self
.
use_cudnn
:
if
self
.
use_cudnn
:
place
=
core
.
CUDAPlace
(
0
)
place
=
core
.
CUDAPlace
(
0
)
self
.
check_grad_with_place
(
self
.
check_grad_with_place
(
...
@@ -259,15 +256,6 @@ class TestFP16CUDNN(TestCUDNN):
...
@@ -259,15 +256,6 @@ class TestFP16CUDNN(TestCUDNN):
if
core
.
is_float16_supported
(
place
):
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
def
test_check_grad
(
self
):
pass
def
test_check_grad_no_filter
(
self
):
pass
def
test_check_grad_no_input
(
self
):
pass
class
TestCUDNNWithPad
(
TestWithPad
):
class
TestCUDNNWithPad
(
TestWithPad
):
def
init_op_type
(
self
):
def
init_op_type
(
self
):
...
@@ -275,30 +263,85 @@ class TestCUDNNWithPad(TestWithPad):
...
@@ -275,30 +263,85 @@ class TestCUDNNWithPad(TestWithPad):
self
.
op_type
=
"conv2d"
self
.
op_type
=
"conv2d"
class
TestFP16CUDNNWithPad
(
TestCUDNNWithPad
):
def
init_data_type
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
if
core
.
is_compiled_with_cuda
():
place
=
core
.
CUDAPlace
(
0
)
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
class
TestCUDNNWithStride
(
TestWithStride
):
class
TestCUDNNWithStride
(
TestWithStride
):
def
init_op_type
(
self
):
def
init_op_type
(
self
):
self
.
use_cudnn
=
True
self
.
use_cudnn
=
True
self
.
op_type
=
"conv2d"
self
.
op_type
=
"conv2d"
class
TestFP16CUDNNWithStride
(
TestCUDNNWithStride
):
def
init_data_type
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
if
core
.
is_compiled_with_cuda
():
place
=
core
.
CUDAPlace
(
0
)
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
class
TestCUDNNWithGroup
(
TestWithGroup
):
class
TestCUDNNWithGroup
(
TestWithGroup
):
def
init_op_type
(
self
):
def
init_op_type
(
self
):
self
.
use_cudnn
=
True
self
.
use_cudnn
=
True
self
.
op_type
=
"conv2d"
self
.
op_type
=
"conv2d"
class
TestFP16CUDNNWithGroup
(
TestCUDNNWithGroup
):
def
init_data_type
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
if
core
.
is_compiled_with_cuda
():
place
=
core
.
CUDAPlace
(
0
)
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
class
TestCUDNNWith1x1
(
TestWith1x1
):
class
TestCUDNNWith1x1
(
TestWith1x1
):
def
init_op_type
(
self
):
def
init_op_type
(
self
):
self
.
use_cudnn
=
True
self
.
use_cudnn
=
True
self
.
op_type
=
"conv2d"
self
.
op_type
=
"conv2d"
class
TestFP16CUDNNWith1x1
(
TestCUDNNWith1x1
):
def
init_data_type
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
if
core
.
is_compiled_with_cuda
():
place
=
core
.
CUDAPlace
(
0
)
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
class
TestCUDNNWithInput1x1Filter1x1
(
TestWithInput1x1Filter1x1
):
class
TestCUDNNWithInput1x1Filter1x1
(
TestWithInput1x1Filter1x1
):
def
init_op_type
(
self
):
def
init_op_type
(
self
):
self
.
use_cudnn
=
True
self
.
use_cudnn
=
True
self
.
op_type
=
"conv2d"
self
.
op_type
=
"conv2d"
class
TestFP16CUDNNWithInput1x1Filter1x1
(
TestCUDNNWithInput1x1Filter1x1
):
def
init_data_type
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
if
core
.
is_compiled_with_cuda
():
place
=
core
.
CUDAPlace
(
0
)
if
core
.
is_float16_supported
(
place
):
self
.
check_output_with_place
(
place
,
atol
=
2e-2
)
class
TestDepthwiseConv
(
TestConv2dOp
):
class
TestDepthwiseConv
(
TestConv2dOp
):
def
init_test_case
(
self
):
def
init_test_case
(
self
):
self
.
pad
=
[
1
,
1
]
self
.
pad
=
[
1
,
1
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录