Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wk1234123
Paddle
提交
da4a1db7
P
Paddle
项目概览
wk1234123
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
4
Star
0
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
da4a1db7
编写于
5月 13, 2020
作者:
Q
qingqing01
提交者:
GitHub
5月 13, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refine error message in some OPs (#24443)
test=develop
上级
f0df9026
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
126 addition
and
42 deletion
+126
-42
paddle/fluid/operators/detection/density_prior_box_op.cc
paddle/fluid/operators/detection/density_prior_box_op.cc
+61
-18
paddle/fluid/operators/detection/prior_box_op.cc
paddle/fluid/operators/detection/prior_box_op.cc
+57
-18
python/paddle/fluid/layers/detection.py
python/paddle/fluid/layers/detection.py
+8
-6
未找到文件。
paddle/fluid/operators/detection/density_prior_box_op.cc
浏览文件 @
da4a1db7
...
...
@@ -19,15 +19,27 @@ class DensityPriorBoxOp : public framework::OperatorWithKernel {
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Input"
)
,
"
Input(Input) of DensityPriorBoxOp should not be null.
"
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Image"
)
,
"
Input(Image) of DensityPriorBoxOp should not be null.
"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Input"
),
"Input"
,
"Input"
,
"
DensityPriorBoxOp
"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Image"
),
"Input"
,
"Image"
,
"
DensityPriorBoxOp
"
);
auto
image_dims
=
ctx
->
GetInputDim
(
"Image"
);
auto
input_dims
=
ctx
->
GetInputDim
(
"Input"
);
PADDLE_ENFORCE
(
image_dims
.
size
()
==
4
,
"The layout of image is NCHW."
);
PADDLE_ENFORCE
(
input_dims
.
size
()
==
4
,
"The layout of input is NCHW."
);
PADDLE_ENFORCE_EQ
(
image_dims
.
size
(),
4
,
platform
::
errors
::
InvalidArgument
(
"The Input(Image) of Op(density_prior_box) should be a 4-D Tensor "
"and data format is NCHW. But received Image's dimensions = %d, "
"shape = [%s]."
,
image_dims
.
size
(),
image_dims
));
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
4
,
platform
::
errors
::
InvalidArgument
(
"The Input(Input) of Op(density_prior_box) should be a 4-D Tensor "
"and data format is NCHW. But received Input's dimensions = %d, "
"shape = [%s]."
,
input_dims
.
size
(),
input_dims
));
if
(
ctx
->
IsRuntime
())
{
PADDLE_ENFORCE_LT
(
...
...
@@ -53,8 +65,13 @@ class DensityPriorBoxOp : public framework::OperatorWithKernel {
auto
densities
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
int
>>
(
"densities"
);
bool
flatten
=
ctx
->
Attrs
().
Get
<
bool
>
(
"flatten_to_2d"
);
PADDLE_ENFORCE_EQ
(
fixed_sizes
.
size
(),
densities
.
size
(),
"The number of fixed_sizes and densities must be equal."
);
PADDLE_ENFORCE_EQ
(
fixed_sizes
.
size
(),
densities
.
size
(),
platform
::
errors
::
InvalidArgument
(
"The length of fixed_sizes and densities must be equal. "
"But received: fixed_sizes's length is %d, densities's length "
"is %d"
,
fixed_sizes
.
size
(),
densities
.
size
()));
size_t
num_priors
=
0
;
for
(
size_t
i
=
0
;
i
<
densities
.
size
();
++
i
)
{
num_priors
+=
(
fixed_ratios
.
size
())
*
(
pow
(
densities
[
i
],
2
));
...
...
@@ -110,10 +127,16 @@ class DensityPriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"encoded in density prior boxes."
)
.
AddCustomChecker
([](
const
std
::
vector
<
float
>&
variances
)
{
PADDLE_ENFORCE_EQ
(
variances
.
size
(),
4
,
"Must and only provide 4 variance."
);
platform
::
errors
::
InvalidArgument
(
"The length of variance must "
"be 4. But received: variances' length is %d."
,
variances
.
size
()));
for
(
size_t
i
=
0
;
i
<
variances
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
variances
[
i
],
0.0
,
"variance[%d] must be greater than 0."
,
i
);
platform
::
errors
::
OutOfRange
(
"variance[%d] must be greater "
"than 0. But received: variance[%d] = %f"
,
i
,
i
,
variances
[
i
]));
}
});
AddAttr
<
bool
>
(
"clip"
,
"(bool) Whether to clip out-of-boundary boxes."
)
...
...
@@ -127,14 +150,22 @@ class DensityPriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"Density prior boxes step across width, 0.0 for auto calculation."
)
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_w
)
{
PADDLE_ENFORCE_GE
(
step_w
,
0.0
,
"step_w should be larger than 0."
);
PADDLE_ENFORCE_GE
(
step_w
,
0.0
,
platform
::
errors
::
InvalidArgument
(
"step_w should be larger "
"than 0. But received: step_w = %f."
,
step_w
));
});
AddAttr
<
float
>
(
"step_h"
,
"Density prior boxes step across height, 0.0 for auto calculation."
)
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_h
)
{
PADDLE_ENFORCE_GE
(
step_h
,
0.0
,
"step_h should be larger than 0."
);
PADDLE_ENFORCE_GE
(
step_h
,
0.0
,
platform
::
errors
::
InvalidArgument
(
"step_h should be larger "
"than 0. But received: step_h = %f."
,
step_h
));
});
AddAttr
<
float
>
(
"offset"
,
...
...
@@ -147,8 +178,12 @@ class DensityPriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
.
SetDefault
(
std
::
vector
<
float
>
{})
.
AddCustomChecker
([](
const
std
::
vector
<
float
>&
fixed_sizes
)
{
for
(
size_t
i
=
0
;
i
<
fixed_sizes
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
fixed_sizes
[
i
],
0.0
,
"fixed_sizes[%d] should be larger than 0."
,
i
);
PADDLE_ENFORCE_GT
(
fixed_sizes
[
i
],
0.0
,
platform
::
errors
::
OutOfRange
(
"fixed_sizes[%d] should be "
"larger than 0. But received: fixed_sizes[%d] = %f"
,
i
,
i
,
fixed_sizes
[
i
]));
}
});
...
...
@@ -158,8 +193,12 @@ class DensityPriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
.
SetDefault
(
std
::
vector
<
float
>
{})
.
AddCustomChecker
([](
const
std
::
vector
<
float
>&
fixed_ratios
)
{
for
(
size_t
i
=
0
;
i
<
fixed_ratios
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
fixed_ratios
[
i
],
0.0
,
"fixed_ratios[%d] should be larger than 0."
,
i
);
PADDLE_ENFORCE_GT
(
fixed_ratios
[
i
],
0.0
,
platform
::
errors
::
OutOfRange
(
"fixed_ratios[%d] should be "
"larger than 0. But received: fixed_ratios[%d] = %f"
,
i
,
i
,
fixed_ratios
[
i
]));
}
});
...
...
@@ -169,8 +208,12 @@ class DensityPriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
.
SetDefault
(
std
::
vector
<
int
>
{})
.
AddCustomChecker
([](
const
std
::
vector
<
int
>&
densities
)
{
for
(
size_t
i
=
0
;
i
<
densities
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
densities
[
i
],
0
,
"densities[%d] should be larger than 0."
,
i
);
PADDLE_ENFORCE_GT
(
densities
[
i
],
0
,
platform
::
errors
::
OutOfRange
(
"densities[%d] should be "
"larger than 0. But received: densities[%d] = %f."
,
i
,
i
,
densities
[
i
]));
}
});
AddComment
(
R"DOC(
...
...
paddle/fluid/operators/detection/prior_box_op.cc
浏览文件 @
da4a1db7
...
...
@@ -26,15 +26,26 @@ class PriorBoxOp : public framework::OperatorWithKernel {
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Input"
),
"Input(Input) of PriorBoxOp should not be null."
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Image"
),
"Input(Image) of PriorBoxOp should not be null."
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Input"
),
"Input"
,
"Input"
,
"PriorBoxOp"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Image"
),
"Input"
,
"Image"
,
"PriorBoxOp"
);
auto
image_dims
=
ctx
->
GetInputDim
(
"Image"
);
auto
input_dims
=
ctx
->
GetInputDim
(
"Input"
);
PADDLE_ENFORCE
(
image_dims
.
size
()
==
4
,
"The layout of image is NCHW."
);
PADDLE_ENFORCE
(
input_dims
.
size
()
==
4
,
"The layout of input is NCHW."
);
PADDLE_ENFORCE_EQ
(
image_dims
.
size
(),
4
,
platform
::
errors
::
InvalidArgument
(
"The Input(Image) of Op(PriorBoxOp) should be a 4-D Tensor "
"and data format is NCHW. But received Image's dimensions = %d, "
"shape = [%s]."
,
image_dims
.
size
(),
image_dims
));
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
4
,
platform
::
errors
::
InvalidArgument
(
"The Input(Input) of Op(PriorBoxOp) should be a 4-D Tensor "
"and data format is NCHW. But received Input's dimensions = %d, "
"shape = [%s]."
,
input_dims
.
size
(),
input_dims
));
auto
min_sizes
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
float
>>
(
"min_sizes"
);
auto
max_sizes
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
float
>>
(
"max_sizes"
);
...
...
@@ -47,13 +58,22 @@ class PriorBoxOp : public framework::OperatorWithKernel {
size_t
num_priors
=
aspect_ratios_vec
.
size
()
*
min_sizes
.
size
();
if
(
max_sizes
.
size
()
>
0
)
{
PADDLE_ENFORCE_EQ
(
max_sizes
.
size
(),
min_sizes
.
size
(),
"The number of min_size and max_size must be equal."
);
PADDLE_ENFORCE_EQ
(
max_sizes
.
size
(),
min_sizes
.
size
(),
platform
::
errors
::
InvalidArgument
(
"The length of min_size and "
"max_size must be equal. But received: min_size's length is %d, "
"max_size's length is %d."
,
min_sizes
.
size
(),
max_sizes
.
size
()));
num_priors
+=
max_sizes
.
size
();
for
(
size_t
i
=
0
;
i
<
max_sizes
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
max_sizes
[
i
],
min_sizes
[
i
],
"max_size[%d] must be greater than min_size[%d]."
,
i
,
i
);
PADDLE_ENFORCE_GT
(
max_sizes
[
i
],
min_sizes
[
i
],
platform
::
errors
::
InvalidArgument
(
"max_size[%d] must be greater "
"than min_size[%d]. But received: max_size[%d] is %f, "
"min_size[%d] is %f."
,
i
,
i
,
i
,
max_sizes
[
i
],
i
,
min_sizes
[
i
]));
}
}
...
...
@@ -121,11 +141,16 @@ class PriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"(vector<float>) List of min sizes "
"of generated prior boxes."
)
.
AddCustomChecker
([](
const
std
::
vector
<
float
>&
min_sizes
)
{
PADDLE_ENFORCE_GT
(
min_sizes
.
size
(),
0
,
"Size of min_sizes must be at least 1."
);
PADDLE_ENFORCE_GT
(
min_sizes
.
size
(),
0
,
platform
::
errors
::
InvalidArgument
(
"Size of min_sizes must be "
"at least 1."
));
for
(
size_t
i
=
0
;
i
<
min_sizes
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
min_sizes
[
i
],
0.0
,
"min_sizes[%d] must be positive."
,
i
);
platform
::
errors
::
OutOfRange
(
"min_sizes[%d] must be larger "
"than 0. But received: min_sizes[%d] is %f."
,
i
,
i
,
min_sizes
[
i
]));
}
});
AddAttr
<
std
::
vector
<
float
>>
(
...
...
@@ -141,10 +166,16 @@ class PriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"(vector<float>) List of variances to be encoded in prior boxes."
)
.
AddCustomChecker
([](
const
std
::
vector
<
float
>&
variances
)
{
PADDLE_ENFORCE_EQ
(
variances
.
size
(),
4
,
"Must and only provide 4 variance."
);
platform
::
errors
::
InvalidArgument
(
"The length of variance must "
"be 4. But received: variances' length is %d."
,
variances
.
size
()));
for
(
size_t
i
=
0
;
i
<
variances
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
variances
[
i
],
0.0
,
"variance[%d] must be greater than 0."
,
i
);
platform
::
errors
::
OutOfRange
(
"variance[%d] must be greater "
"than 0. But received: variance[%d] = %f"
,
i
,
i
,
variances
[
i
]));
}
});
AddAttr
<
bool
>
(
"flip"
,
"(bool) Whether to flip aspect ratios."
)
...
...
@@ -156,13 +187,21 @@ class PriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"Prior boxes step across width, 0.0 for auto calculation."
)
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_w
)
{
PADDLE_ENFORCE_GE
(
step_w
,
0.0
,
"step_w should be larger than 0."
);
PADDLE_ENFORCE_GE
(
step_w
,
0.0
,
platform
::
errors
::
InvalidArgument
(
"step_w should be larger "
"than 0. But received: step_w = %f."
,
step_w
));
});
AddAttr
<
float
>
(
"step_h"
,
"Prior boxes step across height, 0.0 for auto calculation."
)
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_h
)
{
PADDLE_ENFORCE_GE
(
step_h
,
0.0
,
"step_h should be larger than 0."
);
PADDLE_ENFORCE_GE
(
step_h
,
0.0
,
platform
::
errors
::
InvalidArgument
(
"step_h should be larger "
"than 0. But received: step_h = %f."
,
step_h
));
});
AddAttr
<
float
>
(
"offset"
,
...
...
python/paddle/fluid/layers/detection.py
浏览文件 @
da4a1db7
...
...
@@ -1764,6 +1764,8 @@ def prior_box(input,
"""
helper
=
LayerHelper
(
"prior_box"
,
**
locals
())
dtype
=
helper
.
input_dtype
()
check_variable_and_dtype
(
input
,
'input'
,
[
'uint8'
,
'int8'
,
'float32'
,
'float64'
],
'prior_box'
)
def
_is_list_or_tuple_
(
data
):
return
(
isinstance
(
data
,
list
)
or
isinstance
(
data
,
tuple
))
...
...
@@ -1942,18 +1944,18 @@ def density_prior_box(input,
"""
helper
=
LayerHelper
(
"density_prior_box"
,
**
locals
())
dtype
=
helper
.
input_dtype
()
check_variable_and_dtype
(
input
,
'input'
,
[
'float32'
,
'float64'
],
'density_prior_box'
)
def
_is_list_or_tuple_
(
data
):
return
(
isinstance
(
data
,
list
)
or
isinstance
(
data
,
tuple
))
if
not
_is_list_or_tuple_
(
densities
):
raise
TypeError
(
'densities should be a list or a tuple or None.'
)
if
not
_is_list_or_tuple_
(
fixed_sizes
):
raise
TypeError
(
'fixed_sizes should be a list or a tuple or None.'
)
if
not
_is_list_or_tuple_
(
fixed_ratios
):
raise
TypeError
(
'fixed_ratios should be a list or a tuple or None.'
)
check_type
(
densities
,
'densities'
,
(
list
,
tuple
),
'density_prior_box'
)
check_type
(
fixed_sizes
,
'fixed_sizes'
,
(
list
,
tuple
),
'density_prior_box'
)
check_type
(
fixed_ratios
,
'fixed_ratios'
,
(
list
,
tuple
),
'density_prior_box'
)
if
len
(
densities
)
!=
len
(
fixed_sizes
):
raise
ValueError
(
'densities and fixed_sizes length should be euqal.'
)
if
not
(
_is_list_or_tuple_
(
steps
)
and
len
(
steps
)
==
2
):
raise
ValueError
(
'steps should be a list or tuple '
,
'with length 2, (step_width, step_height).'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录