Revert "[PHI]fix 0 size error (#71485)" (#71568) (#71576)

This reverts commit e134de7.

Author: phlrain

paddle/phi/infermeta/binary.cc

@@ -2434,19 +2434,16 @@ void IndexSelectInferMeta(const MetaTensor& x,
           "the dimension of Input(Index) is [%d].",
           index_dim,
           index_dim.size()));
-  if (dim < 0) {
-    dim += input_dim.size();
-  }
 
-  if (input_dim[dim] != 0) {
-    PADDLE_ENFORCE_EQ(index_dim[0] != 0,
-                      true,
-                      common::errors::InvalidArgument(
-                          "The length of Input(Index) can't be 0."));
-  }
+  PADDLE_ENFORCE_EQ(index_dim[0] != 0,
+                    true,
+                    common::errors::InvalidArgument(
+                        "The length of Input(Index) can't be 0."));
 
   auto output_dim = common::vectorize(input_dim);
-
+  if (dim < 0) {
+    dim += input_dim.size();
+  }
   output_dim[dim] = index_dim[0];
   output->set_dims(common::make_ddim(output_dim));
   output->set_dtype(x.dtype());
@@ -3671,23 +3668,18 @@ void RepeatInterleaveWithTensorIndexInferMeta(const MetaTensor& x,
           repeats_dim,
           repeats_dim.size()));
 
-  if (input_dim.size() == 1 && input_dim[0] == 0) {
-    output_dim[0] = 0;
-  } else {
-    PADDLE_ENFORCE_EQ(repeats_dim[0] != 0,
-                      true,
-                      common::errors::InvalidArgument(
-                          "The length of Input(RepeatsTensor) can't be 0."));
-    PADDLE_ENFORCE_NE(
-        out,
-        nullptr,
-        common::errors::InvalidArgument(
-            "repeat_interleave's output tensor can't be nullptr"));
-    if (dim < 0) {
-      dim += input_dim.size();
-    }
-    output_dim[dim] = -1;
+  PADDLE_ENFORCE_EQ(repeats_dim[0] != 0,
+                    true,
+                    common::errors::InvalidArgument(
+                        "The length of Input(RepeatsTensor) can't be 0."));
+  PADDLE_ENFORCE_NE(out,
+                    nullptr,
+                    common::errors::InvalidArgument(
+                        "repeat_interleave's output tensor can't be nullptr"));
+  if (dim < 0) {
+    dim += input_dim.size();
   }
+  output_dim[dim] = -1;
 
   out->set_dims(common::make_ddim(output_dim));
   out->share_lod(x);

paddle/phi/kernels/gpu/concat_kernel.cu

@@ -45,10 +45,6 @@ void ConcatKernel(const Context& dev_ctx,
   out->Resize(out_dims);
   dev_ctx.template Alloc<T>(out);
 
-  if (out->numel() == 0) {
-    return;
-  }
-
   // If axis is 0, the lod of the output is not the same as inputs.
   if (axis == 0 && x[0]->lod().size() > 0) {
     size_t lod_size_0 = x[0]->lod().size();

paddle/phi/kernels/gpu/masked_select_kernel.cu

@@ -53,13 +53,6 @@ void MaskedSelectKernel(const Context& dev_ctx,
   DenseTensor mask_expand;
   DenseTensor x_expand;
 
-  if (x.numel() == 0 || mask.numel() == 0) {
-    out->Resize({0});
-    dev_ctx.template Alloc<T>(out);
-
-    return;
-  }
-
   auto expanded_size = funcs::MatrixGetBroadcastBatchPortion(
       common::vectorize(x.dims()), common::vectorize(mask.dims()));
 

paddle/phi/kernels/impl/repeat_interleave_kernel_impl.h

@@ -120,10 +120,6 @@ void RepeatInterleaveWithTensorIndexKernel(const Context& ctx,
                                            const DenseTensor& repeats_tensor,
                                            int dim,
                                            DenseTensor* out) {
-  if (x.numel() == 0) {
-    ctx.template Alloc<T>(out);
-    return;
-  }
   auto place = ctx.GetPlace();
   auto cpu_place = phi::CPUPlace();
 

paddle/phi/kernels/kps/reduce_kernel.cu

@@ -249,16 +249,9 @@ void SumRawKernel(const Context& dev_ctx,
       }
     }
     out->Resize(phi::make_ddim(out_dims));
-    if (x.dtype() == phi::DataType::BOOL || x.dtype() == phi::DataType::INT32) {
-      dev_ctx.template Alloc<int64_t>(out);
-      FullKernel<int64_t, Context>(
-          dev_ctx, out_dims, 0, phi::CppTypeToDataType<int64_t>::Type(), out);
-    } else {
-      dev_ctx.template Alloc<T>(out);
-      FullKernel<T, Context>(
-          dev_ctx, out_dims, 0, phi::CppTypeToDataType<T>::Type(), out);
-    }
-
+    dev_ctx.template Alloc<T>(out);
+    FullKernel<T, Context>(
+        dev_ctx, out_dims, 0, phi::CppTypeToDataType<T>::Type(), out);
     return;
   }
   if (x.numel() > std::numeric_limits<int32_t>::max()) {

python/paddle/tensor/manipulation.py

@@ -1409,6 +1409,8 @@ def concat(
     if in_dynamic_mode():
         if isinstance(axis, Variable):
             axis = axis.item(0)
+        if not isinstance(input, (Variable, paddle.pir.Value)):
+            input = [t for t in input if t.shape.count(0) == 0]
         return _C_ops.concat(input, axis)
     elif in_pir_mode():