Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support the 'generate_proposals' for generating static graph ops #52940

Merged
merged 8 commits into from
Apr 24, 2023
Merged

support the 'generate_proposals' for generating static graph ops #52940

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c63a22
support the 'generate_proposals' for generating static graph ops
longranger2 Apr 14, 2023
4334702
fix bug
longranger2 Apr 15, 2023
4061de6
fix bug
longranger2 Apr 17, 2023
edf7973
Update ops.yaml
longranger2 Apr 18, 2023
b0ce785
remove the generate_proposals_v2_op.cc from CMakeLists.txt
longranger2 Apr 19, 2023
46eade5
Merge branch 'generate_proposals' of https://github.com/longranger2/P…
longranger2 Apr 19, 2023
2099fc6
fix bug
longranger2 Apr 20, 2023
4d35bf9
fix bug
longranger2 Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions paddle/fluid/operators/detection/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ if(WITH_XPU)
detection_library(iou_similarity_op SRCS iou_similarity_op.cc
iou_similarity_op_xpu.cc)
detection_library(prior_box_op SRCS prior_box_op.cc)
detection_library(generate_proposals_v2_op SRCS generate_proposals_v2_op.cc)
else()
detection_library(iou_similarity_op SRCS iou_similarity_op.cc
iou_similarity_op.cu)
detection_library(prior_box_op SRCS prior_box_op.cc)
# detection_library(generate_proposals_v2_op SRCS generate_proposals_v2_op.cc)
endif()

detection_library(bipartite_match_op SRCS bipartite_match_op.cc)
Expand Down Expand Up @@ -74,17 +72,12 @@ if(WITH_GPU OR WITH_ROCM)
endif()
detection_library(generate_proposals_op SRCS generate_proposals_op.cc
generate_proposals_op.cu DEPS ${TMPDEPS})
detection_library(generate_proposals_v2_op SRCS generate_proposals_v2_op.cc
DEPS ${TMPDEPS})
detection_library(distribute_fpn_proposals_op SRCS
distribute_fpn_proposals_op.cc DEPS ${TMPDEPS})
detection_library(collect_fpn_proposals_op SRCS collect_fpn_proposals_op.cc
collect_fpn_proposals_op.cu DEPS ${TMPDEPS})
else()
detection_library(generate_proposals_op SRCS generate_proposals_op.cc)
if(NOT WITH_XPU)
detection_library(generate_proposals_v2_op SRCS generate_proposals_v2_op.cc)
endif()
detection_library(distribute_fpn_proposals_op SRCS
distribute_fpn_proposals_op.cc)
detection_library(collect_fpn_proposals_op SRCS collect_fpn_proposals_op.cc)
Expand Down
126 changes: 0 additions & 126 deletions paddle/fluid/operators/detection/generate_proposals_v2_op.cc
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions paddle/phi/api/yaml/legacy_ops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,14 +590,6 @@
data_type : dtype
backend : place

- op : generate_proposals
args : (Tensor scores, Tensor bbox_deltas, Tensor im_shape, Tensor anchors, Tensor variances, int pre_nms_top_n, int post_nms_top_n, float nms_thresh, float min_size, float eta, bool pixel_offset=true)
output : Tensor(rpn_rois), Tensor(rpn_roi_probs), Tensor(rpn_rois_num)
infer_meta :
func : GenerateProposalsV2InferMeta
kernel :
func : generate_proposals

- op : greater_equal
args : (Tensor x, Tensor y)
output : Tensor(out)
Expand Down
6 changes: 6 additions & 0 deletions paddle/phi/api/yaml/op_compat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,12 @@
extra :
attrs : [bool use_mkldnn = false, str mkldnn_data_type = "float32"]

- op : generate_proposals(generate_proposals_v2)
inputs :
{scores : Scores, bbox_deltas : BboxDeltas, im_shape : ImShape, anchors : Anchors, variances : Variances, pre_nms_top_n : pre_nms_topN, post_nms_top_n : post_nms_topN}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inputs里只会有tensor类型的参数，其余类型的要配置到attrs中，可以参考其他算子的配置。

Copy link
Contributor Author

@longranger2 longranger2 Apr 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

原来是这样，之前就好奇 inputs 和 attrs有什么区别，看到有的用inputs，有的用 attrs，还以为这两个都可以

outputs :
{rpn_rois : RpnRois, rpn_roi_probs : RpnRoiProbs, rpn_rois_num : RpnRoisNum}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以通过ci-py3的错误信息同时结合xxx_op.cc文件，这里有部分attrs的name名字也需要映射。仔细对比xxx_op.cc文件和yaml中的名字进行修改，如"pre_nms_top_n"，请全面对比名字。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的👌


- op : grad_add
extra :
attrs : [bool use_mkldnn = false, str x_data_format = "", str y_data_format = "", str mkldnn_data_type = "float32",
Expand Down
8 changes: 8 additions & 0 deletions paddle/phi/api/yaml/op_version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@
comment : "The arg 'default_value' of attr 'shape' is changed: from 'None' to '{}'."
default : std::vector<int64_t>{}

- op : generate_proposals
version :
- checkpoint : Registe generate_proposals_v2 for adding the attribute of pixel_offset
action :
- add_attr : pixel_offset
comment : If true, im_shape pixel offset is 1.
default : "true"

- op : greater_equal
version :
- checkpoint : Upgrade compare ops, add a new attribute [force_cpu]
Expand Down
10 changes: 10 additions & 0 deletions paddle/phi/api/yaml/ops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,16 @@
func : gelu
backward : gelu_grad

- op : generate_proposals
args : (Tensor scores, Tensor bbox_deltas, Tensor im_shape, Tensor anchors, Tensor variances, int pre_nms_top_n, int post_nms_top_n, float nms_thresh, float min_size, float eta, bool pixel_offset=true)
output : Tensor(rpn_rois), Tensor(rpn_roi_probs), Tensor(rpn_rois_num)
infer_meta :
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

增加optional : rpn_rois_num

func : GenerateProposalsV2InferMeta
kernel :
func : generate_proposals
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

增加data_type : anchors

data_type : anchors
optional : rpn_rois_num
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

参考其他ops的optional data_type配置设置一下，这里的参数格式不对


- op : grid_sample
args : (Tensor x, Tensor grid, str mode = "bilinear", str padding_mode = "zeros", bool align_corners = true)
output : Tensor(out)
Expand Down
19 changes: 0 additions & 19 deletions paddle/phi/ops/compat/generate_proposals_sig.cc
View file
Open in desktop

This file was deleted.