[FIX]: Inconsistent dtype between the old and new IR (#65997)

0x3878f · web-flow · commit 74411e4223e2 · 2024-07-15T21:53:26.000+08:00
diff --git a/python/paddle/base/executor.py b/python/paddle/base/executor.py
@@ -721,11 +721,7 @@ def _as_lodtensor(data, place, dtype=None):
         assert (
             dtype is not None
         ), 'The dtype should be given when feed data is not np.ndarray'
-        dtype = (
-            convert_dtype(dtype)
-            if isinstance(dtype, core.VarDesc.VarType)
-            else dtype
-        )
+        dtype = convert_dtype(dtype)
         if np.isscalar(data):
             data = np.array(data).astype(dtype)
         elif isinstance(data, (list, tuple)):
diff --git a/python/paddle/framework/dtype.py b/python/paddle/framework/dtype.py
@@ -186,7 +186,9 @@ def iinfo(dtype):
             uint8
 
     """
-    if dtype in _NUMPY_DTYPE_2_PADDLE_DTYPE:
+    if isinstance(dtype, paddle.pir.core.DataType):
+        dtype = paddle.base.framework.paddle_type_to_proto_type[dtype]
+    elif dtype in _NUMPY_DTYPE_2_PADDLE_DTYPE:
         dtype = _NUMPY_DTYPE_2_PADDLE_DTYPE[dtype]
     return core_iinfo(dtype)
 
diff --git a/test/legacy_test/test_executor_feed_non_tensor.py b/test/legacy_test/test_executor_feed_non_tensor.py
@@ -22,12 +22,12 @@ class TestAsLodTensor(unittest.TestCase):
     def test_as_lodtensor_int32(self):
         cpu = base.CPUPlace()
         tensor = base.executor._as_lodtensor(1.0, cpu, paddle.int32)
-        self.assertEqual(tensor._dtype(), paddle.int32)
+        self.assertEqual(tensor._dtype(), base.core.VarDesc.VarType.INT32)
 
     def test_as_lodtensor_fp64(self):
         cpu = base.CPUPlace()
         tensor = base.executor._as_lodtensor(1, cpu, paddle.float64)
-        self.assertEqual(tensor._dtype(), paddle.float64)
+        self.assertEqual(tensor._dtype(), base.core.VarDesc.VarType.FP64)
 
     def test_as_lodtensor_assertion_error(self):
         cpu = base.CPUPlace()
@@ -46,12 +46,12 @@ def test_as_lodtensor_type_error(self):
     def test_as_lodtensor_list(self):
         cpu = base.CPUPlace()
         tensor = base.executor._as_lodtensor([1, 2], cpu, paddle.float64)
-        self.assertEqual(tensor._dtype(), paddle.float64)
+        self.assertEqual(tensor._dtype(), base.core.VarDesc.VarType.FP64)
 
     def test_as_lodtensor_tuple(self):
         cpu = base.CPUPlace()
         tensor = base.executor._as_lodtensor((1, 2), cpu, paddle.float64)
-        self.assertEqual(tensor._dtype(), paddle.float64)
+        self.assertEqual(tensor._dtype(), base.core.VarDesc.VarType.FP64)
 
     def test_as_lodtensor_nested_list(self):
         cpu = base.CPUPlace()
diff --git a/test/legacy_test/test_iinfo_and_finfo.py b/test/legacy_test/test_iinfo_and_finfo.py
