Skip to content

Conversation

@jsquyres
Copy link
Member

@jsquyres jsquyres commented Oct 5, 2016

@bturrubiates This is the same as #2157, but with several more bug fix commits that hadn't yet come over from master --> v2.0.x (but were already on v2.1.x). You should probably review individual commits; not the union of all commits.

A few commits had to be back-ported here (i.e., to the v2.0.x branch) because the usNIC BTL on master/v2.1.x support MPI_THREAD_MULTIPLE, but the usNIC BTL on v2.0.x does not.

@jsquyres jsquyres added the bug label Oct 5, 2016
@jsquyres jsquyres added this to the v2.0.2 milestone Oct 5, 2016
@jsquyres jsquyres force-pushed the pr/v2.0.2/usnic-bug-fixes-2 branch from 9c0b8ac to 056aa37 Compare October 5, 2016 01:02
With libfabric v1.4, the usnic provider changed the values of its
fabric and domain name strings (compared to libfabric <v1.4).  Update
the Open MPI usNIC BTL to handle both pre-v1.4 and v1.4 fabric/domain
names.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 6f5e377)
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 9717bcb)
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit f56b16f)
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 87a5ccc)
The previous message was unhelpful / confusing.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit b138138)
There are critical usnic libfabric AV insert bugs before v1.3, so
don't allow any version prior to v1.3 at run time (still allow
*compiling* with earlier versions, though, since the ABI guarantees
allow us to compile with an earlier libfabric and run with a later
libfabric).

Switch to using fi_version() to check the version (instead of calling
fi_getinfo()) as a potentially lighter-weight / simpler solution.
This allows us to only call fi_getinfo() once.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 345c07a)
We only support running with libfabric v1.3 or greater.  So it's safe
to remove the legacy/adaptive cq_readerr() behavior.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 8b77359)
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 67684be)
@jsquyres jsquyres force-pushed the pr/v2.0.2/usnic-bug-fixes-2 branch from 80b7eed to 9ed1145 Compare October 5, 2016 09:43
Copy link
Contributor

@ompiteam ompiteam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bturrubiates approved; filing an "approved" by an OMPI committer so that Github accepts it.

@jsquyres
Copy link
Member Author

jsquyres commented Oct 5, 2016

@hppritcha Good to go.

@hppritcha hppritcha merged commit 7f6311d into open-mpi:v2.0.x Oct 7, 2016
@jsquyres jsquyres deleted the pr/v2.0.2/usnic-bug-fixes-2 branch October 7, 2016 20:48
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.

4 participants