Binding methods for class Tensor and Variable

Author: zhwesky2010

python/paddle/__init__.py

@@ -31,7 +31,6 @@
 import paddle.dataset
 import paddle.batch
 batch = batch.batch
-import paddle.tensor
 from .fluid import monkey_patch_variable
 from .fluid.dygraph import monkey_patch_math_varbase
 monkey_patch_variable()
@@ -42,7 +41,7 @@
 import paddle.compat
 import paddle.distributed
 import paddle.sysconfig
-
+import paddle.tensor
 import paddle.nn
 import paddle.distributed.fleet
 import paddle.optimizer

python/paddle/fluid/dygraph/__init__.py

@@ -59,6 +59,8 @@
 from . import amp
 from .amp import *
 
+from .math_op_patch import monkey_patch_math_varbase
+
 __all__ = []
 __all__ += layers.__all__
 __all__ += base.__all__

python/paddle/fluid/dygraph/math_op_patch.py

@@ -246,22 +246,36 @@ def __impl__(self):
  ('ndim', _ndim_),
  ('size', lambda x: x.shape),
  # Type2: From Template that create core.ops automatically. It's recommended.
- ('__add__', _binary_creator_('__add__', 'elementwise_add', False, _scalar_add_)),
+ ('__add__',
+ _binary_creator_('__add__', 'elementwise_add', False, _scalar_add_)),
  ## a+b == b+a. Do not need to reverse explicitly
- ('__radd__', _binary_creator_('__radd__', 'elementwise_add', False, _scalar_add_)),
- ('__sub__', _binary_creator_('__sub__', 'elementwise_sub', False, _scalar_sub_)),
- ('__rsub__', _binary_creator_('__rsub__', 'elementwise_sub', True, _scalar_rsub_)),
- ('__mul__', _binary_creator_('__mul__', 'elementwise_mul', False, _scalar_mul_)),
+ ('__radd__',
+ _binary_creator_('__radd__', 'elementwise_add', False, _scalar_add_)),
+ ('__sub__', _binary_creator_('__sub__', 'elementwise_sub', False,
+ _scalar_sub_)),
+ ('__rsub__', _binary_creator_('__rsub__', 'elementwise_sub', True,
+ _scalar_rsub_)),
+ ('__mul__', _binary_creator_('__mul__', 'elementwise_mul', False,
+ _scalar_mul_)),
  ## a*b == b*a. Do not need to reverse explicitly
- ('__rmul__', _binary_creator_('__rmul__', 'elementwise_mul', False, _scalar_mul_)),
- ('__div__', _binary_creator_('__div__', 'elementwise_div', False, _scalar_div_)),
- ('__truediv__', _binary_creator_('__truediv__', 'elementwise_div', False, _scalar_div_)),
- ('__rdiv__', _binary_creator_('__rdiv__', 'elementwise_div', True, None)),
- ('__rtruediv__', _binary_creator_('rtruediv__', 'elementwise_div', True, None)),
- ('__pow__', _binary_creator_('__pow__', 'elementwise_pow', False, None)),
- ('__rpow__', _binary_creator_('__rpow__', 'elementwise_pow', True, None)),
- ('__floordiv__', _binary_creator_('__floordiv__', 'elementwise_floordiv', False, None)),
- ('__mod__', _binary_creator_('__mod__', 'elementwise_mod', False, None)),
+ ('__rmul__',
+ _binary_creator_('__rmul__', 'elementwise_mul', False, _scalar_mul_)),
+ ('__div__', _binary_creator_('__div__', 'elementwise_div', False,
+ _scalar_div_)),
+ ('__truediv__', _binary_creator_('__truediv__', 'elementwise_div',
+ False, _scalar_div_)),
+ ('__rdiv__', _binary_creator_('__rdiv__', 'elementwise_div', True,
+ None)),
+ ('__rtruediv__', _binary_creator_('rtruediv__', 'elementwise_div', True,
+ None)),
+ ('__pow__', _binary_creator_('__pow__', 'elementwise_pow', False,
+ None)),
+ ('__rpow__', _binary_creator_('__rpow__', 'elementwise_pow', True,
+ None)),
+ ('__floordiv__', _binary_creator_('__floordiv__',
+ 'elementwise_floordiv', False, None)),
+ ('__mod__', _binary_creator_('__mod__', 'elementwise_mod', False,
+ None)),
  ## for logical compare
  ('__eq__', _binary_creator_('__eq__', 'equal', False, None)),
  ('__ne__', _binary_creator_('__ne__', 'not_equal', False, None)),
@@ -300,13 +314,13 @@ def __impl__(self):
  if not _already_patch_varbase:
  for method in varbase_methods:
  method_name = method[0]
- method_impl = method[0]
+ method_impl = method[1]
  setattr(core.VarBase, method_name, method_impl)
  else:
  import paddle.tensor
  for method_name in common_methods:
  if hasattr(core.VarBase, method_name): continue
- method_impl = getattr(paddle.tensor, method, None)
+ method_impl = getattr(paddle.tensor, method_name, None)
  if method_impl: setattr(core.VarBase, method_name, method_impl)
 
  _already_patch_varbase = True

python/paddle/fluid/layers/math_op_patch.py

@@ -54,118 +54,26 @@
  "__ge__": "A >= B"
 }
 
+# method for Tensor from paddle.tensor
+# edit it when paddle.tensor has new method about Tensor operation
 common_methods = [
- 'exp',
- 'tanh', 
- 'atan', 
- 'sqrt', 
- 'rsqrt', 
- 'abs', 
- 'ceil', 
- 'floor', 
- 'cos',
- 'acos', 
- 'asin', 
- 'sin', 
- 'sinh', 
- 'cosh', 
- 'round', 
- 'reciprocal', 
- 'square',
- 'rank', 
- 'matmul', 
- 'dot', 
- 'norm', 
- 'transpose', 
- 'dist', 
- 't', 
- 'cross',
- 'cholesky', 
- 'bmm', 
- 'histogram', 
- 'equal', 
- 'greater_equal', 
- 'greater_than',
- 'is_empty', 
- 'isfinite', 
- 'less_equal', 
- 'less_than', 
- 'logical_and',
- 'logical_not', 
- 'logical_or', 
- 'logical_xor', 
- 'not_equal', 
- 'reduce_all',
- 'reduce_any', 
- 'allclose', 
- 'equal_all', 
- 'cast', 
- 'expand', 
- 'expand_as',
- 'tile', 
- 'flatten', 
- 'gather', 
- 'gather_nd', 
- 'reshape', 
- 'reverse', 
- 'scatter',
- 'scatter_nd_add', 
- 'scatter_nd', 
- 'shard_index', 
- 'slice', 
- 'split', 
- 'squeeze',
- 'strided_slice', 
- 'unique', 
- 'unique_with_counts', 
- 'unsqueeze', 
- 'flip',
- 'unbind', 
- 'roll', 
- 'cumsum', 
- 'increment', 
- 'log', 
- 'pow', 
- 'reciprocal',
- 'round', 
- 'rsqrt', 
- 'scale', 
- 'sign', 
- 'stanh', 
- 'sum', 
- 'reduce_prod', 
- 'max',
- 'min', 
- 'mm', 
- 'div', 
- 'multiply', 
- 'add', 
- 'logsumexp', 
- 'log1p', 
- 'erf',
- 'addcmul', 
- 'addmm', 
- 'clamp', 
- 'trace', 
- 'kron', 
- 'argmax', 
- 'argmin', 
- 'argsort',
- 'has_inf', 
- 'has_nan', 
- 'topk', 
- 'index_select', 
- 'nonzero', 
- 'sort',
- 'index_sample', 
- 'mean', 
- 'std', 
- 'var', 
- 'elementwise_add', 
- 'elementwise_div',
- 'elementwise_floordiv', 
- 'elementwise_mod', 
- 'elementwise_pow',
+ 'exp', 'tanh', 'atan', 'sqrt', 'rsqrt', 'abs', 'ceil', 'floor', 'cos',
+ 'acos', 'asin', 'sin', 'sinh', 'cosh', 'round', 'reciprocal', 'square',
+ 'rank', 'matmul', 'dot', 'norm', 'transpose', 'dist', 't', 'cross',
+ 'cholesky', 'bmm', 'histogram', 'equal', 'greater_equal', 'greater_than',
+ 'is_empty', 'isfinite', 'less_equal', 'less_than', 'logical_and',
+ 'logical_not', 'logical_or', 'logical_xor', 'not_equal', 'reduce_all',
+ 'reduce_any', 'allclose', 'equal_all', 'cast', 'expand', 'expand_as',
+ 'tile', 'flatten', 'gather', 'gather_nd', 'reshape', 'reverse', 'scatter',
+ 'scatter_nd_add', 'scatter_nd', 'shard_index', 'slice', 'split', 'squeeze',
+ 'strided_slice', 'unique', 'unique_with_counts', 'unsqueeze', 'flip',
+ 'unbind', 'roll', 'cumsum', 'increment', 'log', 'pow', 'reciprocal',
+ 'round', 'rsqrt', 'scale', 'sign', 'stanh', 'sum', 'reduce_prod', 'max',
+ 'min', 'mm', 'div', 'multiply', 'add', 'logsumexp', 'log1p', 'erf',
+ 'addcmul', 'addmm', 'clamp', 'trace', 'kron', 'argmax', 'argmin', 'argsort',
+ 'has_inf', 'has_nan', 'topk', 'index_select', 'nonzero', 'sort',
+ 'index_sample', 'mean', 'std', 'var', 'elementwise_add', 'elementwise_div',
+ 'elementwise_floordiv', 'elementwise_mod', 'elementwise_pow',
  'elementwise_sub'
 ]
 
@@ -417,22 +325,36 @@ def __impl__(self, other_var):
  # b=-a
  ('__neg__', _neg_),
  ('astype', astype),
- ('__add__', _binary_creator_('__add__', 'elementwise_add', False, _scalar_add_)),
+ ('__add__', _binary_creator_('__add__', 'elementwise_add', False,
+ _scalar_add_)),
  # a+b == b+a. Do not need to reverse explicitly
- ('__radd__', _binary_creator_('__radd__', 'elementwise_add', False, _scalar_add_)),
- ('__sub__', _binary_creator_('__sub__', 'elementwise_sub', False, _scalar_sub_)),
- ('__rsub__', _binary_creator_('__rsub__', 'elementwise_sub', True, _scalar_rsub_)),
- ('__mul__', _binary_creator_('__mul__', 'elementwise_mul', False, _scalar_mul_)),
+ ('__radd__',
+ _binary_creator_('__radd__', 'elementwise_add', False, _scalar_add_)),
+ ('__sub__', _binary_creator_('__sub__', 'elementwise_sub', False,
+ _scalar_sub_)),
+ ('__rsub__', _binary_creator_('__rsub__', 'elementwise_sub', True,
+ _scalar_rsub_)),
+ ('__mul__', _binary_creator_('__mul__', 'elementwise_mul', False,
+ _scalar_mul_)),
  # a*b == b*a. Do not need to reverse explicitly
- ('__rmul__', _binary_creator_('__rmul__', 'elementwise_mul', False, _scalar_mul_)),
- ('__div__', _binary_creator_('__div__', 'elementwise_div', False, _scalar_div_)),
- ('__truediv__', _binary_creator_('__truediv__', 'elementwise_div', False, _scalar_div_)),
- ('__rdiv__', _binary_creator_('__rdiv__', 'elementwise_div', True, None)),
- ('__rtruediv__', _binary_creator_('rtruediv__', 'elementwise_div', True, None)),
- ('__pow__', _binary_creator_('__pow__', 'elementwise_pow', False, None)),
- ('__rpow__', _binary_creator_('__rpow__', 'elementwise_pow', True, None)),
- ('__floordiv__', _binary_creator_('__floordiv__', 'elementwise_floordiv', False, None)),
- ('__mod__', _binary_creator_('__mod__', 'elementwise_mod', False, None)),
+ ('__rmul__',
+ _binary_creator_('__rmul__', 'elementwise_mul', False, _scalar_mul_)),
+ ('__div__', _binary_creator_('__div__', 'elementwise_div', False,
+ _scalar_div_)),
+ ('__truediv__', _binary_creator_('__truediv__', 'elementwise_div',
+ False, _scalar_div_)),
+ ('__rdiv__', _binary_creator_('__rdiv__', 'elementwise_div', True,
+ None)),
+ ('__rtruediv__', _binary_creator_('__rtruediv__', 'elementwise_div',
+ True, None)),
+ ('__pow__', _binary_creator_('__pow__', 'elementwise_pow', False,
+ None)),
+ ('__rpow__', _binary_creator_('__rpow__', 'elementwise_pow', True,
+ None)),
+ ('__floordiv__', _binary_creator_('__floordiv__',
+ 'elementwise_floordiv', False, None)),
+ ('__mod__', _binary_creator_('__mod__', 'elementwise_mod', False,
+ None)),
  # for logical compare
  ('__eq__', _binary_creator_('__eq__', 'equal', False, None)),
  ('__ne__', _binary_creator_('__ne__', 'not_equal', False, None)),
@@ -451,8 +373,8 @@ def __impl__(self, other_var):
  else:
  import paddle.tensor
  for method_name in common_methods:
- if hasattr(Variable, method): continue
- method_impl = getattr(paddle.tensor, method, None)
+ if hasattr(Variable, method_name): continue
+ method_impl = getattr(paddle.tensor, method_name, None)
  if method_impl: setattr(Variable, method_name, method_impl)
 
  _already_patch_variable = True

python/paddle/fluid/tests/unittests/test_math_op_patch_var_base.py

@@ -467,9 +467,10 @@ def test_tensor_patch_method(self):
  self.assertTrue(
  np.array_equal(
  x.allclose(y).numpy(), paddle.allclose(x, y).numpy()))
+ m = x.expand([2, 2, 3])
  self.assertTrue(
  np.array_equal(
- x.expand_as(z).numpy(), paddle.expand_as(x, z).numpy()))
+ x.expand_as(m).numpy(), paddle.expand_as(x, m).numpy()))
  index = paddle.to_tensor([2, 1, 0])
  self.assertTrue(
  np.array_equal(