support creating 0-size parameter and correct data_ptr of 0-size Tensor from None to 0 (#70071)

HydrogenSulfate · web-flow · commit 3ef2484e7921 · 2024-12-10T17:22:56.000+08:00
diff --git a/paddle/fluid/pybind/eager_method.cc b/paddle/fluid/pybind/eager_method.cc
@@ -1176,16 +1176,17 @@ static PyObject* tensor__share_underline_tensor_to(TensorObject* self,
   EAGER_TRY
   paddle::Tensor* src_ptr =
       &(reinterpret_cast<TensorObject*>(PyTuple_GET_ITEM(args, 0))->tensor);
-  if (!self->tensor.initialized()) {
-    PADDLE_ENFORCE(self->tensor.is_dist_tensor() &&
-                       !phi::distributed::IsCurRankInMesh(
-                           static_cast<phi::distributed::DistTensor*>(
-                               self->tensor.impl().get())
-                               ->process_mesh()),
-                   common::errors::InvalidArgument(
-                       "Tensor %s has not been initialized! Please initialize "
-                       "src tensor before share_buffer_with to other.",
-                       self->tensor.name()));
+  if (!(self->tensor.defined() && self->tensor.has_allocation())) {
+    PADDLE_ENFORCE(
+        self->tensor.is_dist_tensor() &&
+            !phi::distributed::IsCurRankInMesh(
+                static_cast<phi::distributed::DistTensor*>(
+                    self->tensor.impl().get())
+                    ->process_mesh()),
+        common::errors::InvalidArgument(
+            "Tensor %s either lacks impl_ or holder_, Please initialize "
+            "src tensor before share_buffer_with to other.",
+            self->tensor.name()));
   }
   src_ptr->set_impl(self->tensor.impl());
   RETURN_PY_NONE
@@ -3147,12 +3148,14 @@ static PyObject* tensor_data_ptr(TensorObject* self,
                                  PyObject* args,
                                  PyObject* kwargs) {
   EAGER_TRY
-  if (self->tensor.initialized() && self->tensor.is_dense_tensor()) {
+  if (self->tensor.defined() && self->tensor.has_allocation() &&
+      self->tensor.is_dense_tensor()) {
     return ToPyObject(
         (int64_t)std::dynamic_pointer_cast<phi::DenseTensor>(  // NOLINT
             self->tensor.impl())
             ->data());
-  } else if (self->tensor.initialized() && self->tensor.is_dist_tensor()) {
+  } else if (self->tensor.defined() && self->tensor.has_allocation() &&
+             self->tensor.is_dist_tensor()) {
     return ToPyObject(
         (int64_t)
             std::dynamic_pointer_cast<phi::distributed::DistTensor>(  // NOLINT
diff --git a/python/paddle/base/layer_helper_base.py b/python/paddle/base/layer_helper_base.py
@@ -360,8 +360,8 @@ def create_parameter(
             return None
         assert isinstance(attr, ParamAttr)
         for i, size in enumerate(shape):
-            assert size > 0, (
-                "Expected every dim's size to be larger than 0, "
+            assert size >= 0, (
+                "Expected every dim's size to be larger than or equal to 0, "
                 f"but the size of the {i}-th dim is {size}"
             )
         # set global dtype
diff --git a/test/legacy_test/test_deform_conv2d.py b/test/legacy_test/test_deform_conv2d.py
@@ -321,27 +321,5 @@ def setUp(self):
         self.no_bias = False
 
 
-class TestDeformConv2DError(unittest.TestCase):
-
-    def test_input_error(self):
-        def test_input_rank_error():
-            paddle.enable_static()
-            x = paddle.static.data(name='error_x_1', shape=[0], dtype='float32')
-            offset = paddle.static.data(
-                name='error_offset_1', shape=[0], dtype='float32'
-            )
-            mask = paddle.static.data(
-                name='error_mask_1', shape=[0, 0, 0], dtype='float32'
-            )
-            out = paddle.vision.ops.DeformConv2D(
-                in_channels=0,
-                out_channels=0,
-                kernel_size=0,
-                deformable_groups=0,
-            )(x, offset, mask)
-
-        self.assertRaises(AssertionError, test_input_rank_error)
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/test/legacy_test/test_deformable_conv_op.py b/test/legacy_test/test_deformable_conv_op.py
@@ -405,23 +405,6 @@ def test_invalid_offset():
 
         self.assertRaises(TypeError, test_invalid_offset)
 
-        def test_invalid_filter():
-            paddle.enable_static()
-            input = paddle.static.data(
-                name='input_filter', shape=[None, 3, 32, 32], dtype='float32'
-            )
-            offset = paddle.static.data(
-                name='offset_filter', shape=[None, 3, 32, 32], dtype='float32'
-            )
-            mask = paddle.static.data(
-                name='mask_filter', shape=[None, 3, 32, 32], dtype='float32'
-            )
-            loss = paddle.vision.ops.DeformConv2D(
-                in_channels=input.shape[1], out_channels=4, kernel_size=0
-            )(input, offset, mask)
-
-        self.assertRaises(AssertionError, test_invalid_filter)
-
         def test_invalid_groups():
             paddle.enable_static()
             input = paddle.static.data(
diff --git a/test/legacy_test/test_parameter.py b/test/legacy_test/test_parameter.py
@@ -75,6 +75,22 @@ def test_parambase(self):
             pram_copy2 = copy.deepcopy(param, memo)
             self.assertEqual(id(param_copy), id(pram_copy2))
 
+    def test_create_0_size_param(self):
+        with guard():
+            shape = [0, 4]
+            for dtype in [
+                paddle.float32,
+                paddle.float64,
+            ]:
+                zero_size_param = paddle.create_parameter(
+                    shape,
+                    dtype,
+                )
+                self.assertEqual(zero_size_param.shape, shape)
+                self.assertEqual(zero_size_param.data_ptr(), 0)
+                # strides will be same with shape for 0-size tensor in paddle
+                self.assertEqual(zero_size_param.strides, shape)
+
     def func_exception(self):
         b = main_program.global_block()
         with self.assertRaises(ValueError):
