[Cleanup][A-5] clean some VarType for test (#61549)

PaddlePaddle · Feb 4, 2024 · ca68a91 · ca68a91
1 parent cd99902
commit ca68a91
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 112 deletions.
diff --git a/test/collective/fleet/test_fleet_amp_meta_optimizer.py b/test/collective/fleet/test_fleet_amp_meta_optimizer.py
@@ -100,7 +100,7 @@ def test_pure_fp16_optimizer(self):
 
         params = train_prog.all_parameters()
         for param in train_prog.all_parameters():
-            self.assertEqual(param.dtype, base.core.VarDesc.VarType.FP16)
+            self.assertEqual(param.dtype, paddle.float16)
 
         ops = [op.type for op in avg_cost.block.ops]
         self.assertIn('cast', ops)

diff --git a/test/collective/fleet/test_fleet_gradient_merge_meta_optimizer.py b/test/collective/fleet/test_fleet_gradient_merge_meta_optimizer.py
@@ -75,7 +75,7 @@ def test_gm_pure_fp16_optimizer(self):
 
         params = train_prog.all_parameters()
         for param in train_prog.all_parameters():
-            self.assertEqual(param.dtype, paddle.base.core.VarDesc.VarType.FP16)
+            self.assertEqual(param.dtype, paddle.float16)
 
         vars = [x.name for x in train_prog.list_vars()]
         self.assertIn('@GradientMerge', ''.join(vars))

diff --git a/test/legacy_test/test_data.py b/test/legacy_test/test_data.py
@@ -15,28 +15,28 @@
 import unittest
 
 import paddle
-from paddle.base import Program, core, program_guard
+from paddle.base import Program, program_guard
 
 
 class TestApiStaticDataError(unittest.TestCase):
     def test_dtype(self):
         with program_guard(Program(), Program()):
             x1 = paddle.static.data(name="x1", shape=[2, 25])
-            self.assertEqual(x1.dtype, core.VarDesc.VarType.FP32)
+            self.assertEqual(x1.dtype, paddle.float32)
 
             x2 = paddle.static.data(name="x2", shape=[2, 25], dtype="bool")
-            self.assertEqual(x2.dtype, core.VarDesc.VarType.BOOL)
+            self.assertEqual(x2.dtype, paddle.bool)
 
             paddle.set_default_dtype("float64")
             x3 = paddle.static.data(name="x3", shape=[2, 25])
-            self.assertEqual(x3.dtype, core.VarDesc.VarType.FP64)
+            self.assertEqual(x3.dtype, paddle.float64)
 
     def test_0D(self):
         with program_guard(Program(), Program()):
             x1 = paddle.static.data(name="x1_0D", shape=[])
-            self.assertEqual(x1.dtype, core.VarDesc.VarType.FP32)
+            self.assertEqual(x1.dtype, paddle.float32)
             x2 = paddle.static.data(name="x2_0D", shape=(), dtype="bool")
-            self.assertEqual(x2.dtype, core.VarDesc.VarType.BOOL)
+            self.assertEqual(x2.dtype, paddle.bool)
 
     def test_error(self):
         with program_guard(Program(), Program()):