Skip to content

Conversation

hjelmn
Copy link
Member

@hjelmn hjelmn commented Jan 7, 2016

This update brings hwloc up to 1.11.2 and brings in a bug fix for Cray systems.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
@hjelmn
Copy link
Member Author

hjelmn commented Jan 7, 2016

@hppritcha This fixes an error message printed out on Trinity due to abnormally long /proc/mounts lines. I discussed this with @jsquyres and it should be good to go into v2.0.0. Will open the PR as soon as this is merged on master.

@jsquyres
Copy link
Member

jsquyres commented Jan 7, 2016

@hjelmn Can you add a README-ompi.txt file in the new component directory that contains the hash of the commit that you cherry-picked? That helps us track it (especially if the git commit logs aren't available for whatever reason). Thanks.

setmntent() doesn't support root_fd, but manual parsing of
/proc/mounts is fragile, and actually buggy for very long mount lines
(see open-mpi/hwloc#142 (comment)).

Since we only openat("/proc/mounts") there, just manually concatenate
the fsroot_path and use setmntent().

Thanks to Nathan Hjelm for the report.

(Cherry-picked from open-mpi/hwloc@d2d07b9)

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
@hjelmn
Copy link
Member Author

hjelmn commented Jan 7, 2016

@jsquyres Added to the second commit.

@hjelmn
Copy link
Member Author

hjelmn commented Jan 7, 2016

@jsquyres Looks like this is good to go if you are ok with it.

@jsquyres
Copy link
Member

jsquyres commented Jan 7, 2016

@hppritcha I'm good with this. It fixes a real bug on the Cray systems, and fixes whatever other bugs hwloc fixed from 1.11.1 to 1.11.2. Sound ok to you?

@jsquyres jsquyres assigned hppritcha and unassigned jsquyres Jan 7, 2016
@jsquyres
Copy link
Member

jsquyres commented Jan 7, 2016

👍

@hjelmn
Copy link
Member Author

hjelmn commented Jan 7, 2016

Ok, will merge and open for v2.0.0.

hjelmn added a commit that referenced this pull request Jan 7, 2016
Update hwloc to 1.11.2 + Fix /proc/mounts issue.
@hjelmn hjelmn merged commit faeca56 into open-mpi:master Jan 7, 2016
jsquyres pushed a commit to jsquyres/ompi that referenced this pull request Aug 23, 2016
…-message-update

help-orterun: remove blank line at end of help message
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants