Replace with dygraph op calling method. (PaddlePaddle#44331)

* Replace with dygraph op calling method.
Aurelius84 · Jul 29, 2022 · d7bf615 · d7bf615
1 parent 64422b7
commit d7bf615
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/python/paddle/fluid/dygraph/math_op_patch.py b/python/paddle/fluid/dygraph/math_op_patch.py
@@ -376,8 +376,11 @@ def __impl__(self, other_var):
         if framework._in_eager_mode_ else
         ('__rtruediv__',
          _binary_creator_('rtruediv__', 'elementwise_div', True, None)),
-        ('__pow__', _binary_creator_('__pow__', 'elementwise_pow', False,
-                                     None)),
+        ('__pow__',
+         _binary_creator_('__pow__', 'final_state_elementwise_pow', False, None,
+                          True)) if framework._in_eager_mode_ else
+        ('__pow__',
+         _binary_creator_('__pow__', 'elementwise_pow', False, None)),
         ('__rpow__', _binary_creator_('__rpow__', 'elementwise_pow', True,
                                       None)),
         ('__floordiv__',

diff --git a/python/paddle/fluid/tests/unittests/test_var_base.py b/python/paddle/fluid/tests/unittests/test_var_base.py
@@ -1776,7 +1776,7 @@ def test_eager_tensor_grad_name_value(self):
             b = a**2
             self.assertEqual(a._grad_value(), None)
             b.backward()
-            self.assertEqual('eager_in_tmp' in a._grad_name(), True)
+            # Note, for new dygraph, there are no generated grad name, so we skip the name check.
             self.assertNotEqual(a._grad_value(), None)
 
 

diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -663,8 +663,12 @@ def eye(num_rows, num_columns=None, dtype=None, name=None):
         num_columns = num_rows
 
     if _non_static_mode():
-        out = _C_ops.eye('dtype', dtype, 'num_rows', num_rows, 'num_columns',
-                         num_columns)
+        if in_dygraph_mode():
+            out = _C_ops.final_state_eye(num_rows, num_columns, dtype,
+                                         _current_expected_place())
+        elif _in_legacy_dygraph():
+            out = _C_ops.eye('dtype', dtype, 'num_rows', num_rows,
+                             'num_columns', num_columns)
 
     else:
         helper = LayerHelper("eye", **locals())

diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -2705,8 +2705,7 @@ def scatter_nd_add(x, index, updates, name=None):
             # [3, 5, 9, 10]
     """
     if in_dygraph_mode():
-        op = getattr(_C_ops, 'scatter_nd_add')
-        return op(x, index, updates)
+        return _C_ops.final_state_scatter_nd_add(x, index, updates)
     else:
         if _in_legacy_dygraph():
             op = getattr(_C_ops, 'scatter_nd_add')
@@ -3002,7 +3001,7 @@ def broadcast_to(x, shape, name=None):
             # [[1, 2, 3], [1, 2, 3]]
     """
     if paddle.in_dynamic_mode():
-        return _C_ops.expand_v2(x, 'shape', shape)
+        return _C_ops.final_state_expand(x, shape)
 
     if isinstance(shape, Variable):
         assert len(shape.shape) == 1, ('shape must be an 1-D Tensor.')