[Cleanup][A-9] clean some VarType for test (#61562)

co63oc · web-flow · commit 1e69b8ff6709 · 2024-02-19T16:08:03.000+08:00
* Fix VarType

* ci
diff --git a/python/paddle/amp/grad_scaler.py b/python/paddle/amp/grad_scaler.py
@@ -297,15 +297,9 @@ def _unscale(self, optimizer):
                 for param in group['params']:
                     if param._grad_ivar() is not None:
                         param_grads.append(param._grad_ivar())
-                        if (
-                            param._grad_ivar().dtype
-                            == core.VarDesc.VarType.FP16
-                        ):
+                        if param._grad_ivar().dtype == paddle.float16:
                             param_grads_fp16.append(param._grad_ivar())
-                        elif (
-                            param._grad_ivar().dtype
-                            == core.VarDesc.VarType.BF16
-                        ):
+                        elif param._grad_ivar().dtype == paddle.bfloat16:
                             param_grads_bf16.append(param._grad_ivar())
                         else:
                             param_grads_fp32.append(param._grad_ivar())
@@ -329,17 +323,17 @@ def _unscale(self, optimizer):
                 param_grads_fp16 = [
                     param
                     for param in param_grads
-                    if param.dtype == core.VarDesc.VarType.FP16
+                    if param.dtype == paddle.float16
                 ]
                 param_grads_bf16 = [
                     param
                     for param in param_grads
-                    if param.dtype == core.VarDesc.VarType.BF16
+                    if param.dtype == paddle.bfloat16
                 ]
                 param_grads_fp32 = [
                     param
                     for param in param_grads
-                    if param.dtype == core.VarDesc.VarType.FP32
+                    if param.dtype == paddle.float32
                 ]
         self._found_inf = self._temp_found_inf_value_false
         if len(param_grads_fp16):
diff --git a/python/paddle/base/dataset.py b/python/paddle/base/dataset.py
@@ -15,6 +15,7 @@
 
 from google.protobuf import text_format
 
+import paddle
 from paddle.base.proto import data_feed_pb2
 
 from ..utils import deprecated
@@ -271,11 +272,11 @@ def set_use_var(self, var_list):
             if var.lod_level == 0:
                 slot_var.is_dense = True
                 slot_var.shape.extend(var.shape)
-            if var.dtype == core.VarDesc.VarType.FP32:
+            if var.dtype == paddle.float32:
                 slot_var.type = "float"
-            elif var.dtype == core.VarDesc.VarType.INT64:
+            elif var.dtype == paddle.int64:
                 slot_var.type = "uint64"
-            elif var.dtype == core.VarDesc.VarType.INT32:
+            elif var.dtype == paddle.int32:
                 slot_var.type = "uint32"
             else:
                 raise ValueError(
diff --git a/python/paddle/base/framework.py b/python/paddle/base/framework.py
@@ -32,6 +32,7 @@
 
 import numpy as np
 
+import paddle
 import paddle.version as paddle_version
 
 from .. import pir
@@ -8154,13 +8155,13 @@ def _get_paddle_place_list(places):
 
 
 def dtype_to_str(in_dtype):
-    if in_dtype == core.VarDesc.VarType.FP16:
+    if in_dtype == paddle.float16:
         return "fp16"
-    elif in_dtype == core.VarDesc.VarType.BF16:
+    elif in_dtype == paddle.bfloat16:
         return "bf16"
-    elif in_dtype == core.VarDesc.VarType.FP32:
+    elif in_dtype == paddle.float32:
         return "fp32"
-    elif in_dtype == core.VarDesc.VarType.FP64:
+    elif in_dtype == paddle.float64:
         return "fp64"
     else:
         return None
diff --git a/python/paddle/distributed/auto_parallel/static/cost/base_cost.py b/python/paddle/distributed/auto_parallel/static/cost/base_cost.py
@@ -17,7 +17,6 @@
 import numpy as np
 
 import paddle
-from paddle.base.core import VarDesc
 from paddle.utils.flops import flops
 
 from ..cluster import DeviceType, LinkType, get_default_cluster
@@ -968,11 +967,11 @@ def calc_time_by_cost_model(op, cluster=None):
         ), "Only GPU device is supported currently."
 
         gflops = 0.0
-        if dtype == VarDesc.VarType.FP64:
+        if dtype == paddle.float64:
             gflops = device.dp_gflops
-        elif dtype == VarDesc.VarType.FP32:
+        elif dtype == paddle.float32:
             gflops = device.sp_gflops
-        elif dtype == VarDesc.VarType.FP16 or dtype == VarDesc.VarType.BF16:
+        elif dtype == paddle.float16 or dtype == paddle.bfloat16:
             gflops = device.hp_gflops
         else:
             raise ValueError(
