【Infer Symbolic Shape No.17】【BUAA】Add ClassCenterSample, changed 4 files (#67434)

Whsjrczr · web-flow · commit fee072066c43 · 2024-09-18T15:08:09.000+08:00
* add 3 files

* update .cc

* undo change in .cc file

* update num_samples in .cc

* attribute

* update

* update

* update

* update

* update

* update

* update

* updata

* updata

* update

* update

* update

* update

* update

* update

* u

* {-1}

* update class_center_sample

* Update unary_infer_sym.cc

* out_unknown

* Expr -&gt; Exprs

* delete num_samples

* update annotation and test

* update shape

* shape

* redo "num_samples"

* update ".cc"

* update codestyle

* change codesty

* change shape

* reopen symbol infer check

* update out_sample

* rerun

* rerun

* delete unused variable

* rerun
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc
@@ -594,6 +594,32 @@ bool CholeskyOpInferSymbolicShape(
   return true;
 }
 
+bool ClassCenterSampleOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const auto &label_shape_or_data =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+
+  PADDLE_ENFORCE_EQ(label_shape_or_data.shape().size(),
+                    1,
+                    common::errors::InvalidArgument(
+                        "Rank of Input(Label) should be equal to 1, "
+                        "but the value given is %d.",
+                        label_shape_or_data.shape().size()));
+
+  infer_context->SetShapeOrDataForValue(
+      op->result(0),
+      symbol::TensorShapeOrDataDimExprs(label_shape_or_data.shape()));
+
+  symbol::DimExpr out_unknown = infer_context->GetNextSymName();
+  const std::vector<symbol::DimExpr> out_dims = {out_unknown};
+  const symbol::ShapeOrDataDimExprs sampled_local_class_center_dims{
+      symbol::TensorShapeOrDataDimExprs(out_dims)};
+  infer_context->SetShapeOrDataForValue(op->result(1),
+                                        sampled_local_class_center_dims);
+
+  return true;
+}
+
 bool ClipByNormOpInferSymbolicShape(
     pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
   const auto &input_shape =
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h
@@ -36,6 +36,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(BipartiteMatch)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Cast)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Cast_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Cholesky)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(ClassCenterSample)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(ClipByNorm)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(ClipByNormSr)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Cummax)
diff --git a/paddle/phi/infermeta/unary.cc b/paddle/phi/infermeta/unary.cc
@@ -586,7 +586,7 @@ void ClassCenterSampleInferMeta(const MetaTensor& label,
           "output of sampled local class center should not be null."));
   remapped_label->set_dims(label.dims());
   remapped_label->set_dtype(label.dtype());
-  sampled_local_class_center->set_dims(common::make_ddim({num_samples}));
+  sampled_local_class_center->set_dims(common::make_ddim({-1}));
   sampled_local_class_center->set_dtype(label.dtype());
 }
 
diff --git a/paddle/phi/ops/yaml/ops.yaml b/paddle/phi/ops/yaml/ops.yaml
@@ -906,6 +906,7 @@
     func : class_center_sample
     data_type : label
   traits : pir::SideEffectTrait
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : clip
   args : (Tensor x, Scalar(float) min, Scalar(float) max)
diff --git a/test/legacy_test/test_class_center_sample_op.py b/test/legacy_test/test_class_center_sample_op.py
@@ -115,7 +115,9 @@ def setUp(self):
 
     def test_check_output(self):
         self.check_output(
-            no_check_set=['SampledLocalClassCenter'], check_pir=True
+            no_check_set=['SampledLocalClassCenter'],
+            check_pir=True,
+            check_symbol_infer=False,
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ void ClassCenterSampleInferMeta(const MetaTensor& label,`
`586`	`586`	`"output of sampled local class center should not be null."));`
`587`	`587`	`remapped_label->set_dims(label.dims());`
`588`	`588`	`remapped_label->set_dtype(label.dtype());`
`589`		`- sampled_local_class_center->set_dims(common::make_ddim({num_samples}));`
	`589`	`+ sampled_local_class_center->set_dims(common::make_ddim({-1}));`
`590`	`590`	`sampled_local_class_center->set_dtype(label.dtype());`
`591`	`591`	`}`
`592`	`592`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ def setUp(self):`
`115`	`115`
`116`	`116`	`def test_check_output(self):`
`117`	`117`	`self.check_output(`
`118`		`- no_check_set=['SampledLocalClassCenter'], check_pir=True`
	`118`	`+ no_check_set=['SampledLocalClassCenter'],`
	`119`	`+ check_pir=True,`
	`120`	`+ check_symbol_infer=False,`
`119`	`121`	`)`
`120`	`122`
`121`	`123`