Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
24566e95
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
未验证
提交
24566e95
编写于
8月 24, 2020
作者:
Q
qingqing01
提交者:
GitHub
8月 24, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support empty bbox in bipartite math op (#26488)
上级
87843beb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
5 deletion
+25
-5
paddle/fluid/operators/detection/bipartite_match_op.cc
paddle/fluid/operators/detection/bipartite_match_op.cc
+6
-4
python/paddle/fluid/tests/unittests/test_bipartite_match_op.py
...n/paddle/fluid/tests/unittests/test_bipartite_match_op.py
+19
-1
未找到文件。
paddle/fluid/operators/detection/bipartite_match_op.cc
浏览文件 @
24566e95
...
@@ -222,10 +222,12 @@ class BipartiteMatchKernel : public framework::OpKernel<T> {
...
@@ -222,10 +222,12 @@ class BipartiteMatchKernel : public framework::OpKernel<T> {
}
else
{
}
else
{
auto
lod
=
dist_mat
->
lod
().
back
();
auto
lod
=
dist_mat
->
lod
().
back
();
for
(
size_t
i
=
0
;
i
<
lod
.
size
()
-
1
;
++
i
)
{
for
(
size_t
i
=
0
;
i
<
lod
.
size
()
-
1
;
++
i
)
{
Tensor
one_ins
=
dist_mat
->
Slice
(
lod
[
i
],
lod
[
i
+
1
]);
if
(
lod
[
i
+
1
]
>
lod
[
i
])
{
BipartiteMatch
(
one_ins
,
indices
+
i
*
col
,
dist
+
i
*
col
);
Tensor
one_ins
=
dist_mat
->
Slice
(
lod
[
i
],
lod
[
i
+
1
]);
if
(
type
==
"per_prediction"
)
{
BipartiteMatch
(
one_ins
,
indices
+
i
*
col
,
dist
+
i
*
col
);
ArgMaxMatch
(
one_ins
,
indices
+
i
*
col
,
dist
+
i
*
col
,
threshold
);
if
(
type
==
"per_prediction"
)
{
ArgMaxMatch
(
one_ins
,
indices
+
i
*
col
,
dist
+
i
*
col
,
threshold
);
}
}
}
}
}
}
}
...
...
python/paddle/fluid/tests/unittests/test_bipartite_match_op.py
浏览文件 @
24566e95
...
@@ -65,7 +65,7 @@ def batch_bipartite_match(distance, lod, match_type=None, dist_threshold=None):
...
@@ -65,7 +65,7 @@ def batch_bipartite_match(distance, lod, match_type=None, dist_threshold=None):
"""Bipartite Matching algorithm for batch input.
"""Bipartite Matching algorithm for batch input.
Arg:
Arg:
distance (numpy.array) : The distance of two entries with shape [M, N].
distance (numpy.array) : The distance of two entries with shape [M, N].
lod (list of int): The
offsets
of each input in this batch.
lod (list of int): The
length
of each input in this batch.
"""
"""
n
=
len
(
lod
)
n
=
len
(
lod
)
m
=
distance
.
shape
[
1
]
m
=
distance
.
shape
[
1
]
...
@@ -73,6 +73,7 @@ def batch_bipartite_match(distance, lod, match_type=None, dist_threshold=None):
...
@@ -73,6 +73,7 @@ def batch_bipartite_match(distance, lod, match_type=None, dist_threshold=None):
match_dist
=
np
.
zeros
((
n
,
m
),
dtype
=
np
.
float32
)
match_dist
=
np
.
zeros
((
n
,
m
),
dtype
=
np
.
float32
)
cur_offset
=
0
cur_offset
=
0
for
i
in
range
(
n
):
for
i
in
range
(
n
):
if
lod
[
i
]
==
0
:
continue
bipartite_match
(
distance
[
cur_offset
:(
cur_offset
+
lod
[
i
]),
:],
bipartite_match
(
distance
[
cur_offset
:(
cur_offset
+
lod
[
i
]),
:],
match_indices
[
i
,
:],
match_dist
[
i
,
:])
match_indices
[
i
,
:],
match_dist
[
i
,
:])
if
match_type
==
'per_prediction'
:
if
match_type
==
'per_prediction'
:
...
@@ -155,5 +156,22 @@ class TestBipartiteMatchOpWithPerPredictionType(OpTest):
...
@@ -155,5 +156,22 @@ class TestBipartiteMatchOpWithPerPredictionType(OpTest):
self
.
check_output
()
self
.
check_output
()
class
TestBipartiteMatchOpWithEmptyLoD
(
OpTest
):
def
setUp
(
self
):
self
.
op_type
=
'bipartite_match'
lod
=
[[
5
,
6
,
0
,
12
]]
dist
=
np
.
random
.
random
((
23
,
217
)).
astype
(
'float32'
)
match_indices
,
match_dist
=
batch_bipartite_match
(
dist
,
lod
[
0
])
self
.
inputs
=
{
'DistMat'
:
(
dist
,
lod
)}
self
.
outputs
=
{
'ColToRowMatchIndices'
:
match_indices
,
'ColToRowMatchDist'
:
match_dist
,
}
def
test_check_output
(
self
):
self
.
check_output
()
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录