Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
f16aa394
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f16aa394
编写于
12月 14, 2018
作者:
D
dengkaipeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove use_cudnn in python API. test=develop
上级
dc2ff42e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
24 deletion
+2
-24
paddle/fluid/API.spec
paddle/fluid/API.spec
+2
-2
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+0
-22
未找到文件。
paddle/fluid/API.spec
浏览文件 @
f16aa394
...
@@ -77,8 +77,8 @@ paddle.fluid.layers.sequence_softmax ArgSpec(args=['input', 'use_cudnn', 'name']
...
@@ -77,8 +77,8 @@ paddle.fluid.layers.sequence_softmax ArgSpec(args=['input', 'use_cudnn', 'name']
paddle.fluid.layers.softmax ArgSpec(args=['input', 'use_cudnn', 'name'], varargs=None, keywords=None, defaults=(True, None))
paddle.fluid.layers.softmax ArgSpec(args=['input', 'use_cudnn', 'name'], varargs=None, keywords=None, defaults=(True, None))
paddle.fluid.layers.pool2d ArgSpec(args=['input', 'pool_size', 'pool_type', 'pool_stride', 'pool_padding', 'global_pooling', 'use_cudnn', 'ceil_mode', 'name', 'exclusive'], varargs=None, keywords=None, defaults=(-1, 'max', 1, 0, False, True, False, None, True))
paddle.fluid.layers.pool2d ArgSpec(args=['input', 'pool_size', 'pool_type', 'pool_stride', 'pool_padding', 'global_pooling', 'use_cudnn', 'ceil_mode', 'name', 'exclusive'], varargs=None, keywords=None, defaults=(-1, 'max', 1, 0, False, True, False, None, True))
paddle.fluid.layers.pool3d ArgSpec(args=['input', 'pool_size', 'pool_type', 'pool_stride', 'pool_padding', 'global_pooling', 'use_cudnn', 'ceil_mode', 'name', 'exclusive'], varargs=None, keywords=None, defaults=(-1, 'max', 1, 0, False, True, False, None, True))
paddle.fluid.layers.pool3d ArgSpec(args=['input', 'pool_size', 'pool_type', 'pool_stride', 'pool_padding', 'global_pooling', 'use_cudnn', 'ceil_mode', 'name', 'exclusive'], varargs=None, keywords=None, defaults=(-1, 'max', 1, 0, False, True, False, None, True))
paddle.fluid.layers.adaptive_pool2d ArgSpec(args=['input', 'pool_size', 'pool_type', 'require_index', '
use_cudnn', 'name'], varargs=None, keywords=None, defaults=('max', False
, False, None))
paddle.fluid.layers.adaptive_pool2d ArgSpec(args=['input', 'pool_size', 'pool_type', 'require_index', '
name'], varargs=None, keywords=None, defaults=('max'
, False, None))
paddle.fluid.layers.adaptive_pool3d ArgSpec(args=['input', 'pool_size', 'pool_type', 'require_index', '
use_cudnn', 'name'], varargs=None, keywords=None, defaults=('max', False
, False, None))
paddle.fluid.layers.adaptive_pool3d ArgSpec(args=['input', 'pool_size', 'pool_type', 'require_index', '
name'], varargs=None, keywords=None, defaults=('max'
, False, None))
paddle.fluid.layers.batch_norm ArgSpec(args=['input', 'act', 'is_test', 'momentum', 'epsilon', 'param_attr', 'bias_attr', 'data_layout', 'in_place', 'name', 'moving_mean_name', 'moving_variance_name', 'do_model_average_for_mean_and_var', 'fuse_with_relu', 'use_global_stats'], varargs=None, keywords=None, defaults=(None, False, 0.9, 1e-05, None, None, 'NCHW', False, None, None, None, False, False, False))
paddle.fluid.layers.batch_norm ArgSpec(args=['input', 'act', 'is_test', 'momentum', 'epsilon', 'param_attr', 'bias_attr', 'data_layout', 'in_place', 'name', 'moving_mean_name', 'moving_variance_name', 'do_model_average_for_mean_and_var', 'fuse_with_relu', 'use_global_stats'], varargs=None, keywords=None, defaults=(None, False, 0.9, 1e-05, None, None, 'NCHW', False, None, None, None, False, False, False))
paddle.fluid.layers.beam_search_decode ArgSpec(args=['ids', 'scores', 'beam_size', 'end_id', 'name'], varargs=None, keywords=None, defaults=(None,))
paddle.fluid.layers.beam_search_decode ArgSpec(args=['ids', 'scores', 'beam_size', 'end_id', 'name'], varargs=None, keywords=None, defaults=(None,))
paddle.fluid.layers.conv2d_transpose ArgSpec(args=['input', 'num_filters', 'output_size', 'filter_size', 'padding', 'stride', 'dilation', 'groups', 'param_attr', 'bias_attr', 'use_cudnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, None, 0, 1, 1, None, None, None, True, None, None))
paddle.fluid.layers.conv2d_transpose ArgSpec(args=['input', 'num_filters', 'output_size', 'filter_size', 'padding', 'stride', 'dilation', 'groups', 'param_attr', 'bias_attr', 'use_cudnn', 'act', 'name'], varargs=None, keywords=None, defaults=(None, None, 0, 1, 1, None, None, None, True, None, None))
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
f16aa394
...
@@ -2506,7 +2506,6 @@ def adaptive_pool2d(input,
...
@@ -2506,7 +2506,6 @@ def adaptive_pool2d(input,
pool_size
,
pool_size
,
pool_type
=
"max"
,
pool_type
=
"max"
,
require_index
=
False
,
require_index
=
False
,
use_cudnn
=
False
,
name
=
None
):
name
=
None
):
"""
"""
${comment}
${comment}
...
@@ -2521,7 +2520,6 @@ def adaptive_pool2d(input,
...
@@ -2521,7 +2520,6 @@ def adaptive_pool2d(input,
pool_type: ${pooling_type_comment}
pool_type: ${pooling_type_comment}
require_index (bool): If true, the index of max pooling point along with outputs.
require_index (bool): If true, the index of max pooling point along with outputs.
it cannot be set in average pooling type.
it cannot be set in average pooling type.
use_cudnn (bool, default False): adaptive pool currently not supported in cudnn.
name (str|None): A name for this layer(optional). If set None, the
name (str|None): A name for this layer(optional). If set None, the
layer will be named automatically.
layer will be named automatically.
...
@@ -2530,8 +2528,6 @@ def adaptive_pool2d(input,
...
@@ -2530,8 +2528,6 @@ def adaptive_pool2d(input,
Raises:
Raises:
ValueError: 'pool_type' is not 'max' nor 'avg'.
ValueError: 'pool_type' is not 'max' nor 'avg'.
ValueError: 'use_cudnn' is not a bool value.
ValueError: adaptive pool currently not supported in cudnn.
ValueError: invalid setting 'require_index' true when 'pool_type' is 'avg'.
ValueError: invalid setting 'require_index' true when 'pool_type' is 'avg'.
ValueError: 'pool_size' should be a list or tuple with length as 2.
ValueError: 'pool_size' should be a list or tuple with length as 2.
...
@@ -2575,12 +2571,6 @@ def adaptive_pool2d(input,
...
@@ -2575,12 +2571,6 @@ def adaptive_pool2d(input,
raise
ValueError
(
raise
ValueError
(
"'pool_size' should be a list or tuple with length as 2."
)
"'pool_size' should be a list or tuple with length as 2."
)
if
not
isinstance
(
use_cudnn
,
bool
):
raise
ValueError
(
"use_cudnn should be True or False."
)
if
use_cudnn
:
raise
ValueError
(
"adaptive pool currently not supported in cudnn."
)
if
pool_type
==
"max"
:
if
pool_type
==
"max"
:
l_type
=
'max_pool2d_with_index'
l_type
=
'max_pool2d_with_index'
else
:
else
:
...
@@ -2602,7 +2592,6 @@ def adaptive_pool2d(input,
...
@@ -2602,7 +2592,6 @@ def adaptive_pool2d(input,
attrs
=
{
attrs
=
{
"pooling_type"
:
pool_type
,
"pooling_type"
:
pool_type
,
"ksize"
:
pool_size
,
"ksize"
:
pool_size
,
"use_cudnn"
:
use_cudnn
,
"adaptive"
:
True
,
"adaptive"
:
True
,
})
})
...
@@ -2614,7 +2603,6 @@ def adaptive_pool3d(input,
...
@@ -2614,7 +2603,6 @@ def adaptive_pool3d(input,
pool_size
,
pool_size
,
pool_type
=
"max"
,
pool_type
=
"max"
,
require_index
=
False
,
require_index
=
False
,
use_cudnn
=
False
,
name
=
None
):
name
=
None
):
"""
"""
${comment}
${comment}
...
@@ -2629,7 +2617,6 @@ def adaptive_pool3d(input,
...
@@ -2629,7 +2617,6 @@ def adaptive_pool3d(input,
pool_type: ${pooling_type_comment}
pool_type: ${pooling_type_comment}
require_index (bool): If true, the index of max pooling point along with outputs.
require_index (bool): If true, the index of max pooling point along with outputs.
it cannot be set in average pooling type.
it cannot be set in average pooling type.
use_cudnn (bool, default False): adaptive pool currently not supported in cudnn.
name (str|None): A name for this layer(optional). If set None, the
name (str|None): A name for this layer(optional). If set None, the
layer will be named automatically.
layer will be named automatically.
...
@@ -2638,8 +2625,6 @@ def adaptive_pool3d(input,
...
@@ -2638,8 +2625,6 @@ def adaptive_pool3d(input,
Raises:
Raises:
ValueError: 'pool_type' is not 'max' nor 'avg'.
ValueError: 'pool_type' is not 'max' nor 'avg'.
ValueError: 'use_cudnn' is not a bool value.
ValueError: adaptive pool currently not supported in cudnn.
ValueError: invalid setting 'require_index' true when 'pool_type' is 'avg'.
ValueError: invalid setting 'require_index' true when 'pool_type' is 'avg'.
ValueError: 'pool_size' should be a list or tuple with length as 2.
ValueError: 'pool_size' should be a list or tuple with length as 2.
...
@@ -2687,12 +2672,6 @@ def adaptive_pool3d(input,
...
@@ -2687,12 +2672,6 @@ def adaptive_pool3d(input,
raise
ValueError
(
raise
ValueError
(
"'pool_size' should be a list or tuple with length as 3."
)
"'pool_size' should be a list or tuple with length as 3."
)
if
not
isinstance
(
use_cudnn
,
bool
):
raise
ValueError
(
"use_cudnn should be True or False."
)
if
use_cudnn
:
raise
ValueError
(
"adaptive pool currently not supported in cudnn."
)
if
pool_type
==
"max"
:
if
pool_type
==
"max"
:
l_type
=
'max_pool3d_with_index'
l_type
=
'max_pool3d_with_index'
else
:
else
:
...
@@ -2714,7 +2693,6 @@ def adaptive_pool3d(input,
...
@@ -2714,7 +2693,6 @@ def adaptive_pool3d(input,
attrs
=
{
attrs
=
{
"pooling_type"
:
pool_type
,
"pooling_type"
:
pool_type
,
"ksize"
:
pool_size
,
"ksize"
:
pool_size
,
"use_cudnn"
:
use_cudnn
,
"adaptive"
:
True
,
"adaptive"
:
True
,
})
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录