Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
47168259
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,发现更多精彩内容 >>
未验证
提交
47168259
编写于
2月 05, 2018
作者:
C
chengduo
提交者:
GitHub
2月 05, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8151 from chengduoZH/fixbug/prior_box
Refine prior_box_op
上级
845058ae
f367ad6c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
68 addition
and
44 deletion
+68
-44
paddle/operators/prior_box_op.cc
paddle/operators/prior_box_op.cc
+40
-29
paddle/operators/prior_box_op.h
paddle/operators/prior_box_op.h
+28
-15
未找到文件。
paddle/operators/prior_box_op.cc
浏览文件 @
47168259
...
...
@@ -44,12 +44,6 @@ class PriorBoxOp : public framework::OperatorWithKernel {
auto
aspect_ratios
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
float
>>
(
"aspect_ratios"
);
bool
flip
=
ctx
->
Attrs
().
Get
<
bool
>
(
"flip"
);
PADDLE_ENFORCE_GT
(
min_sizes
.
size
(),
0
,
"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
,
"min_sizes[%d] must be positive."
,
i
);
}
std
::
vector
<
float
>
aspect_ratios_vec
;
ExpandAspectRatios
(
aspect_ratios
,
flip
,
aspect_ratios_vec
);
...
...
@@ -65,17 +59,6 @@ class PriorBoxOp : public framework::OperatorWithKernel {
}
}
PADDLE_ENFORCE_EQ
(
variances
.
size
(),
4
,
"Must and only provide 4 variance."
);
for
(
size_t
i
=
0
;
i
<
variances
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
variances
[
i
],
0.0
,
"variance[%d] must be greater than 0."
,
i
);
}
const
float
step_h
=
ctx
->
Attrs
().
Get
<
float
>
(
"step_h"
);
PADDLE_ENFORCE_GT
(
step_h
,
0.0
,
"step_h should be larger than 0."
);
const
float
step_w
=
ctx
->
Attrs
().
Get
<
float
>
(
"step_w"
);
PADDLE_ENFORCE_GT
(
step_w
,
0.0
,
"step_w should be larger than 0."
);
std
::
vector
<
int64_t
>
dim_vec
(
4
);
dim_vec
[
0
]
=
input_dims
[
2
];
dim_vec
[
1
]
=
input_dims
[
3
];
...
...
@@ -106,26 +89,54 @@ class PriorBoxOpMaker : public framework::OpProtoAndCheckerMaker {
"PriorBoxOp. The layout is [H, W, num_priors, 4]. "
"H is the height of input, W is the width of input, num_priors "
"is the box count of each position."
);
AddAttr
<
std
::
vector
<
int
>>
(
"min_sizes"
,
"(vector<int>) "
,
"List of min sizes of generated prior boxes."
);
AddAttr
<
std
::
vector
<
int
>>
(
"max_sizes"
,
"(vector<int>) "
,
"List of max sizes of generated prior boxes."
);
AddAttr
<
std
::
vector
<
int
>>
(
"min_sizes"
,
"(vector<int>) List of min sizes "
"of generated prior boxes."
)
.
AddCustomChecker
([](
const
std
::
vector
<
int
>&
min_sizes
)
{
PADDLE_ENFORCE_GT
(
min_sizes
.
size
(),
0
,
"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
,
"min_sizes[%d] must be positive."
,
i
);
}
});
AddAttr
<
std
::
vector
<
int
>>
(
"max_sizes"
,
"(vector<int>) List of max sizes of generated prior boxes."
);
AddAttr
<
std
::
vector
<
float
>>
(
"aspect_ratios"
,
"(vector<float>) "
,
"List of aspect ratios of generated prior boxes."
);
"aspect_ratios"
,
"(vector<float>) List of aspect ratios of generated prior boxes."
);
AddAttr
<
std
::
vector
<
float
>>
(
"variances"
,
"(vector<float>) "
,
"List of variances to be encoded in prior boxes."
);
AddAttr
<
bool
>
(
"flip"
,
"(bool) "
,
"Whether to flip aspect ratios."
)
"variances"
,
"(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."
);
for
(
size_t
i
=
0
;
i
<
variances
.
size
();
++
i
)
{
PADDLE_ENFORCE_GT
(
variances
[
i
],
0.0
,
"variance[%d] must be greater than 0."
,
i
);
}
});
AddAttr
<
bool
>
(
"flip"
,
"(bool) Whether to flip aspect ratios."
)
.
SetDefault
(
true
);
AddAttr
<
bool
>
(
"clip"
,
"(bool)
"
,
"
Whether to clip out-of-boundary boxes."
)
AddAttr
<
bool
>
(
"clip"
,
"(bool) Whether to clip out-of-boundary boxes."
)
.
SetDefault
(
true
);
AddAttr
<
float
>
(
"step_w"
,
"Prior boxes step across width, 0 for auto calculation."
)
.
SetDefault
(
0.0
);
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_w
)
{
PADDLE_ENFORCE_GT
(
step_w
,
0.0
,
"step_w should be larger than 0."
);
});
AddAttr
<
float
>
(
"step_h"
,
"Prior boxes step across height, 0 for auto calculation."
)
.
SetDefault
(
0.0
);
.
SetDefault
(
0.0
)
.
AddCustomChecker
([](
const
float
&
step_h
)
{
PADDLE_ENFORCE_GT
(
step_h
,
0.0
,
"step_h should be larger than 0."
);
});
AddAttr
<
float
>
(
"offset"
,
"(float) "
"Prior boxes center offset."
)
...
...
paddle/operators/prior_box_op.h
浏览文件 @
47168259
...
...
@@ -25,7 +25,7 @@ inline void ExpandAspectRatios(const std::vector<float>& input_aspect_ratior,
std
::
vector
<
float
>&
output_aspect_ratior
)
{
constexpr
float
epsilon
=
1e-6
;
output_aspect_ratior
.
clear
();
output_aspect_ratior
.
push_back
(
1.
);
output_aspect_ratior
.
push_back
(
1.
0
f
);
for
(
size_t
i
=
0
;
i
<
input_aspect_ratior
.
size
();
++
i
)
{
float
ar
=
input_aspect_ratior
[
i
];
bool
already_exist
=
false
;
...
...
@@ -38,7 +38,7 @@ inline void ExpandAspectRatios(const std::vector<float>& input_aspect_ratior,
if
(
!
already_exist
)
{
output_aspect_ratior
.
push_back
(
ar
);
if
(
flip
)
{
output_aspect_ratior
.
push_back
(
1.
/
ar
);
output_aspect_ratior
.
push_back
(
1.
0
f
/
ar
);
}
}
}
...
...
@@ -46,7 +46,7 @@ inline void ExpandAspectRatios(const std::vector<float>& input_aspect_ratior,
template
<
typename
T
>
struct
ClipFunctor
{
HOSTDEVICE
T
operator
()(
T
in
)
const
{
HOSTDEVICE
inline
T
operator
()(
T
in
)
const
{
return
std
::
min
<
T
>
(
std
::
max
<
T
>
(
in
,
0.
),
1.
);
}
};
...
...
@@ -97,6 +97,9 @@ class PriorBoxOpKernel : public framework::OpKernel<T> {
boxes
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
vars
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
T
inv_img_width
=
1.0
/
img_width
;
T
inv_img_height
=
1.0
/
img_height
;
auto
e_boxes
=
framework
::
EigenTensor
<
T
,
4
>::
From
(
*
boxes
);
for
(
int
h
=
0
;
h
<
feature_height
;
++
h
)
{
for
(
int
w
=
0
;
w
<
feature_width
;
++
w
)
{
...
...
@@ -109,13 +112,15 @@ class PriorBoxOpKernel : public framework::OpKernel<T> {
// first prior: aspect_ratio = 1, size = min_size
box_width
=
box_height
=
min_size
;
// xmin
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
*
0.5
)
*
inv_
img_width
;
// ymin
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
*
0.5
)
*
inv_img_height
;
// xmax
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
*
0.5
)
*
inv_
img_width
;
// ymax
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
*
0.5
)
*
inv_img_height
;
idx
++
;
if
(
max_sizes
.
size
()
>
0
)
{
...
...
@@ -124,13 +129,17 @@ class PriorBoxOpKernel : public framework::OpKernel<T> {
// size = sqrt(min_size * max_size)
box_width
=
box_height
=
sqrt
(
min_size
*
max_size
);
// xmin
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
*
0.5
)
*
inv_img_width
;
// ymin
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
*
0.5
)
*
inv_img_height
;
// xmax
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
*
0.5
)
*
inv_img_width
;
// ymax
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
*
0.5
)
*
inv_img_height
;
idx
++
;
}
...
...
@@ -143,13 +152,17 @@ class PriorBoxOpKernel : public framework::OpKernel<T> {
box_width
=
min_size
*
sqrt
(
ar
);
box_height
=
min_size
/
sqrt
(
ar
);
// xmin
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
0
)
=
(
center_x
-
box_width
*
0.5
)
*
inv_img_width
;
// ymin
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
1
)
=
(
center_y
-
box_height
*
0.5
)
*
inv_img_height
;
// xmax
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
/
2.
)
/
img_width
;
e_boxes
(
h
,
w
,
idx
,
2
)
=
(
center_x
+
box_width
*
0.5
)
*
inv_img_width
;
// ymax
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
/
2.
)
/
img_height
;
e_boxes
(
h
,
w
,
idx
,
3
)
=
(
center_y
+
box_height
*
0.5
)
*
inv_img_height
;
idx
++
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录