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

Fix bugs of patch-sbp_cost #8456

Merged
merged 6 commits into from
Jun 22, 2022
Merged

Fix bugs of patch-sbp_cost #8456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b9fbba
Update group boxing to deal with hierarchy [1, 2]
Yipeng1994 Jun 20, 2022
b857401
Use a uniform sbp while grouping consumers
Yipeng1994 Jun 20, 2022
de2cc17
Steal "ParallelDimReduce"
Yipeng1994 Jun 20, 2022
d9f244b
Reduce to uniform B for 1 device.
Yipeng1994 Jun 21, 2022
bcbe9b7
Fix a bug of fix-group_boxing-bug
Yipeng1994 Jun 21, 2022
96c3244
Merge branch 'patch-sbp_cost' into fix-group_boxing-bug-2
Yipeng1994 Jun 21, 2022
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
3 changes: 2 additions & 1 deletion oneflow/core/framework/sbp_infer_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,10 @@ void NdSbpDimReduce(const ParallelDesc& parallel_desc, const NdSbp& nd_sbp,
}
}
}
// [1, 1, ..., 1]: Any --> [1]: (B)
if (reduced_hierarchy.empty()) {
reduced_hierarchy.emplace_back(hierarchy->At(0));
*reduced_nd_sbp->add_sbp_parallel() = nd_sbp.sbp_parallel(0);
reduced_nd_sbp->add_sbp_parallel()->mutable_broadcast_parallel();
}
ParallelConf reduced_parallel_conf = parallel_desc.parallel_conf();
Shape(reduced_hierarchy).ToProto(reduced_parallel_conf.mutable_hierarchy());
Expand Down
15 changes: 10 additions & 5 deletions oneflow/core/job_rewriter/group_boxing_by_dst_parallel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,24 @@ Maybe<void> GroupBoxingByDstParallel(const OpGraph& op_graph, JobBuilder* job_bu
if (IsClassRegistered<int32_t, DisableInputBoxingGroup>(op_type_case)) { return; }
for (const std::string& ibn : node->op().input_bns()) {
const auto& blob_modifier_ = node->op().InputBlobModifier4Ibn(ibn);
if (blob_modifier_.has_is_mutable() && blob_modifier_.is_mutable()) { return; }
if (blob_modifier_.has_is_mutable() && blob_modifier_.is_mutable()) { continue; }
const LogicalBlobId& lbi = node->op().BnInOp2Lbi(ibn);
const OpNode& producer = node->ProducerOpNode4Lbi(lbi);
const NdSbp& producer_nd_sbp = producer.NdSbp4Lbi(lbi);
ParallelDesc reduced_in_parallel_desc = producer.parallel_desc();
const std::string& producer_lbn = *CHECK_JUST(producer.op().obn4lbi(lbi));
const ParallelDesc& producer_parallel_desc =
*CHECK_JUST(producer.op().GetParallelDesc4BnInOp(producer_lbn)).get();
ParallelDesc reduced_in_parallel_desc = producer_parallel_desc;
NdSbp reduced_in_nd_sbp;
NdSbpDimReduce(producer.parallel_desc(), producer_nd_sbp, &reduced_in_parallel_desc,
NdSbpDimReduce(producer_parallel_desc, producer_nd_sbp, &reduced_in_parallel_desc,
&reduced_in_nd_sbp);

const NdSbp& consumer_nd_sbp = node->NdSbp4BnInOp(ibn);
ParallelDesc reduced_out_parallel_desc = node->parallel_desc();
const ParallelDesc& consumer_parallel_desc =
*CHECK_JUST(node->op().GetParallelDesc4BnInOp(ibn));
ParallelDesc reduced_out_parallel_desc = consumer_parallel_desc;
NdSbp reduced_out_nd_sbp;
NdSbpDimReduce(node->parallel_desc(), consumer_nd_sbp, &reduced_out_parallel_desc,
NdSbpDimReduce(consumer_parallel_desc, consumer_nd_sbp, &reduced_out_parallel_desc,
&reduced_out_nd_sbp);

if (reduced_in_parallel_desc == reduced_out_parallel_desc
Expand Down