【PIR OpTest Fix No.31】 fix test_number_count_op (#60055)

DrRyanHuang · web-flow · commit 1fabb4517110 · 2023-12-18T19:06:38.000+08:00
* add numbercount

* add number_count to NEED_GEN_STATIC_ONLY_APIS

* revert ops_api_gen

* add NEED_GEN_STATIC_ONLY_APIS to number_count

* numbers =&gt; Numbers

* numbers =&gt; Numbers in py

* numbers =&gt; Numbers

* fix data_type err &amp;&amp; Numbers|numbers err

* Number revert
diff --git a/paddle/fluid/operators/number_count_op.cc b/paddle/fluid/operators/number_count_op.cc
@@ -46,7 +46,7 @@ class NumberCountOpMaker : public framework::OpProtoAndCheckerMaker {
   void Make() override {
     AddInput("numbers", "(Tensor) The input gate index tensor.");
     AddOutput("Out", "(Tensor) The output number count tensor.");
-    AddAttr<int>("upper_range", "（int), The number of different numbers.");
+    AddAttr<int>("upper_range", "(int), The number of different numbers.");
 
     AddComment(R"DOC(number_count Operator.count numbers.)DOC");
   }
diff --git a/paddle/fluid/pir/dialect/op_generator/ops_api_gen.py b/paddle/fluid/pir/dialect/op_generator/ops_api_gen.py
@@ -101,6 +101,7 @@
     'get_tensor_from_selected_rows',
     'print',
     'sequence_mask',
+    'number_count',
 ]
 
 NO_NEED_GEN_STATIC_ONLY_APIS = [
diff --git a/paddle/fluid/pir/dialect/operator/ir/ops.yaml b/paddle/fluid/pir/dialect/operator/ir/ops.yaml
@@ -1428,6 +1428,15 @@
   optional: dropout1_seed, dropout2_seed, linear1_bias, linear2_bias, ln1_scale, ln1_bias, ln2_scale, ln2_bias, ln2_mean, ln2_variance, ln1_mean, ln1_variance, ln1_out
   backward: fused_feedforward_grad
 
+- op: number_count
+  args: (Tensor numbers, int upper_range)
+  output: Tensor(out)
+  infer_meta:
+     func: NumberCountInferMeta
+  kernel:
+     func: number_count
+     data_type: numbers
+
 - op: sparse_momentum
   args: (Tensor param, Tensor grad, Tensor velocity, Tensor index, Tensor learning_rate, Tensor master_param,float mu, Scalar axis=0, bool use_nesterov=false,str regularization_method="", float regularization_coeff=0.0f, bool multi_precision=false, float rescale_grad=1.0f)
   output: Tensor(param_out), Tensor(velocity_out), Tensor(master_param_out)
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
@@ -3472,6 +3472,12 @@
   outputs :
     out : Out
 
+- op: number_count
+  inputs :
+    {numbers: numbers}
+  outputs :
+    out : Out
+
 - op: read_from_array
   inputs:
     array : X
diff --git a/paddle/phi/infermeta/unary.cc b/paddle/phi/infermeta/unary.cc
@@ -5313,6 +5313,12 @@ void StridedUnChangedInferMeta(const MetaTensor& x, MetaTensor* out) {
   out->set_strides(x.strides());
 }
 
+void NumberCountInferMeta(const MetaTensor& x,
+                          int upper_range,
+                          MetaTensor* out) {
+  out->share_meta(x);
+}
+
 }  // namespace phi
 
 PD_REGISTER_INFER_META_FN(flatten, phi::FlattenInferMeta);
diff --git a/paddle/phi/infermeta/unary.h b/paddle/phi/infermeta/unary.h
@@ -789,6 +789,10 @@ void UnStackInferMeta(const MetaTensor& x,
                       int num,
                       std::vector<MetaTensor*> outs);
 
+void NumberCountInferMeta(const MetaTensor& x,
+                          int upper_range,
+                          MetaTensor* out);
+
 void StridedUnChangedInferMeta(const MetaTensor& x, MetaTensor* out);
 
 }  // namespace phi
diff --git a/test/white_list/pir_op_test_white_list b/test/white_list/pir_op_test_white_list
@@ -219,6 +219,7 @@ test_nms_op
 test_nn_functional_hot_op
 test_nonzero_api
 test_norm_op
+test_number_count_op
 test_numel_op
 test_one_hot_v2_op
 test_one_hot_v2_op_static_build

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class NumberCountOpMaker : public framework::OpProtoAndCheckerMaker {`
`46`	`46`	`void Make() override {`
`47`	`47`	`AddInput("numbers", "(Tensor) The input gate index tensor.");`
`48`	`48`	`AddOutput("Out", "(Tensor) The output number count tensor.");`
`49`		`- AddAttr<int>("upper_range", "（int), The number of different numbers.");`
	`49`	`+ AddAttr<int>("upper_range", "(int), The number of different numbers.");`
`50`	`50`
`51`	`51`	`AddComment(R"DOC(number_count Operator.count numbers.)DOC");`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@`
`101`	`101`	`'get_tensor_from_selected_rows',`
`102`	`102`	`'print',`
`103`	`103`	`'sequence_mask',`
	`104`	`+ 'number_count',`
`104`	`105`	`]`
`105`	`106`
`106`	`107`	`NO_NEED_GEN_STATIC_ONLY_APIS = [`