From 96e57967f017b1132060483522afa24862974137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=B0=B8=E4=B9=85?= <34344716+yjjiang11@users.noreply.github.com> Date: Fri, 9 Dec 2022 02:27:03 -0800 Subject: [PATCH] rm mlu ops eager guard tests (#48769) --- .../tests/unittests/mlu/test_clip_op_mlu.py | 1 - .../unittests/mlu/test_expand_v2_op_mlu.py | 1 - .../unittests/mlu/test_meshgrid_op_mlu.py | 1 - .../unittests/mlu/test_one_hot_v2_op_mlu.py | 7 +++--- .../test_truncated_gaussian_random_op_mlu.py | 22 +++++++++---------- .../tests/unittests/mlu/test_where_op_mlu.py | 1 - .../unittests/mlu/test_yolo_box_op_mlu.py | 1 - 7 files changed, 13 insertions(+), 21 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/mlu/test_clip_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_clip_op_mlu.py index c306ab96b61..1709d53895f 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_clip_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_clip_op_mlu.py @@ -21,7 +21,6 @@ import paddle import paddle.fluid as fluid from paddle.fluid import Program, program_guard from op_test import OpTest -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() diff --git a/python/paddle/fluid/tests/unittests/mlu/test_expand_v2_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_expand_v2_op_mlu.py index f1e8b06cd9a..46d3d9d214f 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_expand_v2_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_expand_v2_op_mlu.py @@ -21,7 +21,6 @@ from op_test import OpTest import paddle.fluid as fluid from paddle.fluid import compiler, Program, program_guard import paddle -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() diff --git a/python/paddle/fluid/tests/unittests/mlu/test_meshgrid_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_meshgrid_op_mlu.py index 6353ca638a5..ecfb94e335b 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_meshgrid_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_meshgrid_op_mlu.py @@ -21,7 +21,6 @@ from op_test import OpTest, skip_check_grad_ci import paddle.fluid as fluid import paddle from paddle.fluid import compiler, Program, program_guard, core -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() diff --git a/python/paddle/fluid/tests/unittests/mlu/test_one_hot_v2_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_one_hot_v2_op_mlu.py index 3605ab25416..b28d191fa2c 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_one_hot_v2_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_one_hot_v2_op_mlu.py @@ -23,7 +23,7 @@ import paddle import paddle.fluid as fluid import paddle.fluid.core as core import paddle.fluid.framework as framework -from paddle.fluid.framework import Program, program_guard, _test_eager_guard +from paddle.fluid.framework import Program, program_guard paddle.enable_static() @@ -203,9 +203,8 @@ class TestOneHotOpApi(unittest.TestCase): one_hot_label = paddle.nn.functional.one_hot( fluid.dygraph.to_variable(label), depth ) - # with _test_eager_guard(): - # one_hot_label = paddle.nn.functional.one_hot( - # paddle.to_tensor(label), depth) + # one_hot_label = paddle.nn.functional.one_hot( + # paddle.to_tensor(label), depth) def _run(self, depth): label = fluid.layers.data(name="label", shape=[1], dtype="int64") diff --git a/python/paddle/fluid/tests/unittests/mlu/test_truncated_gaussian_random_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_truncated_gaussian_random_op_mlu.py index 98bcd7109d0..b40cc3582ba 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_truncated_gaussian_random_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_truncated_gaussian_random_op_mlu.py @@ -24,7 +24,6 @@ sys.path.append("..") from op_test import OpTest from paddle.fluid.op import Operator from paddle.fluid.executor import Executor -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() @@ -76,17 +75,16 @@ class TestTrunctedGaussianRandomOp(unittest.TestCase): # directly def gaussian_random_test_eager(self, place): with fluid.dygraph.guard(place): - with _test_eager_guard(): - out = paddle._C_ops.truncated_gaussian_random( - self.attrs["shape"], - self.attrs["mean"], - self.attrs["std"], - self.attrs["seed"], - core.VarDesc.VarType.FP32, - place, - ) - self.assertAlmostEqual(numpy.mean(out.numpy()), 0.0, delta=0.1) - self.assertAlmostEqual(numpy.var(out.numpy()), 0.773, delta=0.1) + out = paddle._C_ops.truncated_gaussian_random( + self.attrs["shape"], + self.attrs["mean"], + self.attrs["std"], + self.attrs["seed"], + core.VarDesc.VarType.FP32, + place, + ) + self.assertAlmostEqual(numpy.mean(out.numpy()), 0.0, delta=0.1) + self.assertAlmostEqual(numpy.var(out.numpy()), 0.773, delta=0.1) if __name__ == "__main__": diff --git a/python/paddle/fluid/tests/unittests/mlu/test_where_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_where_op_mlu.py index 2bb780e1f26..a2d0c1a699d 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_where_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_where_op_mlu.py @@ -25,7 +25,6 @@ from op_test import OpTest from paddle.fluid import compiler, Program, program_guard from paddle.fluid.op import Operator from paddle.fluid.backward import append_backward -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() diff --git a/python/paddle/fluid/tests/unittests/mlu/test_yolo_box_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_yolo_box_op_mlu.py index fd8855aeb57..60a9cfa05a5 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_yolo_box_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_yolo_box_op_mlu.py @@ -23,7 +23,6 @@ from paddle.fluid import core import paddle.fluid as fluid from paddle.fluid.op import Operator from paddle.fluid.executor import Executor -from paddle.fluid.framework import _test_eager_guard paddle.enable_static() -- GitLab