Support code generation for op fill_any (#54378)

huangjiyi · web-flow · commit 4277f61fabd3 · 2023-06-14T11:44:48.000+08:00
* update

* update
diff --git a/paddle/fluid/operators/fill_any_op.cc b/paddle/fluid/operators/fill_any_op.cc
diff --git a/paddle/phi/api/yaml/backward.yaml b/paddle/phi/api/yaml/backward.yaml
@@ -744,6 +744,17 @@
     func : fill_diagonal_tensor_grad
   inplace : (out_grad -> x_grad)
 
+- backward_op : fill_grad
+  forward : fill (Tensor x, Scalar value=0) -> Tensor(out)
+  args : (Tensor out_grad, Scalar value)
+  output : Tensor(x_grad)
+  infer_meta :
+    func : UnchangedInferMeta
+    param : [out_grad]
+  kernel :
+    func : fill_grad
+  inplace : (out_grad -> x_grad)
+
 - backward_op : flash_attn_grad
   forward : flash_attn (Tensor q, Tensor k, Tensor v, Tensor fixed_seed_offset, float dropout = 0.0, bool causal = false, bool return_softmax = false, bool is_test = false, str rng_name = "") -> Tensor(out), Tensor(softmax), Tensor(softmax_lse), Tensor(seed_offset)
   args : (Tensor q, Tensor k, Tensor v, Tensor out, Tensor softmax_lse, Tensor seed_offset, Tensor out_grad, float dropout = 0.0, bool causal = false)
diff --git a/paddle/phi/api/yaml/legacy_backward.yaml b/paddle/phi/api/yaml/legacy_backward.yaml
@@ -282,17 +282,6 @@
     func : UnchangedInferMeta
   invoke : zeros_like(out_grad)
 
-- backward_op : fill_grad
-  forward : fill (Tensor x, Scalar value) -> Tensor(out)
-  args : (Tensor out_grad, Scalar value)
-  output : Tensor(x_grad)
-  infer_meta :
-    func : UnchangedInferMeta
-    param : [out_grad]
-  kernel :
-    func : fill_grad
-  inplace : (out_grad -> x_grad)
-
 - backward_op : fmin_grad
   forward : fmin(Tensor x, Tensor y) -> Tensor(out)
   args : (Tensor x, Tensor y, Tensor out_grad)
diff --git a/paddle/phi/api/yaml/legacy_ops.yaml b/paddle/phi/api/yaml/legacy_ops.yaml
@@ -342,17 +342,6 @@
     data_type : dtype
     backend : place
 
-- op : fill
-  args : (Tensor x, Scalar value)
-  output : Tensor(out)
-  infer_meta :
-    func : UnchangedInferMeta
-    param : [x]
-  kernel :
-    func : fill
-  inplace : (x -> out)
-  backward: fill_grad
-
 - op : floor_divide
   args : (Tensor x, Tensor y)
   output : Tensor(out)
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
@@ -981,6 +981,17 @@
   inputs: {x: X}
   outputs: {out: Out}
 
+- op : fill (fill_any)
+  backward : fill_grad (fill_any_grad)
+  inputs :
+    x : X
+  outputs :
+    out : Out
+  scalar :
+    value :
+      data_type : float
+      support_tensor : true
+
 - op : fill_diagonal
   backward : fill_diagonal_grad
   inputs :
diff --git a/paddle/phi/api/yaml/ops.yaml b/paddle/phi/api/yaml/ops.yaml
@@ -801,6 +801,17 @@
     func : fft_r2c
   backward : fft_r2c_grad
 
+- op : fill
+  args : (Tensor x, Scalar value=0)
+  output : Tensor(out)
+  infer_meta :
+    func : UnchangedInferMeta
+    param : [x]
+  kernel :
+    func : fill
+  inplace : (x -> out)
+  backward: fill_grad
+
 - op : fill_diagonal
   args : (Tensor x, float value=0, int offset=0, bool wrap=false)
   output : Tensor(out)
diff --git a/paddle/phi/ops/compat/fill_sig.cc b/paddle/phi/ops/compat/fill_sig.cc
diff --git a/test/legacy_test/test_fill_any_op.py b/test/legacy_test/test_fill_any_op.py
@@ -20,10 +20,8 @@
 import paddle
 
 
-def fill_any_wrapper(x, value_float=0, value_int=0):
-    return paddle._legacy_C_ops.fill_any(
-        x, "value_float", value_float, "value_int", value_int
-    )
+def fill_any_wrapper(x, value=0):
+    return paddle._legacy_C_ops.fill_any(x, "value", value)
 
 
 class TestFillAnyOp(OpTest):
@@ -34,10 +32,7 @@ def setUp(self):
         self.value = 0.0
         self.init()
         self.inputs = {'X': np.random.random((20, 30)).astype(self.dtype)}
-        self.attrs = {
-            'value_float': float(self.value),
-            'value_int': int(self.value),
-        }
+        self.attrs = {'value': float(self.value)}
         self.outputs = {
             'Out': self.value
             * np.ones_like(self.inputs["X"]).astype(self.dtype)
diff --git a/test/xpu/test_fill_any_op_xpu.py b/test/xpu/test_fill_any_op_xpu.py
@@ -39,10 +39,7 @@ def setUp(self):
             self.value = 0.0
             self.init()
             self.inputs = {'X': np.random.random((20, 30)).astype(self.dtype)}
-            self.attrs = {
-                'value_float': float(self.value),
-                'value_int': int(self.value),
-            }
+            self.attrs = {'value': float(self.value)}
             self.outputs = {
                 'Out': self.value
                 * np.ones_like(self.inputs["X"]).astype(self.dtype)
