Enable Utilities::MPI::NoncontiguousPartitioner to handle padding #9639
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bangerth
reviewed
Mar 9, 2020
| return it == indices_has.end() ? 0 : (*it + 1); | ||
| [&indices_has_clean]() { | ||
| const auto it = | ||
| max_element(indices_has_clean.begin(), indices_has_clean.end()); |
There was a problem hiding this comment.
You'll want to use the following -- the current form may not work with some compilers.
Suggested change
| max_element(indices_has_clean.begin(), indices_has_clean.end()); | |
| std::max_element(indices_has_clean.begin(), indices_has_clean.end()); |
| const auto it = | ||
| max_element(indices_want.begin(), indices_want.end()); | ||
| return it == indices_want.end() ? 0 : (*it + 1); | ||
| max_element(indices_want_clean.begin(), indices_want_clean.end()); |
peterrum
force-pushed
the
nonconti_padding
branch
from
b30442e
to
804fb73
Compare
peterrum
changed the title
|
I have integrate @bangerth's suggestions, made a bug fix, and added a test. I think this PR is ready to be reviewed. |
kronbichler
reviewed
Mar 17, 2020
Comment on lines
203
to
213
| const types::global_dof_index n_dofs = Utilities::MPI::max( | ||
| std::max( | ||
| [&indices_has]() { | ||
| const auto it = max_element(indices_has.begin(), indices_has.end()); | ||
| return it == indices_has.end() ? 0 : (*it + 1); | ||
| [&indices_has_clean]() { | ||
| const auto it = std::max_element(indices_has_clean.begin(), | ||
| indices_has_clean.end()); | ||
| return it == indices_has_clean.end() ? 0 : (*it + 1); | ||
| }(), | ||
| [&indices_want]() { | ||
| const auto it = | ||
| max_element(indices_want.begin(), indices_want.end()); | ||
| return it == indices_want.end() ? 0 : (*it + 1); | ||
| [&indices_want_clean]() { | ||
| const auto it = std::max_element(indices_want_clean.begin(), | ||
| indices_want_clean.end()); | ||
| return it == indices_want_clean.end() ? 0 : (*it + 1); |
There was a problem hiding this comment.
This would be easier to read if you avoided the lambdas inside std::max in favor of plain code here with temporary variable like types::global_dof_index max_has = ... and max_wants.
There was a problem hiding this comment.
I have made the change.
|
/rebuild |
peterrum
force-pushed
the
nonconti_padding
branch
from
804fb73
to
fcc2518
Compare
kronbichler
reviewed
Mar 18, 2020
Comment on lines
203
to
207
| const types::global_dof_index local_n_dofs_has = [&indices_has_clean]() { | ||
| const auto it = | ||
| std::max_element(indices_has_clean.begin(), indices_has_clean.end()); | ||
| return it == indices_has_clean.end() ? 0 : (*it + 1); | ||
| }(); |
There was a problem hiding this comment.
We're almost there. I was thinking about this code and similar for the next block below:
Suggested change
| const types::global_dof_index local_n_dofs_has = [&indices_has_clean]() { | |
| const auto it = | |
| std::max_element(indices_has_clean.begin(), indices_has_clean.end()); | |
| return it == indices_has_clean.end() ? 0 : (*it + 1); | |
| }(); | |
| const types::global_dof_index local_n_dofs_has = indices_has_clean.empty() ? | |
| 0 : *std::max_element(indices_has_clean.begin(), indices_has_clean.end()); |
There was a problem hiding this comment.
I have made the change.
peterrum
force-pushed
the
nonconti_padding
branch
from
fcc2518
to
336eab7
Compare
kronbichler
approved these changes
Mar 18, 2020
|
Excellent, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR enables
Utilities::MPI::NoncontiguousPartitionerto handle padding in the source and destination vectors. The user can indicate that the purpose of a vector entry is only for padding by insertingnumbers::invalid_dof_indexintostd::vector<types::global_dof_index> &indices_hasand/orstd::vector<types::global_dof_index> &indices_want.I still need to write an appropriate test.
FYI @nfehn @kronbichler