Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
a3b08bad
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看板
未验证
提交
a3b08bad
编写于
4月 06, 2021
作者:
R
ronnywang
提交者:
GitHub
4月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCM] fix the backward maxpool (#32030)
上级
1e52f324
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
86 addition
and
27 deletion
+86
-27
paddle/fluid/operators/pool_cudnn_op.cu.cc
paddle/fluid/operators/pool_cudnn_op.cu.cc
+30
-0
python/paddle/fluid/dygraph/nn.py
python/paddle/fluid/dygraph/nn.py
+5
-0
python/paddle/fluid/tests/unittests/test_conv2d_op.py
python/paddle/fluid/tests/unittests/test_conv2d_op.py
+51
-27
未找到文件。
paddle/fluid/operators/pool_cudnn_op.cu.cc
浏览文件 @
a3b08bad
...
@@ -20,6 +20,8 @@ limitations under the License. */
...
@@ -20,6 +20,8 @@ limitations under the License. */
#include "paddle/fluid/platform/cudnn_helper.h"
#include "paddle/fluid/platform/cudnn_helper.h"
#endif
#endif
#ifdef PADDLE_WITH_HIP
#ifdef PADDLE_WITH_HIP
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/platform/miopen_helper.h"
#include "paddle/fluid/platform/miopen_helper.h"
#endif
#endif
...
@@ -264,6 +266,34 @@ class PoolCUDNNGradOpKernel : public framework::OpKernel<T> {
...
@@ -264,6 +266,34 @@ class PoolCUDNNGradOpKernel : public framework::OpKernel<T> {
std
::
string
padding_algorithm
=
ctx
.
Attr
<
std
::
string
>
(
"padding_algorithm"
);
std
::
string
padding_algorithm
=
ctx
.
Attr
<
std
::
string
>
(
"padding_algorithm"
);
const
bool
channel_last
=
(
data_format
==
"NHWC"
||
data_format
==
"NDHWC"
);
const
bool
channel_last
=
(
data_format
==
"NHWC"
||
data_format
==
"NDHWC"
);
#ifdef PADDLE_WITH_HIP
if
(
pooling_type
==
"max"
)
{
using
OpKernelMap
=
paddle
::
framework
::
OperatorWithKernel
::
OpKernelMap
;
using
OpKernelFunc
=
paddle
::
framework
::
OperatorWithKernel
::
OpKernelFunc
;
auto
&
all_op_kernels
=
paddle
::
framework
::
OperatorWithKernel
::
AllOpKernels
();
std
::
string
op_type
=
"pool2d_grad"
;
auto
kernels_iter
=
all_op_kernels
.
find
(
op_type
);
PADDLE_ENFORCE_NE
(
kernels_iter
,
all_op_kernels
.
end
(),
platform
::
errors
::
Unavailable
(
"There are no kernels which are registered in the %s operator."
,
op_type
));
OpKernelMap
&
kernels
=
kernels_iter
->
second
;
paddle
::
framework
::
OpKernelType
expected_kernel_key
(
paddle
::
framework
::
ToDataType
(
typeid
(
T
)),
ctx
.
GetPlace
());
auto
kernel_iter
=
kernels
.
find
(
expected_kernel_key
);
PADDLE_ENFORCE_NE
(
kernel_iter
,
kernels
.
end
(),
platform
::
errors
::
NotFound
(
"Operator (%s) does not have kernel for %s."
,
op_type
,
KernelTypeToString
(
expected_kernel_key
)));
std
::
unique_ptr
<
OpKernelFunc
>
kernel_func_
(
new
OpKernelFunc
(
kernel_iter
->
second
));
(
*
kernel_func_
)(
ctx
);
return
;
}
#endif
// update paddings
// update paddings
auto
in_x_dims
=
input
->
dims
();
auto
in_x_dims
=
input
->
dims
();
framework
::
DDim
data_dims
;
framework
::
DDim
data_dims
;
...
...
python/paddle/fluid/dygraph/nn.py
浏览文件 @
a3b08bad
...
@@ -174,6 +174,11 @@ class Conv2D(layers.Layer):
...
@@ -174,6 +174,11 @@ class Conv2D(layers.Layer):
dtype
=
'float32'
):
dtype
=
'float32'
):
assert
param_attr
is
not
False
,
"param_attr should not be False here."
assert
param_attr
is
not
False
,
"param_attr should not be False here."
super
(
Conv2D
,
self
).
__init__
()
super
(
Conv2D
,
self
).
__init__
()
if
(
core
.
is_compiled_with_cuda
()
and
paddle
.
fluid
.
get_flags
(
"FLAGS_conv2d_disable_cudnn"
)[
"FLAGS_conv2d_disable_cudnn"
]):
use_cudnn
=
False
self
.
_num_channels
=
num_channels
self
.
_num_channels
=
num_channels
self
.
_groups
=
groups
self
.
_groups
=
groups
self
.
_stride
=
utils
.
convert_to_list
(
stride
,
2
,
'stride'
)
self
.
_stride
=
utils
.
convert_to_list
(
stride
,
2
,
'stride'
)
...
...
python/paddle/fluid/tests/unittests/test_conv2d_op.py
浏览文件 @
a3b08bad
...
@@ -1470,35 +1470,59 @@ class TestConv2DAPI_Error(unittest.TestCase):
...
@@ -1470,35 +1470,59 @@ class TestConv2DAPI_Error(unittest.TestCase):
not
(
core
.
is_compiled_with_cuda
()
or
core
.
is_compiled_with_rocm
()),
not
(
core
.
is_compiled_with_cuda
()
or
core
.
is_compiled_with_rocm
()),
"core is not compiled with CUDA or ROCM"
)
"core is not compiled with CUDA or ROCM"
)
class
TestConv2DEnviron
(
unittest
.
TestCase
):
class
TestConv2DEnviron
(
unittest
.
TestCase
):
def
run_conv2d_api
(
self
):
def
run1
(
self
,
place
):
inputs
=
fluid
.
layers
.
data
(
with
fluid
.
program_guard
(
fluid
.
Program
(),
fluid
.
Program
()):
shape
=
[
2
,
3
,
5
,
5
],
inputs
=
fluid
.
layers
.
data
(
append_batch_size
=
False
,
shape
=
[
2
,
3
,
5
,
5
],
name
=
"inputs"
,
append_batch_size
=
False
,
dtype
=
"float32"
)
name
=
"inputs"
,
fluid
.
layers
.
conv2d
(
dtype
=
"float32"
)
input
=
inputs
,
result
=
fluid
.
layers
.
conv2d
(
num_filters
=
4
,
input
=
inputs
,
filter_size
=
[
3
,
3
],
num_filters
=
4
,
stride
=
[
1
,
1
],
filter_size
=
[
3
,
3
],
padding
=
0
,
stride
=
[
1
,
1
],
dilation
=
[
1
,
1
],
padding
=
0
,
groups
=
1
,
dilation
=
[
1
,
1
],
data_format
=
"NCHW"
)
groups
=
1
,
data_format
=
"NCHW"
)
x_var
=
paddle
.
uniform
((
2
,
3
,
5
,
5
),
dtype
=
"float32"
,
min
=-
1.
,
max
=
1.
)
exe
=
fluid
.
Executor
(
place
)
conv
=
paddle
.
nn
.
Conv2D
(
exe
.
run
(
fluid
.
default_startup_program
())
in_channels
=
3
,
fetches
=
exe
.
run
(
fluid
.
default_main_program
(),
out_channels
=
4
,
feed
=
{
"inputs"
:
self
.
input_np
},
kernel_size
=
(
3
,
3
),
fetch_list
=
[
result
])
data_format
=
"NCHW"
)
y_var
=
conv
(
x_var
)
def
run2
(
self
,
place
):
with
fluid
.
dygraph
.
guard
(
place
):
inputs
=
fluid
.
dygraph
.
to_variable
(
self
.
input_np
)
conv
=
paddle
.
nn
.
Conv2D
(
in_channels
=
3
,
out_channels
=
4
,
kernel_size
=
(
3
,
3
),
data_format
=
"NCHW"
)
result
=
conv
(
inputs
)
def
run3
(
self
,
place
):
with
fluid
.
dygraph
.
guard
(
place
):
inputs
=
fluid
.
dygraph
.
to_variable
(
self
.
input_np
)
conv
=
paddle
.
fluid
.
dygraph
.
nn
.
Conv2D
(
num_channels
=
3
,
num_filters
=
4
,
filter_size
=
(
3
,
3
),
)
result
=
conv
(
inputs
)
def
run_all
(
self
,
place
):
self
.
run1
(
place
)
self
.
run2
(
place
)
self
.
run3
(
place
)
def
test_environ
(
self
):
def
test_environ
(
self
):
fluid
.
set_flags
({
'FLAGS_conv2d_disable_cudnn'
:
False
})
self
.
input_np
=
np
.
random
.
random
([
2
,
3
,
5
,
5
]).
astype
(
"float32"
)
self
.
run_conv2d_api
()
for
place
in
[
paddle
.
CPUPlace
(),
paddle
.
CUDAPlace
(
0
)]:
fluid
.
set_flags
({
'FLAGS_conv2d_disable_cudnn'
:
True
})
fluid
.
set_flags
({
'FLAGS_conv2d_disable_cudnn'
:
False
})
self
.
run_conv2d_api
()
self
.
run_all
(
place
)
fluid
.
set_flags
({
'FLAGS_conv2d_disable_cudnn'
:
True
})
self
.
run_all
(
place
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录