diff --git a/python/paddle/tensor/logic.py b/python/paddle/tensor/logic.py index 56734730db53ea7ed4a4af0bc9739d59b8ecd27a..210c69114772c46b259aaa744402a165be84aac6 100644 --- a/python/paddle/tensor/logic.py +++ b/python/paddle/tensor/logic.py @@ -23,13 +23,10 @@ from ..framework import VarBase as Tensor # TODO: define logic functions of a tensor from ..fluid.layers import is_empty #DEFINE_ALIAS -from ..fluid.layers import isfinite #DEFINE_ALIAS from ..fluid.layers import logical_and #DEFINE_ALIAS from ..fluid.layers import logical_not #DEFINE_ALIAS from ..fluid.layers import logical_or #DEFINE_ALIAS from ..fluid.layers import logical_xor #DEFINE_ALIAS -from ..fluid.layers import reduce_all #DEFINE_ALIAS -from ..fluid.layers import reduce_any #DEFINE_ALIAS __all__ = [ 'equal', @@ -37,7 +34,6 @@ __all__ = [ 'greater_equal', 'greater_than', 'is_empty', - 'isfinite', 'less_equal', 'less_than', 'logical_and', diff --git a/python/paddle/tensor/math.py b/python/paddle/tensor/math.py index a7b754918146cf2f4ef7c9f6919389a27dd3868f..d93948b96cb4065ba2775b7bb92fa821a16dd6de 100755 --- a/python/paddle/tensor/math.py +++ b/python/paddle/tensor/math.py @@ -47,8 +47,6 @@ from ..fluid.layers import exp #DEFINE_ALIAS from ..fluid.layers import floor #DEFINE_ALIAS from ..fluid.layers import log #DEFINE_ALIAS from ..fluid.layers import reciprocal #DEFINE_ALIAS -from ..fluid.layers import reduce_all #DEFINE_ALIAS -from ..fluid.layers import reduce_any #DEFINE_ALIAS # from ..fluid.layers import reduce_max #DEFINE_ALIAS # from ..fluid.layers import reduce_min #DEFINE_ALIAS # from ..fluid.layers import reduce_prod #DEFINE_ALIAS @@ -70,6 +68,8 @@ from ..fluid import layers __all__ = [ 'abs', 'acos', + 'all', + 'any', 'asin', 'atan', 'ceil', @@ -2027,16 +2027,14 @@ def all(x, axis=None, keepdim=False, name=None): .. code-block:: python import paddle - import paddle.fluid as fluid - import paddle.fluid.layers as layers import numpy as np # x is a bool Tensor with following elements: # [[True, False] # [True, True]] - x = layers.assign(np.array([[1, 0], [1, 1]], dtype='int32')) + x = paddle.assign(np.array([[1, 0], [1, 1]], dtype='int32')) print(x) - x = layers.cast(x, 'bool') + x = paddle.cast(x, 'bool') # out1 should be [False] out1 = paddle.all(x) # [False] @@ -2051,8 +2049,8 @@ def all(x, axis=None, keepdim=False, name=None): print(out3) # keep_dim=True, out4 should be [[False], [True]], out.shape should be (2,1) - out4 = paddle.all(x, axis=1, keep_dim=True) - out4 = layers.cast(out4, 'int32') # [[False], [True]] + out4 = paddle.all(x, axis=1, keepdim=True) + out4 = paddle.cast(out4, 'int32') # [[False], [True]] print(out4) """ @@ -2123,16 +2121,14 @@ def any(x, axis=None, keepdim=False, name=None): .. code-block:: python import paddle - import paddle.fluid as fluid - import paddle.fluid.layers as layers import numpy as np # x is a bool Tensor with following elements: # [[True, False] # [False, False]] - x = layers.assign(np.array([[1, 0], [1, 1]], dtype='int32')) + x = paddle.assign(np.array([[1, 0], [1, 1]], dtype='int32')) print(x) - x = layers.cast(x, 'bool') + x = paddle.cast(x, 'bool') # out1 should be [True] out1 = paddle.any(x) # [True] @@ -2147,8 +2143,8 @@ def any(x, axis=None, keepdim=False, name=None): print(out3) # keep_dim=True, result should be [[True], [False]], out.shape should be (2,1) - out4 = paddle.any(x, axis=1, keep_dim=True) - out4 = layers.cast(out4, 'int32') # [[True], [False]] + out4 = paddle.any(x, axis=1, keepdim=True) + out4 = paddle.cast(out4, 'int32') # [[True], [False]] print(out4) """