Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
9eefd2c7
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
9eefd2c7
编写于
11月 19, 2018
作者:
Q
qingqing01
提交者:
GitHub
11月 19, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify some infer-shape about detection operators in compile-time. (#14483)
* Modify some infer-shape in compile-time.
上级
cf685f36
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
42 deletion
+43
-42
paddle/fluid/operators/detection/box_coder_op.cc
paddle/fluid/operators/detection/box_coder_op.cc
+23
-20
paddle/fluid/operators/detection/multiclass_nms_op.cc
paddle/fluid/operators/detection/multiclass_nms_op.cc
+20
-18
python/paddle/fluid/layers/detection.py
python/paddle/fluid/layers/detection.py
+0
-4
未找到文件。
paddle/fluid/operators/detection/box_coder_op.cc
浏览文件 @
9eefd2c7
...
@@ -30,27 +30,30 @@ class BoxCoderOp : public framework::OperatorWithKernel {
...
@@ -30,27 +30,30 @@ class BoxCoderOp : public framework::OperatorWithKernel {
auto
prior_box_dims
=
ctx
->
GetInputDim
(
"PriorBox"
);
auto
prior_box_dims
=
ctx
->
GetInputDim
(
"PriorBox"
);
auto
target_box_dims
=
ctx
->
GetInputDim
(
"TargetBox"
);
auto
target_box_dims
=
ctx
->
GetInputDim
(
"TargetBox"
);
PADDLE_ENFORCE_EQ
(
prior_box_dims
.
size
(),
2
,
if
(
ctx
->
IsRuntime
())
{
"The rank of Input of PriorBoxVar must be 2"
);
PADDLE_ENFORCE_EQ
(
prior_box_dims
.
size
(),
2
,
PADDLE_ENFORCE_EQ
(
prior_box_dims
[
1
],
4
,
"The shape of PriorBox is [N, 4]"
);
"The rank of Input of PriorBoxVar must be 2"
);
if
(
ctx
->
HasInput
(
"PriorBoxVar"
))
{
PADDLE_ENFORCE_EQ
(
prior_box_dims
[
1
],
4
,
auto
prior_box_var_dims
=
ctx
->
GetInputDim
(
"PriorBoxVar"
);
"The shape of PriorBox is [N, 4]"
);
PADDLE_ENFORCE_EQ
(
prior_box_dims
,
prior_box_var_dims
);
if
(
ctx
->
HasInput
(
"PriorBoxVar"
))
{
auto
prior_box_var_dims
=
ctx
->
GetInputDim
(
"PriorBoxVar"
);
PADDLE_ENFORCE_EQ
(
prior_box_dims
,
prior_box_var_dims
);
}
auto
code_type
=
GetBoxCodeType
(
ctx
->
Attrs
().
Get
<
std
::
string
>
(
"code_type"
));
if
(
code_type
==
BoxCodeType
::
kEncodeCenterSize
)
{
PADDLE_ENFORCE_EQ
(
target_box_dims
.
size
(),
2
,
"The rank of Input of TargetBox must be 2"
);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
1
],
4
,
"The shape of TargetBox is [M, 4]"
);
}
else
if
(
code_type
==
BoxCodeType
::
kDecodeCenterSize
)
{
PADDLE_ENFORCE_EQ
(
target_box_dims
.
size
(),
3
,
"The rank of Input of TargetBox must be 3"
);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
1
],
prior_box_dims
[
0
]);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
2
],
prior_box_dims
[
1
]);
}
}
}
auto
code_type
=
GetBoxCodeType
(
ctx
->
Attrs
().
Get
<
std
::
string
>
(
"code_type"
));
if
(
code_type
==
BoxCodeType
::
kEncodeCenterSize
)
{
PADDLE_ENFORCE_EQ
(
target_box_dims
.
size
(),
2
,
"The rank of Input of TargetBox must be 2"
);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
1
],
4
,
"The shape of TargetBox is [M, 4]"
);
}
else
if
(
code_type
==
BoxCodeType
::
kDecodeCenterSize
)
{
PADDLE_ENFORCE_EQ
(
target_box_dims
.
size
(),
3
,
"The rank of Input of TargetBox must be 3"
);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
1
],
prior_box_dims
[
0
]);
PADDLE_ENFORCE_EQ
(
target_box_dims
[
2
],
prior_box_dims
[
1
]);
}
ctx
->
SetOutputDim
(
ctx
->
SetOutputDim
(
"OutputBox"
,
"OutputBox"
,
framework
::
make_ddim
({
target_box_dims
[
0
],
prior_box_dims
[
0
],
4
}));
framework
::
make_ddim
({
target_box_dims
[
0
],
prior_box_dims
[
0
],
4
}));
...
...
paddle/fluid/operators/detection/multiclass_nms_op.cc
浏览文件 @
9eefd2c7
...
@@ -36,24 +36,26 @@ class MultiClassNMSOp : public framework::OperatorWithKernel {
...
@@ -36,24 +36,26 @@ class MultiClassNMSOp : public framework::OperatorWithKernel {
auto
box_dims
=
ctx
->
GetInputDim
(
"BBoxes"
);
auto
box_dims
=
ctx
->
GetInputDim
(
"BBoxes"
);
auto
score_dims
=
ctx
->
GetInputDim
(
"Scores"
);
auto
score_dims
=
ctx
->
GetInputDim
(
"Scores"
);
PADDLE_ENFORCE_EQ
(
box_dims
.
size
(),
3
,
if
(
ctx
->
IsRuntime
())
{
"The rank of Input(BBoxes) must be 3."
);
PADDLE_ENFORCE_EQ
(
box_dims
.
size
(),
3
,
PADDLE_ENFORCE_EQ
(
score_dims
.
size
(),
3
,
"The rank of Input(BBoxes) must be 3."
);
"The rank of Input(Scores) must be 3."
);
PADDLE_ENFORCE_EQ
(
score_dims
.
size
(),
3
,
PADDLE_ENFORCE
(
box_dims
[
2
]
==
4
||
box_dims
[
2
]
==
8
||
box_dims
[
2
]
==
16
||
"The rank of Input(Scores) must be 3."
);
box_dims
[
2
]
==
24
||
box_dims
[
2
]
==
32
,
PADDLE_ENFORCE
(
box_dims
[
2
]
==
4
||
box_dims
[
2
]
==
8
||
"The 2nd dimension of Input(BBoxes) must be 4 or 8, "
box_dims
[
2
]
==
16
||
box_dims
[
2
]
==
24
||
"represents the layout of coordinate "
box_dims
[
2
]
==
32
,
"[xmin, ymin, xmax, ymax] or "
"The 2nd dimension of Input(BBoxes) must be 4 or 8, "
"4 points: [x1, y1, x2, y2, x3, y3, x4, y4] or "
"represents the layout of coordinate "
"8 points: [xi, yi] i= 1,2,...,8 or "
"[xmin, ymin, xmax, ymax] or "
"12 points: [xi, yi] i= 1,2,...,12 or "
"4 points: [x1, y1, x2, y2, x3, y3, x4, y4] or "
"16 points: [xi, yi] i= 1,2,...,16"
);
"8 points: [xi, yi] i= 1,2,...,8 or "
PADDLE_ENFORCE_EQ
(
box_dims
[
1
],
score_dims
[
2
],
"12 points: [xi, yi] i= 1,2,...,12 or "
"The 1st dimensiong of Input(BBoxes) must be equal to "
"16 points: [xi, yi] i= 1,2,...,16"
);
"3rd dimension of Input(Scores), which represents the "
PADDLE_ENFORCE_EQ
(
box_dims
[
1
],
score_dims
[
2
],
"predicted bboxes."
);
"The 1st dimensiong of Input(BBoxes) must be equal to "
"3rd dimension of Input(Scores), which represents the "
"predicted bboxes."
);
}
// Here the box_dims[0] is not the real dimension of output.
// Here the box_dims[0] is not the real dimension of output.
// It will be rewritten in the computing kernel.
// It will be rewritten in the computing kernel.
ctx
->
SetOutputDim
(
"Out"
,
{
box_dims
[
1
],
box_dims
[
2
]
+
2
});
ctx
->
SetOutputDim
(
"Out"
,
{
box_dims
[
1
],
box_dims
[
2
]
+
2
});
...
...
python/paddle/fluid/layers/detection.py
浏览文件 @
9eefd2c7
...
@@ -283,11 +283,7 @@ def detection_output(loc,
...
@@ -283,11 +283,7 @@ def detection_output(loc,
prior_box_var
=
prior_box_var
,
prior_box_var
=
prior_box_var
,
target_box
=
loc
,
target_box
=
loc
,
code_type
=
'decode_center_size'
)
code_type
=
'decode_center_size'
)
compile_shape
=
scores
.
shape
run_shape
=
nn
.
shape
(
scores
)
scores
=
nn
.
flatten
(
x
=
scores
,
axis
=
2
)
scores
=
nn
.
softmax
(
input
=
scores
)
scores
=
nn
.
softmax
(
input
=
scores
)
scores
=
nn
.
reshape
(
x
=
scores
,
shape
=
compile_shape
,
actual_shape
=
run_shape
)
scores
=
nn
.
transpose
(
scores
,
perm
=
[
0
,
2
,
1
])
scores
=
nn
.
transpose
(
scores
,
perm
=
[
0
,
2
,
1
])
scores
.
stop_gradient
=
True
scores
.
stop_gradient
=
True
nmsed_outs
=
helper
.
create_variable_for_type_inference
(
nmsed_outs
=
helper
.
create_variable_for_type_inference
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录