Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
4bf1c163
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
4bf1c163
编写于
3月 23, 2023
作者:
I
Infinity_lee
提交者:
GitHub
3月 23, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support auto generate for nms (#51891)
上级
5bcdfbb0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
106 deletion
+17
-106
paddle/fluid/operators/detection/CMakeLists.txt
paddle/fluid/operators/detection/CMakeLists.txt
+0
-1
paddle/fluid/operators/detection/nms_op.cc
paddle/fluid/operators/detection/nms_op.cc
+0
-96
paddle/phi/api/yaml/legacy_ops.yaml
paddle/phi/api/yaml/legacy_ops.yaml
+0
-9
paddle/phi/api/yaml/op_compat.yaml
paddle/phi/api/yaml/op_compat.yaml
+8
-0
paddle/phi/api/yaml/ops.yaml
paddle/phi/api/yaml/ops.yaml
+9
-0
未找到文件。
paddle/fluid/operators/detection/CMakeLists.txt
浏览文件 @
4bf1c163
...
...
@@ -83,7 +83,6 @@ detection_library(sigmoid_focal_loss_op SRCS sigmoid_focal_loss_op.cc
sigmoid_focal_loss_op.cu
)
detection_library
(
retinanet_detection_output_op SRCS
retinanet_detection_output_op.cc
)
detection_library
(
nms_op SRCS nms_op.cc
)
if
(
WITH_GPU OR WITH_ROCM
)
set
(
TMPDEPS memory
)
...
...
paddle/fluid/operators/detection/nms_op.cc
已删除
100644 → 0
浏览文件 @
5bcdfbb0
/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <vector>
#include "paddle/fluid/framework/infershape_utils.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/platform/for_range.h"
#include "paddle/phi/core/infermeta_utils.h"
#include "paddle/phi/infermeta/unary.h"
namespace
paddle
{
namespace
operators
{
class
NMSOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
void
Make
()
override
{
AddInput
(
"Boxes"
,
"(Tensor) "
"Boxes is a Tensor with shape [N, 4] "
"N is the number of boxes "
"in last dimension in format [x1, x2, y1, y2] "
"the relation should be ``0 <= x1 < x2 && 0 <= y1 < y2``."
);
AddOutput
(
"KeepBoxesIdxs"
,
"(Tensor) "
"KeepBoxesIdxs is a Tensor with shape [N] "
);
AddAttr
<
float
>
(
"iou_threshold"
,
"iou_threshold is a threshold value used to compress similar boxes "
"boxes with IoU > iou_threshold will be considered as overlapping "
"and just one of them can be kept."
)
.
SetDefault
(
1.0
f
)
.
AddCustomChecker
([](
const
float
&
iou_threshold
)
{
PADDLE_ENFORCE_LE
(
iou_threshold
,
1.0
f
,
platform
::
errors
::
InvalidArgument
(
"iou_threshold should less equal than 1.0 "
"but got %f"
,
iou_threshold
));
PADDLE_ENFORCE_GE
(
iou_threshold
,
0.0
f
,
platform
::
errors
::
InvalidArgument
(
"iou_threshold should greater equal than 0.0 "
"but got %f"
,
iou_threshold
));
});
AddComment
(
R"DOC(
NMS Operator.
This Operator is used to perform Non-Maximum Compress for input boxes.
Indices of boxes kept by NMS will be sorted by scores and output.
)DOC"
);
}
};
class
NMSOp
:
public
framework
::
OperatorWithKernel
{
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
protected:
phi
::
KernelKey
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
phi
::
KernelKey
(
OperatorWithKernel
::
IndicateVarDataType
(
ctx
,
"Boxes"
),
ctx
.
GetPlace
());
}
};
template
<
typename
T
>
class
NMSKernel
:
public
framework
::
OpKernel
<
T
>
{};
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
DECLARE_INFER_SHAPE_FUNCTOR
(
nms
,
NMSInferMetaFunctor
,
PD_INFER_META
(
phi
::
NMSInferMeta
));
REGISTER_OPERATOR
(
nms
,
ops
::
NMSOp
,
ops
::
NMSOpMaker
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
framework
::
OpDesc
>
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
imperative
::
OpBase
>
,
NMSInferMetaFunctor
);
paddle/phi/api/yaml/legacy_ops.yaml
浏览文件 @
4bf1c163
...
...
@@ -1168,15 +1168,6 @@
inplace
:
(x -> out)
backward
:
multiply_grad
-
op
:
nms
args
:
(Tensor x, float threshold)
output
:
Tensor(out)
infer_meta
:
func
:
NMSInferMeta
kernel
:
func
:
nms
data_type
:
x
-
op
:
norm
args
:
(Tensor x, int axis, float epsilon, bool is_test)
output
:
Tensor(out), Tensor(norm)
...
...
paddle/phi/api/yaml/op_compat.yaml
浏览文件 @
4bf1c163
...
...
@@ -1281,6 +1281,14 @@
outputs
:
{
out
:
Out
,
total_weight
:
Total_weight
}
-
op
:
nms
inputs
:
x
:
Boxes
outputs
:
out
:
KeepBoxesIdxs
attrs
:
threshold
:
iou_threshold
-
op
:
nonzero (where_index)
inputs
:
condition
:
Condition
...
...
paddle/phi/api/yaml/ops.yaml
浏览文件 @
4bf1c163
...
...
@@ -1071,6 +1071,15 @@
optional
:
weight
backward
:
nll_loss_grad
-
op
:
nms
args
:
(Tensor x, float threshold = 1.0f)
output
:
Tensor(out)
infer_meta
:
func
:
NMSInferMeta
kernel
:
func
:
nms
data_type
:
x
-
op
:
nonzero
args
:
(Tensor condition)
output
:
Tensor(out)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录