Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoParallel] Support vector and optional<vector> InferSPMD input and output. #58573

Merged
merged 9 commits into from
Nov 6, 2023
Merged

[AutoParallel] Support vector and optional<vector> InferSPMD input and output. #58573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
56cd477
[AutoParallel] Support vector and optional<vector> InferSPMD input an…
GhostScreaming Nov 1, 2023
276d004
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
GhostScreaming Nov 1, 2023
be41f74
Fix some problems.
GhostScreaming Nov 1, 2023
4f08ef0
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
GhostScreaming Nov 2, 2023
536db66
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
GhostScreaming Nov 2, 2023
89acd77
Fix conflicts.
GhostScreaming Nov 2, 2023
788f308
Polish code.
GhostScreaming Nov 2, 2023
2128a56
Polish code.
GhostScreaming Nov 3, 2023
0e14c0e
Polish code.
GhostScreaming Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions paddle/phi/api/lib/api_custom_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ Tensor add_n_impl(const std::vector<Tensor>& x) {
}

auto meta_dist_input_x = MakeDistMetaTensor(input_x);
auto spmd_info =
phi::distributed::VariadicReplicatedInferSpmd(meta_dist_input_x);
auto spmd_info = phi::distributed::VariadicReplicatedInferSpmdDynamic(
meta_dist_input_x);

auto dist_out = SetKernelDistOutput(&api_output);
auto dense_out = dist_out->unsafe_mutable_value();
Expand All @@ -139,7 +139,7 @@ Tensor add_n_impl(const std::vector<Tensor>& x) {
phi::AddNInferMeta(x_metas, &meta_dist_out);
if (rank_is_in_current_mesh) {
auto dist_input_x =
ReshardApiInputToReplicatedKernelInput(dev_ctx, x, spmd_info.first);
ReshardApiInputToKernelInput(dev_ctx, x, spmd_info.first[0]);
dist_input_x = PrepareDataForDistTensor(
dist_input_x,
GetKernelInputArgDef(kernel.InputAt(0), kernel_backend),
Expand All @@ -165,14 +165,15 @@ Tensor add_n_impl(const std::vector<Tensor>& x) {
auto* kernel_fn = kernel.GetVariadicKernelFn<kernel_signature>();
(*kernel_fn)(*dev_ctx, input_x, dense_out);
}
PADDLE_ENFORCE_EQ(
paddle::holds_alternative<phi::distributed::TensorDistAttr>(
spmd_info.first[0]),
true,
phi::errors::PreconditionNotMet(
"Arg must be a single TensorDistAttr"));
PADDLE_ENFORCE_EQ(paddle::holds_alternative<
std::vector<phi::distributed::TensorDistAttr>>(
spmd_info.first[0]),
true,
phi::errors::PreconditionNotMet(
"Arg must be a vector of TensorDistAttr"));

auto current_process_mesh =
paddle::get<0>(spmd_info.first[0]).process_mesh();
paddle::get<1>(spmd_info.first[0]).at(0).process_mesh();
SetReplicatedDistAttrForOutput(dist_out, current_process_mesh);
return api_output;
}
Expand Down
Loading