Skip to content

P
Paddle

BaiXuePrincess / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle
未验证 提交 13b80d9b 编写于 作者: P pangyoki 提交者： GitHub
浏览文件
操作

fixed imperative module in doc example code (#26149) 

* fixed imperative module in doc example code

* fixed static module

* solve conflict
上级 dbc88bb9
隐藏空白更改
内联 并排
Showing with 66 addition and 66 deletion
python/paddle/fluid/layers/ops.py
浏览文件 @ 13b80d9b
...@@ -69,10 +69,10 @@ Examples: ...@@ -69,10 +69,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
import paddle.nn.functional as F import paddle.nn.functional as F
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = F.sigmoid(x) out = F.sigmoid(x)
print(out.numpy()) print(out.numpy())
# [0.40131234 0.450166 0.52497919 0.57444252] # [0.40131234 0.450166 0.52497919 0.57444252]
...@@ -86,10 +86,10 @@ Examples: ...@@ -86,10 +86,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
import paddle.nn.functional as F import paddle.nn.functional as F
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = F.logsigmoid(x) out = F.logsigmoid(x)
print(out.numpy()) print(out.numpy())
# [-0.91301525 -0.79813887 -0.64439666 -0.55435524] # [-0.91301525 -0.79813887 -0.64439666 -0.55435524]
...@@ -102,10 +102,10 @@ Examples: ...@@ -102,10 +102,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.exp(x) out = paddle.exp(x)
print(out.numpy()) print(out.numpy())
# [0.67032005 0.81873075 1.10517092 1.34985881] # [0.67032005 0.81873075 1.10517092 1.34985881]
...@@ -118,10 +118,10 @@ Examples: ...@@ -118,10 +118,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.tanh(x) out = paddle.tanh(x)
print(out.numpy()) print(out.numpy())
# [-0.37994896 -0.19737532 0.09966799 0.29131261] # [-0.37994896 -0.19737532 0.09966799 0.29131261]
...@@ -134,10 +134,10 @@ Examples: ...@@ -134,10 +134,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.atan(x) out = paddle.atan(x)
print(out.numpy()) print(out.numpy())
# [-0.38050638 -0.19739556 0.09966865 0.29145679] # [-0.38050638 -0.19739556 0.09966865 0.29145679]
...@@ -151,10 +151,10 @@ Examples: ...@@ -151,10 +151,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
import paddle.nn.functional as F import paddle.nn.functional as F
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = F.tanh_shrink(x) out = F.tanh_shrink(x)
print(out.numpy()) print(out.numpy())
# [-0.02005104 -0.00262468 0.00033201 0.00868739] # [-0.02005104 -0.00262468 0.00033201 0.00868739]
...@@ -167,10 +167,10 @@ Examples: ...@@ -167,10 +167,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([0.1, 0.2, 0.3, 0.4]) x_data = np.array([0.1, 0.2, 0.3, 0.4])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.sqrt(x) out = paddle.sqrt(x)
print(out.numpy()) print(out.numpy())
# [0.31622777 0.4472136 0.54772256 0.63245553] # [0.31622777 0.4472136 0.54772256 0.63245553]
...@@ -183,10 +183,10 @@ Examples: ...@@ -183,10 +183,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([0.1, 0.2, 0.3, 0.4]) x_data = np.array([0.1, 0.2, 0.3, 0.4])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.rsqrt(x) out = paddle.rsqrt(x)
print(out.numpy()) print(out.numpy())
# [3.16227766 2.23606798 1.82574186 1.58113883] # [3.16227766 2.23606798 1.82574186 1.58113883]
...@@ -199,10 +199,10 @@ Examples: ...@@ -199,10 +199,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.abs(x) out = paddle.abs(x)
print(out.numpy()) print(out.numpy())
# [0.4 0.2 0.1 0.3] # [0.4 0.2 0.1 0.3]
...@@ -215,10 +215,10 @@ Examples: ...@@ -215,10 +215,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.ceil(x) out = paddle.ceil(x)
print(out.numpy()) print(out.numpy())
# [-0. -0. 1. 1.] # [-0. -0. 1. 1.]
...@@ -231,10 +231,10 @@ Examples: ...@@ -231,10 +231,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.floor(x) out = paddle.floor(x)
print(out.numpy()) print(out.numpy())
# [-1. -1. 0. 0.] # [-1. -1. 0. 0.]
...@@ -247,10 +247,10 @@ Examples: ...@@ -247,10 +247,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.cos(x) out = paddle.cos(x)
print(out.numpy()) print(out.numpy())
# [0.92106099 0.98006658 0.99500417 0.95533649] # [0.92106099 0.98006658 0.99500417 0.95533649]
...@@ -263,10 +263,10 @@ Examples: ...@@ -263,10 +263,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.acos(x) out = paddle.acos(x)
print(out.numpy()) print(out.numpy())
# [1.98231317 1.77215425 1.47062891 1.26610367] # [1.98231317 1.77215425 1.47062891 1.26610367]
...@@ -279,10 +279,10 @@ Examples: ...@@ -279,10 +279,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.sin(x) out = paddle.sin(x)
print(out.numpy()) print(out.numpy())
# [-0.38941834 -0.19866933 0.09983342 0.29552021] # [-0.38941834 -0.19866933 0.09983342 0.29552021]
...@@ -295,10 +295,10 @@ Examples: ...@@ -295,10 +295,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.asin(x) out = paddle.asin(x)
print(out.numpy()) print(out.numpy())
# [-0.41151685 -0.20135792 0.10016742 0.30469265] # [-0.41151685 -0.20135792 0.10016742 0.30469265]
...@@ -311,10 +311,10 @@ Examples: ...@@ -311,10 +311,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.cosh(x) out = paddle.cosh(x)
print(out.numpy()) print(out.numpy())
# [1.08107237 1.02006676 1.00500417 1.04533851] # [1.08107237 1.02006676 1.00500417 1.04533851]
...@@ -327,10 +327,10 @@ Examples: ...@@ -327,10 +327,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.sinh(x) out = paddle.sinh(x)
print(out.numpy()) print(out.numpy())
# [-0.41075233 -0.201336 0.10016675 0.30452029] # [-0.41075233 -0.201336 0.10016675 0.30452029]
...@@ -343,10 +343,10 @@ Examples: ...@@ -343,10 +343,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.5, -0.2, 0.6, 1.5]) x_data = np.array([-0.5, -0.2, 0.6, 1.5])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.round(x) out = paddle.round(x)
print(out.numpy()) print(out.numpy())
# [-1. -0. 1. 2.] # [-1. -0. 1. 2.]
...@@ -359,10 +359,10 @@ Examples: ...@@ -359,10 +359,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.reciprocal(x) out = paddle.reciprocal(x)
print(out.numpy()) print(out.numpy())
# [-2.5 -5. 10. 3.33333333] # [-2.5 -5. 10. 3.33333333]
...@@ -375,10 +375,10 @@ Examples: ...@@ -375,10 +375,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = paddle.square(x) out = paddle.square(x)
print(out.numpy()) print(out.numpy())
# [0.16 0.04 0.01 0.09] # [0.16 0.04 0.01 0.09]
...@@ -392,10 +392,10 @@ Examples: ...@@ -392,10 +392,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
import paddle.nn.functional as F import paddle.nn.functional as F
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = F.softplus(x) out = F.softplus(x)
print(out.numpy()) print(out.numpy())
# [0.51301525 0.59813887 0.74439666 0.85435524] # [0.51301525 0.59813887 0.74439666 0.85435524]
...@@ -409,10 +409,10 @@ Examples: ...@@ -409,10 +409,10 @@ Examples:
import numpy as np import numpy as np
import paddle import paddle
import paddle.nn.functional as F import paddle.nn.functional as F
paddle.enable_imperative() paddle.disable_static()
x_data = np.array([-0.4, -0.2, 0.1, 0.3]) x_data = np.array([-0.4, -0.2, 0.1, 0.3])
x = paddle.imperative.to_variable(x_data) x = paddle.to_variable(x_data)
out = F.softsign(x) out = F.softsign(x)
print(out.numpy()) print(out.numpy())
# [-0.28571429 -0.16666667 0.09090909 0.23076923] # [-0.28571429 -0.16666667 0.09090909 0.23076923]
......
python/paddle/fluid/tests/unittests/test_addmm_op.py
浏览文件 @ 13b80d9b
...@@ -240,13 +240,13 @@ class TestAddMMAPI(unittest.TestCase): ...@@ -240,13 +240,13 @@ class TestAddMMAPI(unittest.TestCase):
data_y = np.ones((2, 2)).astype(np.float32) data_y = np.ones((2, 2)).astype(np.float32)
data_input = np.ones((2, 2)).astype(np.float32) data_input = np.ones((2, 2)).astype(np.float32)
paddle.enable_imperative() paddle.disable_static()
def test_error1(): def test_error1():
data_x_wrong = np.ones((2, 3)).astype(np.float32) data_x_wrong = np.ones((2, 3)).astype(np.float32)
x = paddle.imperative.to_variable(data_x_wrong) x = paddle.to_variable(data_x_wrong)
y = paddle.imperative.to_variable(data_y) y = paddle.to_variable(data_y)
input = paddle.imperative.to_variable(data_input) input = paddle.to_variable(data_input)
out = paddle.tensor.addmm( input=input, x=x, y=y, beta=0.5, alpha=5.0 ) out = paddle.tensor.addmm( input=input, x=x, y=y, beta=0.5, alpha=5.0 )
self.assertRaises(ValueError, test_error1) self.assertRaises(ValueError, test_error1)
''' '''
......
python/paddle/tensor/creation.py
浏览文件 @ 13b80d9b
...@@ -561,9 +561,9 @@ def tril(x, diagonal=0, name=None): ...@@ -561,9 +561,9 @@ def tril(x, diagonal=0, name=None):
# [ 5, 6, 7, 8], # [ 5, 6, 7, 8],
# [ 9, 10, 11, 12]]) # [ 9, 10, 11, 12]])
paddle.enable_imperative() paddle.disable_static()
x = paddle.imperative.to_variable(data) x = paddle.to_variable(data)
tril1 = paddle.tensor.tril(x) tril1 = paddle.tensor.tril(x)
# array([[ 1, 0, 0, 0], # array([[ 1, 0, 0, 0],
...@@ -632,10 +632,10 @@ def triu(x, diagonal=0, name=None): ...@@ -632,10 +632,10 @@ def triu(x, diagonal=0, name=None):
# [ 5, 6, 7, 8], # [ 5, 6, 7, 8],
# [ 9, 10, 11, 12]]) # [ 9, 10, 11, 12]])
paddle.enable_imperative() paddle.disable_static()
# example 1, default diagonal # example 1, default diagonal
x = paddle.imperative.to_variable(data) x = paddle.to_variable(data)
triu1 = paddle.tensor.triu(x) triu1 = paddle.tensor.triu(x)
# array([[ 1, 2, 3, 4], # array([[ 1, 2, 3, 4],
# [ 0, 6, 7, 8], # [ 0, 6, 7, 8],
......
python/paddle/tensor/linalg.py
浏览文件 @ 13b80d9b
...@@ -735,10 +735,10 @@ def bmm(x, y, name=None): ...@@ -735,10 +735,10 @@ def bmm(x, y, name=None):
input1 = np.array([[[1.0, 1.0, 1.0],[2.0, 2.0, 2.0]],[[3.0, 3.0, 3.0],[4.0, 4.0, 4.0]]]) input1 = np.array([[[1.0, 1.0, 1.0],[2.0, 2.0, 2.0]],[[3.0, 3.0, 3.0],[4.0, 4.0, 4.0]]])
input2 = np.array([[[1.0, 1.0],[2.0, 2.0],[3.0, 3.0]],[[4.0, 4.0],[5.0, 5.0],[6.0, 6.0]]]) input2 = np.array([[[1.0, 1.0],[2.0, 2.0],[3.0, 3.0]],[[4.0, 4.0],[5.0, 5.0],[6.0, 6.0]]])
paddle.enable_imperative() paddle.disable_static()
x = paddle.imperative.to_variable(input1) x = paddle.to_variable(input1)
y = paddle.imperative.to_variable(input2) y = paddle.to_variable(input2)
out = paddle.bmm(x, y) out = paddle.bmm(x, y)
#output size: (2, 2, 2) #output size: (2, 2, 2)
#output value: #output value:
......
python/paddle/tensor/manipulation.py
浏览文件 @ 13b80d9b
...@@ -457,10 +457,10 @@ def stack(x, axis=0, name=None): ...@@ -457,10 +457,10 @@ def stack(x, axis=0, name=None):
data2 = np.array([[3.0, 4.0]]) data2 = np.array([[3.0, 4.0]])
data3 = np.array([[5.0, 6.0]]) data3 = np.array([[5.0, 6.0]])
paddle.enable_imperative() paddle.disable_static()
x1 = paddle.imperative.to_variable(data1) x1 = paddle.to_variable(data1)
x2 = paddle.imperative.to_variable(data2) x2 = paddle.to_variable(data2)
x3 = paddle.imperative.to_variable(data3) x3 = paddle.to_variable(data3)
out = paddle.stack([x1, x2, x3], axis=0) out = paddle.stack([x1, x2, x3], axis=0)
print(out.shape) # [3, 1, 2] print(out.shape) # [3, 1, 2]
...@@ -637,7 +637,7 @@ def unsqueeze(x, axis, name=None): ...@@ -637,7 +637,7 @@ def unsqueeze(x, axis, name=None):
import paddle import paddle
paddle.enable_imperative() paddle.disable_static()
x = paddle.rand([5, 10]) x = paddle.rand([5, 10])
print(x.shape) # [5, 10] print(x.shape) # [5, 10]
......
python/paddle/tensor/math.py
浏览文件 @ 13b80d9b
...@@ -883,11 +883,11 @@ def addmm(input, x, y, beta=1.0, alpha=1.0, name=None): ...@@ -883,11 +883,11 @@ def addmm(input, x, y, beta=1.0, alpha=1.0, name=None):
data_y = np.ones((2, 2)).astype(np.float32) data_y = np.ones((2, 2)).astype(np.float32)
data_input = np.ones((2, 2)).astype(np.float32) data_input = np.ones((2, 2)).astype(np.float32)
paddle.enable_imperative() paddle.disable_static()
x = paddle.imperative.to_variable(data_x) x = paddle.to_variable(data_x)
y = paddle.imperative.to_variable(data_y) y = paddle.to_variable(data_y)
input = paddle.imperative.to_variable(data_input) input = paddle.to_variable(data_input)
out = paddle.tensor.addmm( input=input, x=x, y=y, beta=0.5, alpha=5.0 ) out = paddle.tensor.addmm( input=input, x=x, y=y, beta=0.5, alpha=5.0 )
...@@ -1561,10 +1561,10 @@ def cumsum(x, axis=None, dtype=None, name=None): ...@@ -1561,10 +1561,10 @@ def cumsum(x, axis=None, dtype=None, name=None):
.. code-block:: python .. code-block:: python
import paddle import paddle
from paddle.imperative import to_variable from paddle import to_variable
import numpy as np import numpy as np
paddle.enable_imperative() paddle.disable_static()
data_np = np.arange(12).reshape(3, 4) data_np = np.arange(12).reshape(3, 4)
data = to_variable(data_np) data = to_variable(data_np)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或