Topic/pr7201 to v40x #7356
Merged
Topic/pr7201 to v40x #7356
Conversation
This file contains hidden or 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
Both opal_hwloc_base_get_relative_locality() and _get_locality_string() iterate over hwloc levels to build the proc locality information. Unfortunately, NUMA nodes are not in those normal levels anymore since 2.0. We have to explicitly look a the special NUMA level to get that locality info. I am factorizing the core of the iterations inside dedicated "_by_depth" functions and calling them again for the NUMA level at the end of the loops. Thanks to Hatem Elshazly for reporting the NUMA communicator split failure at https://www.mail-archive.com/users@lists.open-mpi.org/msg33589.html It looks like only the opal_hwloc_base_get_locality_string() part is needed to fix that split, but there's no reason not to fix get_relative_locality() as well. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> (cherry picked from commit ea80a20)
not being defined. related to open-mpi#7201 Signed-off-by: Howard Pritchard <howardp@lanl.gov>
|
I'll give it a build / test tomorrow and then merge this after a review. |
|
@gpaulsen don't merge yet. this will break backward compatibility with hwloc 1 series. |
|
I assume the issues you're referring to are resolved by #7366 ? |
|
@gpaulsen Yes, they should. |
Refs open-mpi#7362 Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> (cherry picked from commit 329d445)
|
Okay, I pushed the commit from #7366 to this branch as well. |
|
oops. Thanks for double checking. I'll cherry-pick again in the next hour. |
Build was broken by mistake in commit d40662edc41a5a4d09ae690b640cfdeeb24e15a1 Fixes open-mpi#7362 Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> (cherry picked from commit 907ad85)
|
Ok, please re-review. Note that I also changed f136804#diff-f4ec0cf4c6659e1c4af03b7a807378d8R2262 to asprintf. I think that was correct, but wanted to point it out. |
|
@gpaulsen looks good and ready to merge |
gpaulsen
approved these changes
Feb 12, 2020
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.
No description provided.