Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
c8ed768c
P
Paddle
项目概览
wzpei9
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c8ed768c
编写于
2月 24, 2018
作者:
C
chengduoZH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine pool2d
上级
2398db5e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
18 deletion
+13
-18
python/paddle/v2/fluid/layers/nn.py
python/paddle/v2/fluid/layers/nn.py
+13
-18
未找到文件。
python/paddle/v2/fluid/layers/nn.py
浏览文件 @
c8ed768c
...
@@ -1253,9 +1253,9 @@ def conv2d(input,
...
@@ -1253,9 +1253,9 @@ def conv2d(input,
raise
ValueError
(
"num_channels must be divisible by groups."
)
raise
ValueError
(
"num_channels must be divisible by groups."
)
num_filter_channels
=
num_channels
/
groups
num_filter_channels
=
num_channels
/
groups
filter_size
=
utils
.
convert_to_list
(
filter_size
,
2
,
'
conv2d.
filter_size'
)
filter_size
=
utils
.
convert_to_list
(
filter_size
,
2
,
'filter_size'
)
stride
=
utils
.
convert_to_list
(
stride
,
2
,
'
conv2d.
stride'
)
stride
=
utils
.
convert_to_list
(
stride
,
2
,
'stride'
)
padding
=
utils
.
convert_to_list
(
padding
,
2
,
'
conv2d.
padding'
)
padding
=
utils
.
convert_to_list
(
padding
,
2
,
'padding'
)
if
not
isinstance
(
use_cudnn
,
bool
):
if
not
isinstance
(
use_cudnn
,
bool
):
raise
ValueError
(
"use_cudnn should be True or False"
)
raise
ValueError
(
"use_cudnn should be True or False"
)
...
@@ -1433,8 +1433,8 @@ def sequence_last_step(input):
...
@@ -1433,8 +1433,8 @@ def sequence_last_step(input):
def
pool2d
(
input
,
def
pool2d
(
input
,
pool_size
,
pool_size
,
pool_type
,
pool_type
,
pool_stride
=
None
,
pool_stride
=
1
,
pool_padding
=
None
,
pool_padding
=
0
,
global_pooling
=
False
,
global_pooling
=
False
,
use_cudnn
=
True
,
use_cudnn
=
True
,
name
=
None
):
name
=
None
):
...
@@ -1442,20 +1442,15 @@ def pool2d(input,
...
@@ -1442,20 +1442,15 @@ def pool2d(input,
This function adds the operator for pooling in 2 dimensions, using the
This function adds the operator for pooling in 2 dimensions, using the
pooling configurations mentioned in input parameters.
pooling configurations mentioned in input parameters.
"""
"""
if
pool_padding
is
None
:
pool_padding
=
[
0
,
0
]
if
pool_stride
is
None
:
pool_stride
=
[
1
,
1
]
if
pool_type
not
in
[
"max"
,
"avg"
]:
if
pool_type
not
in
[
"max"
,
"avg"
]:
raise
ValueError
(
raise
ValueError
(
"Unknown pool_type: '%s'. It can only be 'max' or 'avg'."
,
"Unknown pool_type: '%s'. It can only be 'max' or 'avg'."
,
str
(
pool_type
))
str
(
pool_type
))
if
isinstance
(
pool_size
,
int
):
pool_size
=
[
pool_size
,
pool_size
]
pool_size
=
utils
.
convert_to_list
(
pool_size
,
2
,
'pool_size'
)
if
isinstance
(
pool_stride
,
int
):
pool_padding
=
utils
.
convert_to_list
(
pool_padding
,
2
,
'pool_padding'
)
pool_stride
=
[
pool_stride
,
pool_stride
]
pool_stride
=
utils
.
convert_to_list
(
pool_stride
,
2
,
'pool_stride'
)
if
isinstance
(
pool_padding
,
int
):
pool_padding
=
[
pool_padding
,
pool_padding
]
if
not
isinstance
(
use_cudnn
,
bool
):
if
not
isinstance
(
use_cudnn
,
bool
):
raise
ValueError
(
"use_cudnn should be True or False"
)
raise
ValueError
(
"use_cudnn should be True or False"
)
...
@@ -1782,9 +1777,9 @@ def conv2d_transpose(input,
...
@@ -1782,9 +1777,9 @@ def conv2d_transpose(input,
raise
TypeError
(
"Input of conv2d_transpose must be Variable"
)
raise
TypeError
(
"Input of conv2d_transpose must be Variable"
)
input_channel
=
input
.
shape
[
1
]
input_channel
=
input
.
shape
[
1
]
padding
=
utils
.
convert_to_list
(
padding
,
2
,
'
conv2d_transpose.
padding'
)
padding
=
utils
.
convert_to_list
(
padding
,
2
,
'padding'
)
stride
=
utils
.
convert_to_list
(
stride
,
2
,
'
conv2d_transpose.
stride'
)
stride
=
utils
.
convert_to_list
(
stride
,
2
,
'stride'
)
dilation
=
utils
.
convert_to_list
(
dilation
,
2
,
'
conv2d_transpose.
dilation'
)
dilation
=
utils
.
convert_to_list
(
dilation
,
2
,
'dilation'
)
if
not
isinstance
(
use_cudnn
,
bool
):
if
not
isinstance
(
use_cudnn
,
bool
):
raise
ValueError
(
"use_cudnn should be True or False"
)
raise
ValueError
(
"use_cudnn should be True or False"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录