Skip to content

v2.x: hwloc: correctly handle --with-hwloc=external #2619

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Dec 22, 2016

Conversation

ggouaillardet
Copy link
Contributor

  • simply #include "hwloc.h" to use the external hwloc header
  • do use the external hwloc header instead of opal/mca/hwloc/hwloc.h

Thanks Orion Poplawski for the report

Fixes #2616

Signed-off-by: Gilles Gouaillardet gilles@rist.or.jp

(cherry picked from commit 9649c44)

- simply #include "hwloc.h" to use the external hwloc header
- do use the external hwloc header instead of opal/mca/hwloc/hwloc.h

Thanks Orion Poplawski for the report

Fixes open-mpi#2616

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

(cherry picked from commit open-mpi/ompi@9649c44)
Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

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

Please add 3571c3c

@hppritcha
Copy link
Member

@jsquyres should I just add 3571c3c to a copy of this PR so we can merge it in while folks are sleeping (presumably) in Japan?

@hppritcha
Copy link
Member

@ggouaillardet if you could go ahead and add 3571c3c to this PR that would be great. For 2.0.2 I was trying to get it in before 4 PM PST US so I opened a new PR #2625

@ggouaillardet
Copy link
Contributor Author

Will do, thanks

- Fix capitolization typos
- Make comment more correct / flow better
- Use AM_CPPFLAGS, not DEFAULT_INCLUDES
- Remove extra "hwloc/" from external hwloc.h specification

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>

(cherry picked from commit open-mpi/ompi@3571c3c)
@ggouaillardet
Copy link
Contributor Author

@hppritcha i just pushed @jsquyres commit into this PR

@hppritcha
Copy link
Member

@rhc54 could you review?

@hppritcha hppritcha requested a review from rhc54 December 22, 2016 14:55
@rhc54 rhc54 dismissed jsquyres’s stale review December 22, 2016 15:19

Requested change was made

@hppritcha hppritcha requested review from jsquyres and removed request for jsquyres December 22, 2016 16:08
@hppritcha hppritcha merged commit 30fa645 into open-mpi:v2.x Dec 22, 2016
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants