Skip to content

【UnitTestFix No.10】fix test_normal.py #75274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 22, 2025
Merged

【UnitTestFix No.10】fix test_normal.py #75274

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b622a23
fix test_normal.py
Echo-Nie Sep 13, 2025
13e8923
fix bug
Echo-Nie Sep 13, 2025
a617ae9
Merge branch 'PaddlePaddle:develop' into test_norm
Echo-Nie Sep 19, 2025
926b6ab
Merge branch 'PaddlePaddle:develop' into test_norm
Echo-Nie Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions test/legacy_test/test_normal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,16 @@ def get_dtype(self):
return 'float32'

def static_api(self):
paddle.enable_static()
shape = self.get_shape()
ret_all_shape = copy.deepcopy(shape)
ret_all_shape.insert(0, self.repeat_num)
ret_all = np.zeros(ret_all_shape, self.dtype)
main_program = paddle.static.Program()
if isinstance(self.mean, np.ndarray) and isinstance(
self.std, np.ndarray
):
with paddle.static.program_guard(main_program):
with paddle.static.program_guard(main_program):
if isinstance(self.mean, np.ndarray) and isinstance(
self.std, np.ndarray
):
mean = paddle.static.data(
'Mean', self.mean.shape, self.mean.dtype
)
Expand All @@ -89,9 +90,7 @@ def static_api(self):
fetch_list=[out],
)
ret_all[i] = ret[0]
return ret_all
elif isinstance(self.mean, np.ndarray):
with paddle.static.program_guard(main_program):
elif isinstance(self.mean, np.ndarray):
mean = paddle.static.data(
'Mean', self.mean.shape, self.mean.dtype
)
Expand All @@ -101,26 +100,23 @@ def static_api(self):
for i in range(self.repeat_num):
ret = exe.run(feed={'Mean': self.mean}, fetch_list=[out])
ret_all[i] = ret[0]
return ret_all
elif isinstance(self.std, np.ndarray):
with paddle.static.program_guard(main_program):
elif isinstance(self.std, np.ndarray):
std = paddle.static.data('Std', self.std.shape, self.std.dtype)
out = paddle.normal(self.mean, std, self.shape)

exe = paddle.static.Executor(self.place)
for i in range(self.repeat_num):
ret = exe.run(feed={'Std': self.std}, fetch_list=[out])
ret_all[i] = ret[0]
return ret_all
else:
with paddle.static.program_guard(main_program):
else:
out = paddle.normal(self.mean, self.std, self.shape)

exe = paddle.static.Executor(self.place)
for i in range(self.repeat_num):
ret = exe.run(fetch_list=[out])
ret_all[i] = ret[0]
return ret_all
paddle.disable_static()
return ret_all

def dygraph_api(self):
paddle.disable_static(self.place)
Expand Down Expand Up @@ -218,7 +214,6 @@ def test_errors(self):
self.assertRaises(TypeError, paddle.normal, mean=1.0, std=std)

self.assertRaises(TypeError, paddle.normal, shape=1)

self.assertRaises(TypeError, paddle.normal, shape=[1.0])

shape = paddle.static.data('Shape', [100], 'float32')
Expand Down Expand Up @@ -261,15 +256,16 @@ def get_dtype(self):
return 'complex64'

def static_api(self):
paddle.enable_static()
shape = self.get_shape()
ret_all_shape = copy.deepcopy(shape)
ret_all_shape.insert(0, self.repeat_num)
ret_all = np.zeros(ret_all_shape, self.dtype)
main_program = paddle.static.Program()
if isinstance(self.mean, np.ndarray) and isinstance(
self.std, np.ndarray
):
with paddle.static.program_guard(main_program):
with paddle.static.program_guard(main_program):
if isinstance(self.mean, np.ndarray) and isinstance(
self.std, np.ndarray
):
mean = paddle.static.data(
'Mean', self.mean.shape, self.mean.dtype
)
Expand All @@ -286,9 +282,7 @@ def static_api(self):
fetch_list=[out],
)
ret_all[i] = ret[0]
return ret_all
elif isinstance(self.mean, np.ndarray):
with paddle.static.program_guard(main_program):
elif isinstance(self.mean, np.ndarray):
mean = paddle.static.data(
'Mean', self.mean.shape, self.mean.dtype
)
Expand All @@ -298,9 +292,7 @@ def static_api(self):
for i in range(self.repeat_num):
ret = exe.run(feed={'Mean': self.mean}, fetch_list=[out])
ret_all[i] = ret[0]
return ret_all
elif isinstance(self.std, np.ndarray):
with paddle.static.program_guard(main_program):
elif isinstance(self.std, np.ndarray):
mean = paddle.static.data('Mean', self.std.shape, 'complex128')
std = paddle.static.data('Std', self.std.shape, self.std.dtype)
out = paddle.normal(mean, std, self.shape)
Expand All @@ -317,20 +309,18 @@ def static_api(self):
fetch_list=[out],
)
ret_all[i] = ret[0]
return ret_all
else:
with paddle.static.program_guard(main_program):
else:
mean = paddle.static.data('Mean', (), 'complex128')
out = paddle.normal(mean, self.std, self.shape)

exe = paddle.static.Executor(self.place)
for i in range(self.repeat_num):
ret = exe.run(
feed={'Mean': np.array(self.mean)},
fetch_list=[out],
feed={'Mean': np.array(self.mean)}, fetch_list=[out]
)
ret_all[i] = ret[0]
return ret_all
paddle.disable_static()
return ret_all

def dygraph_api(self):
paddle.disable_static(self.place)
Expand Down
Loading