Merge with add_n_kernel PR PaddlePaddle#49854

zhhsplendid · Jan 16, 2023 · 5dfd603 · 5dfd603
1 parent 9cfb275
commit 5dfd603
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/paddle/fluid/operators/controlflow/conditional_block_op.cc b/paddle/fluid/operators/controlflow/conditional_block_op.cc
@@ -384,10 +384,8 @@ class ConditionalBlockGradOp : public ConditionalOp {
     if (!input_tensor.IsInitialized() || input_tensor.numel() == 0) {
       return;
     }
-    if (input_tensor.dims().size() != 0) {
-      outside_tensor->Resize(input_tensor.dims());
-    }
     VLOG(4) << "Assigning zero to " << outside_tensor;
+    outside_tensor->Resize(input_tensor.dims());
     outside_tensor->mutable_data(place, input_tensor.dtype());
     const platform::DeviceContext *dev_ctx =
         platform::DeviceContextPool::Instance().Get(place);

diff --git a/paddle/phi/kernels/cpu/add_n_kernel.cc b/paddle/phi/kernels/cpu/add_n_kernel.cc
@@ -21,13 +21,6 @@ void AddNKernel(const Context& dev_ctx,
                 const std::vector<const TensorBase*>& x,
                 DenseTensor* out) {
   size_t in_num = x.size();
-  for (const TensorBase* tb : x) {
-    if (tb->initialized() && DenseTensor::classof(tb)) {
-      auto* dt = static_cast<const DenseTensor*>(tb);
-      out->set_meta(dt->meta());
-      break;
-    }
-  }
   dev_ctx.template Alloc<T>(out);
 
   bool in_place = false;

diff --git a/paddle/phi/kernels/gpu/add_n_kernel.cu b/paddle/phi/kernels/gpu/add_n_kernel.cu
@@ -94,15 +94,6 @@ void AddNKernel(const Context &dev_ctx,
     grids = dim3(CEIL_DIV(length, tile_size), 1, 1);
     blocks = dim3(tile_size, 1, 1);
   };
-
-  for (const TensorBase *tb : x) {
-    if (tb->initialized() && DenseTensor::classof(tb)) {
-      auto *dt = static_cast<const DenseTensor *>(tb);
-      out->set_meta(dt->meta());
-      break;
-    }
-  }
-
   auto *out_ptr = dev_ctx.template Alloc<T>(out);
   bool in_place = false;
   if (x.size() > 0 && x[0]->initialized() && DenseTensor::classof(x[0])) {