hwloc: add support for hwloc v1.5 #3083
Merged
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
jsquyres
requested changes
Mar 2, 2017
opal/mca/hwloc/base/hwloc_base_dt.c
Outdated
| /* use the hwloc dup function */ | ||
| return hwloc_topology_dup(dest, src); | ||
| #else | ||
| /* hwloc v1.5 does not support hwloc_topology_dup. | ||
| * note this copy function is not used anywhere in the code base yet */ |
There was a problem hiding this comment.
I would change this comment to:
/* hwloc_topology_dup() was introduced in hwloc v1.8.0.
* Note that as of March 2017, opal_hwloc_copy() is not (yet?) used in the code base anywhere. */| @@ -1549,6 +1550,10 @@ char* opal_hwloc_base_find_coprocessors(hwloc_topology_t topo) | |||
| OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output, | |||
| "hwloc:base:find_coprocessors: hosting coprocessors %s", | |||
| (NULL == cpstring) ? "NONE" : cpstring)); | |||
| #else | |||
| OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output, | |||
| "hwloc:base:find_coprocessors: this hwloc version cannot find any coprocessor")); | |||
There was a problem hiding this comment.
I would change this message to:
hwloc:base:find_coprocessors: the version of hwloc that Open MPI was built against (v%d.%d.%d) does not support detecting coprocessors
hwloc v1.5 does not support HWLOC_OBJ_OSDEV_COPROC nor hwloc_topology_dup(), so for this version : - do not search for coprocessors - do not try hwloc_topology_dup(), note this is not used anywhere in the code base Thanks Jeff for helping with the wording Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
ggouaillardet
force-pushed
the
topic/hwloc_v15
branch
from
f1d5a5f
to
7e01be6
Compare
|
@jsquyres done, thanks for helping with the wording. |
|
@jsquyres shall i merge this PR now ? |
jsquyres
approved these changes
Mar 7, 2017
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.
hwloc v1.5 does not support HWLOC_OBJ_OSDEV_COPROC
nor hwloc_topology_dup(), so for this version :
used anywhere in the code base
Signed-off-by: Gilles Gouaillardet gilles@rist.or.jp