fix reshape and reshard (#59688)

LiYuRio · web-flow · commit f363aeaa103e · 2023-12-06T16:03:48.000+08:00
diff --git a/paddle/phi/api/lib/tensor_utils.cc b/paddle/phi/api/lib/tensor_utils.cc
@@ -138,8 +138,12 @@ PADDLE_API std::shared_ptr<phi::distributed::DistTensor> reshard(
                                                                  dist_attr);
       dist_out_ptr = func->Eval(dev_ctx, *dist_tensor, dist_attr);
     } else {
-      dist_out_ptr = std::static_pointer_cast<phi::distributed::DistTensor>(
-          input_tensor_impl);
+      phi::distributed::DistTensor* dist_tensor =
+          static_cast<phi::distributed::DistTensor*>(input_tensor_impl.get());
+      dist_out_ptr = std::make_shared<phi::distributed::DistTensor>(
+          dist_tensor->dims(), dist_attr);
+      phi::DenseTensor* dense_out = dist_out_ptr->unsafe_mutable_value();
+      *dense_out = dist_tensor->value();
     }
   }
   return dist_out_ptr;
diff --git a/paddle/phi/infermeta/unary.cc b/paddle/phi/infermeta/unary.cc
@@ -3464,6 +3464,7 @@ void ReshapeWithXShapeInferMeta(const MetaTensor& x,
   xshape->set_dims(common::make_ddim(xshape_dims));
   xshape->share_lod(x);
   xshape->set_strides(x.strides());
+  xshape->set_dtype(DataType::INT64);
   ReshapeInferMeta(x, shape, out, config);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3464,6 +3464,7 @@ void ReshapeWithXShapeInferMeta(const MetaTensor& x,`
`3464`	`3464`	`xshape->set_dims(common::make_ddim(xshape_dims));`
`3465`	`3465`	`xshape->share_lod(x);`
`3466`	`3466`	`xshape->set_strides(x.strides());`
	`3467`	`+ xshape->set_dtype(DataType::INT64);`
`3467`	`3468`	`ReshapeInferMeta(x, shape, out, config);`
`3468`	`3469`	`}`
`3469`	`3470`