add autogen code support for matrix_nms.

paddle/fluid/operators/detection/CMakeLists.txt

@@ -63,7 +63,6 @@ detection_library(generate_proposal_labels_op SRCS
                   generate_proposal_labels_op.cc)
 detection_library(multiclass_nms_op SRCS multiclass_nms_op.cc DEPS gpc)
 detection_library(locality_aware_nms_op SRCS locality_aware_nms_op.cc DEPS gpc)
-detection_library(matrix_nms_op SRCS matrix_nms_op.cc DEPS gpc)
 detection_library(box_clip_op SRCS box_clip_op.cc box_clip_op.cu)
 detection_library(yolov3_loss_op SRCS yolov3_loss_op.cc)
 detection_library(box_decoder_and_assign_op SRCS box_decoder_and_assign_op.cc

paddle/fluid/operators/generator/get_expected_kernel_func.cc

@@ -151,5 +151,12 @@ phi::KernelKey GetUpdateLossScalingExpectedKernelType(
   return phi::KernelKey(dtype, ctx.GetPlace());
 }
 
+phi::KernelKey GetMatrixNmsExpectedKernelType(
+    const framework::ExecutionContext& ctx,
+    const framework::OperatorWithKernel* op_ptr) {
+  return phi::KernelKey(op_ptr->IndicateVarDataType(ctx, "Scores"),
+                        platform::CPUPlace());
+}
+
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/generator/get_expected_kernel_func.h

@@ -40,5 +40,9 @@ phi::KernelKey GetUpdateLossScalingExpectedKernelType(
     const framework::ExecutionContext& ctx,
     const framework::OperatorWithKernel* op_ptr);
 
+phi::KernelKey GetMatrixNmsExpectedKernelType(
+    const framework::ExecutionContext& ctx,
+    const framework::OperatorWithKernel* op_ptr);
+
 }  // namespace operators
 }  // namespace paddle

paddle/phi/api/yaml/legacy_ops.yaml

@@ -935,14 +935,6 @@
     func : matmul
   backward : matmul_grad
 
-- op : matrix_nms
-  args : (Tensor bboxes, Tensor scores, float score_threshold, int nms_top_k, int keep_top_k, float post_threshold=0., bool use_gaussian = false, float gaussian_sigma = 2.0, int background_label = 0, bool normalized = true)
-  output : Tensor(out), Tensor(index), Tensor(roisnum)
-  infer_meta :
-    func : MatrixNMSInferMeta
-  kernel :
-    func : matrix_nms
-
 - op : matrix_rank
   args : (Tensor x, float tol, bool hermitian=false, bool use_default_tol=true)
   output : Tensor(out)

paddle/phi/api/yaml/op_compat.yaml

@@ -1237,6 +1237,14 @@
     attrs : [bool use_mkldnn = false, float scale_x = 1.0f, 'float[] scale_y = {1.0f}',
              float scale_out = 1.0f, bool force_fp32_output = false]
 
+- op : matrix_nms
+  inputs :
+    {bboxes : BBoxes, scores : Scores}
+  outputs :
+    {out : Out, index : Index, roisnum : RoisNum}
+  get_expected_kernel_type :
+    matrix_nms : GetMatrixNmsExpectedKernelType
+
 - op : matrix_power
   inputs :
     x : X

paddle/phi/api/yaml/op_version.yaml

@@ -131,6 +131,13 @@
           comment : In order to change output data type
           default : 5
 
+- op : matrix_nms
+  version :
+    - checkpoint : Upgrade matrix_nms, add a new output [RoisNum].
+      action :
+        - add_output : RoisNum
+          comment : The number of RoIs in each image.
+
 - op : not_equal
   version :
     - checkpoint : Upgrade compare ops, add a new attribute [force_cpu]

paddle/phi/api/yaml/ops.yaml

@@ -1001,6 +1001,15 @@
     data_type : x
   backward : masked_select_grad
 
+- op : matrix_nms
+  args : (Tensor bboxes, Tensor scores, float score_threshold, int nms_top_k, int keep_top_k, float post_threshold=0., bool use_gaussian = false, float gaussian_sigma = 2., int background_label = 0, bool normalized = true)
+  output : Tensor(out), Tensor(index), Tensor(roisnum)
+  infer_meta :
+    func : MatrixNMSInferMeta
+  optional : roisnum
+  kernel :
+    func : matrix_nms
+
 - op : matrix_power
   args : (Tensor x, int n)
   output : Tensor