[PIR] empty support pir (#63321)

wanghuancoder · web-flow · commit 0c6307b94c59 · 2024-04-09T15:54:22.000+08:00
* empty support pir
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -2125,7 +2125,39 @@ def empty(shape, dtype=None, name=None):
     dtype = convert_dtype(dtype)
 
     if in_dynamic_or_pir_mode():
-        shape = paddle.utils.convert_shape_to_list(shape)
+        if in_dynamic_mode():
+            shape = paddle.utils.convert_shape_to_list(shape)
+        else:
+            check_dtype(
+                dtype,
+                'dtype',
+                [
+                    'bool',
+                    'float16',
+                    'float32',
+                    'float64',
+                    'uint16',
+                    'int32',
+                    'int64',
+                    'complex64',
+                    'complex128',
+                ],
+                'empty',
+            )
+
+            paddle.utils.check_shape(shape)
+            if isinstance(shape, np.ndarray):
+                shape = shape.tolist()
+            if isinstance(shape, (list, tuple)):
+                if paddle.utils._contain_var(shape):
+                    shape = paddle.utils.get_int_tensor_list(
+                        shape, _current_expected_place()
+                    )
+            elif isinstance(shape, paddle.pir.Value):
+                pass
+            else:
+                raise TypeError("Shape only supports Value, or list, or tuple.")
+
         out = _C_ops.empty(
             shape, convert_np_dtype_to_dtype_(dtype), _current_expected_place()
         )
diff --git a/test/ir/pir/cinn/symbolic/test_infer_sym_shape_nullary_op.py b/test/ir/pir/cinn/symbolic/test_infer_sym_shape_nullary_op.py
@@ -110,7 +110,7 @@ def prepare_data(self):
     def test_eval_symbolic(self):
         net = EmptyNet()
 
-        x_spec = InputSpec(shape=[None, None, None], dtype='float32')
+        x_spec = InputSpec(shape=[None, None, None], dtype='int32')
         input_spec = [x_spec]
         net = apply_to_static(net, False, input_spec)
         net.eval()
diff --git a/test/legacy_test/test_empty_op.py b/test/legacy_test/test_empty_op.py
@@ -20,7 +20,7 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.framework import convert_np_dtype_to_dtype_
+from paddle.base.framework import convert_np_dtype_to_proto_type
 
 
 # Situation 1: Attr(shape) is a list(without tensor)
@@ -59,7 +59,7 @@ def verify_output(self, outs):
     def init_config(self):
         shape = [500, 3]
         dtype = 'float32'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(dtype)}
@@ -69,7 +69,7 @@ class TestEmptyOp2(TestEmptyOp):
     def init_config(self):
         shape = [500, 3]
         dtype = 'float64'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(dtype)}
@@ -79,7 +79,7 @@ class TestEmptyOp3(TestEmptyOp):
     def init_config(self):
         shape = [500, 3]
         dtype = 'int32'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(dtype)}
@@ -89,7 +89,7 @@ class TestEmptyOp4(TestEmptyOp):
     def init_config(self):
         shape = [500, 3]
         dtype = 'int64'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(dtype)}
@@ -99,7 +99,7 @@ class TestEmptyOp5(TestEmptyOp):
     def init_config(self):
         shape = [500, 3]
         dtype = 'bool'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(dtype)}
@@ -115,7 +115,7 @@ def setUp(self):
     def init_config(self):
         self.shape = [500, 3]
         dtype = 'float32'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
         self.attrs = {'dtype': dtype_inner}
         self.inputs = {"ShapeTensor": np.array(self.shape).astype("int32")}
         self.outputs = {'Out': np.zeros(self.shape).astype(dtype)}
@@ -159,7 +159,7 @@ def init_config(self):
         self.infer_shape = [-1, 92]
 
         dtype = 'float32'
-        dtype_inner = convert_np_dtype_to_dtype_(dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(dtype)
 
         shape_tensor_list = []
         for index, ele in enumerate(self.shape):
@@ -241,6 +241,7 @@ def test_dygraph_api_attr(self):
         paddle.enable_static()
 
     def test_static_graph(self):
+        paddle.enable_static()
         dtype = 'float64'
 
         positive_2_int32 = paddle.tensor.fill_constant([1], "int32", 3)
@@ -287,7 +288,7 @@ class TestEmptyFP16Op(TestEmptyOp):
     def init_config(self):
         shape = [500, 3]
         self.dtype = np.float16
-        dtype_inner = convert_np_dtype_to_dtype_(self.dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(self.dtype)
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
         self.inputs = {}
         self.outputs = {'Out': np.zeros(shape).astype(self.dtype)}
@@ -305,7 +306,7 @@ def setUp(self):
         self.__class__.op_type = self.op_type
         self.python_api = paddle.empty
         shape = np.array([200, 3]).astype('int32')
-        dtype_inner = convert_np_dtype_to_dtype_(self.dtype)
+        dtype_inner = convert_np_dtype_to_proto_type(self.dtype)
         output = np.zeros(shape).astype(self.dtype)
         self.inputs = {}
         self.attrs = {'shape': shape, 'dtype': dtype_inner}
@@ -328,6 +329,7 @@ def verify_output(self, outs):
 class TestEmptyError(unittest.TestCase):
     def test_attr(self):
         def test_dtype():
+            paddle.enable_static()
             shape = [200, 3]
             dtype = 'uint8'
             result = paddle.empty(shape=shape, dtype=dtype)
