Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

v2.0.x: Ggouaillardet topic/v2.0.x/with hwloc external #2625

Conversation

hppritcha
Copy link
Member

Expediting merge of this work to try to get a v2.0.2 rc2 out shortly:

hwloc: correctly handle --with-hwloc=external

- 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/ompi#2616

Signed-off-by: Gilles Gouaillardet <[email protected]>

(cherry picked from commit open-mpi/ompi@9649c44fa0aafa2bf93c36663d11214833e83369)

ggouaillardet and others added 2 commits December 21, 2016 13:04
- 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 <[email protected]>

(cherry picked from commit open-mpi/ompi@9649c44)
- 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 <[email protected]>
(cherry picked from commit 3571c3c)
@hppritcha hppritcha added this to the v2.0.2 milestone Dec 21, 2016
@hppritcha hppritcha requested a review from jsquyres December 21, 2016 18:51
@hppritcha hppritcha changed the title Ggouaillardet topic/v2.0.x/with hwloc external v2.0.x: Ggouaillardet topic/v2.0.x/with hwloc external Dec 21, 2016
@hppritcha
Copy link
Member Author

@rhc54 could you take a quick look at this? I think @jsquyres is offline for a while.

@hppritcha hppritcha requested review from rhc54 and removed request for jsquyres December 21, 2016 22:19
Copy link
Contributor

@rhc54 rhc54 left a comment

Choose a reason for hiding this comment

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

Looks okay to me

@hppritcha hppritcha merged commit eb9c159 into open-mpi:v2.0.x Dec 21, 2016
@hppritcha hppritcha deleted the ggouaillardet-topic/v2.0.x/with_hwloc_external branch May 2, 2018 02:56
awlauria added a commit to awlauria/ompi that referenced this pull request Jun 21, 2022
OpenPMIx changes:

6c9d3dd - Fix pcompress/zlib implementation (open-mpi#2625)
ac0654a - Fix typos.
b5ab80c - gds/shmem: Support multiple local clients.
43d3345 - Checkpoint gds/shmem work.
3f7b1d0 - Add PMIx Standard version info to pmix_info
fa15e0d - Update the PMIx ABI Query attributes to match the standard
dac9573 - Checkpoint gds/shmem work.
92e20e5 - Fix typo in setting hwloc verbosity
dad0fb8 - Some initial valgrind cleanup
c00f97f - TMA: Integrate more custom memory allocator infrastructure.
1286709 - Require flex only when keyval_lex.c is not provided
af5dd49 - Optimize the file descriptor cleanup on OSX
137cc3d - Support colocation of processes
49a28d3 - Initialize pmix_info_t flags when loading
e11fe2a - Save a legacy URI to support older tools
2f13feb - Deduplicate key/value storage for qualified values.
62d675f - Revert "Rename mca.h to pmix_mca.h to avoid include-path confusion"
288eed9 - Add a few missing renames
4d2e2b5 - Rename mca.h to pmix_mca.h to avoid include-path confusion
7c72657 - pmix_fd: cap the max FD to try to close
594303d - configure.ac: update directory space check
5ccd945 - Checkpoint more gds/shmem work.
34a26e8 - configury: do look for sed
4782e9a - Complete support for group-level info
b54565f - Address pedantic compiler warnings (open-mpi#2581)
90c06ff - Checkpoint gds/shmem work. (open-mpi#2579)
3766868 - Silence pedantic compiler warnings. (open-mpi#2580)
958d6bb - Modify the key-index support
ec77b2b - Correctly handle qualified values
b2f14cf - Remove GDS envar disablement
4e664bd - Checkpoint data storage and retrieval work in gds/shmem.

PRRTe changes:

df7d17d0a3 - Support colocation of spawned procs
6a77daafb6 - Fix a few bugs/leaks in the OOB subsystem
551c927741 - Remove stale Java support
48e44f4203 - Avoid PMIx server release of HWLOC topology
9fe286019e - Use fileno_unlocked if available
802d4d4349 - Incremental valgrind improvements
3083bdbec4 - Revert "Optimize the file descriptor cleanup on OSX"
5ee9b5abba - prrte: fix core dump while printing stack-trace
87df79b900 - Optimize the file descriptor cleanup on OSX
f09d98a4f7 - odls: fix alps compilation problem
db194bb1ab - configury: do look for sed
414b4748c2 - configure.ac: update directory space check
4246494bbb - Set the min PMIx version to v4.1.3
8103bff788 - Remove setting of PRTE_MCA_prte_base_help_aggregate.
da12b9da13 - Restore noloop for logging.

Signed-off-by: Austen Lauria <[email protected]>
awlauria added a commit to awlauria/ompi that referenced this pull request Jul 26, 2022
Commits since last update:

be2a27d6 - Return "succeeded" status when outputting help/version info
a3216718 - Fix pcompress/zlib implementation (open-mpi#2625)
84e1c231 - Fix typos.
3edfda51 - Add PMIx Standard version info to pmix_info
32ff1b03 - Update the PMIx ABI Query attributes to match the standard
45eaba22 - Add examples for using PMIx_Query_info with PMIX_QUERY_ABI_VERSION
a978d02e - Backend query support for PMIX_QUERY_ABI_VERSION and local keys
52803578 - Setup PMIX_STD_ABI_VERSION in the VERSION file
7cbe9b67 - Fix the greek version

Signed-off-by: Austen Lauria <[email protected]>
awlauria added a commit to awlauria/ompi that referenced this pull request Aug 22, 2022
Commits since last update:

3e827472a2 - Remove man pages
d0b2c2611d - Fix flex detection
8cb6f58fe0 - Bump VERSION to v4.2.1
b0a4339be4 - Enable show_help output on tools
571393b512 - Fix the buildrpm script
81c14d7df0 - Update NEWS for final release
0582c8512d - Cleanup singletion IOF lists
24f5357560 - examples: add a test to simulate open mpi group usage.
9119231a37 - Output IO as singleton, support background commands
032af19345 - Standardize on const char* key
6fc8ee283d - Revert "Silence gcc12 warnings"
3d746a0daf - Silence gcc12 warnings
92ae1c2618 - Need to replace the entire proc in fence with group member
a1d6ae2a05 - Update NEWS/VERSION for rc2
663b67f86a - Fix/implement the group invite support
6607101815 - Do not error out if lib is symlinked to lib64
9c81ebf592 - Separate out pinstalldirs for inclusion by PRRTE
bd64ea7c1f - Fix the tm configure logic
2ed71f17e8 - Minor cleanup of timestamp output
caafc48966 - Fix reference to removed variable
bdb7150142 - Update NEWS with notices and remove unready components
56d5c400ff - Fix make_tarball and remove unused variable
27d332312f - Update the news, version, and exceptions for rc1
43fa0176a4 - Support broader range of output formats
f87c7ef282 - Sort proc arrays to remove order sensitivity and fix multi-node grp info
75928d777b - Coordinate psec modules across pfexec child
db1418d6e6 - Complete implementation of group info exchange
1b58c79bdc - Update GDS/Hash
dde484925a - Fix the GNU CI run
52c475b4aa - Forward stdin to apps directly fork/exec'd by PMIx
013fb830a5 - Return the correct code for register fabric
5630ca841a - Protect "create" macros from zero entries
f345f0e879 - Fix IOF of stdin
25d4f140be - Update tests for picky compilers and one place in MCA base
fc25381018 - Disable picky compilers in dstore
c5445edb02 - Update VERSION
035155ef50 - Minor touchups for picky compilers
487b139086 - Update the dmodex example
d899119873 - Stop multiple invocations of debugger-release
dcf6fb96e9 - src/include/Makefile.am: avoid potential file corruption
266f6458ae - construct_dictionary.py: make .format() safe for Python 2
977e392ed9 - Cleanup some debug output
487f68d66d - Add "const" qualifiers to some string print APIs
07cdb7dbbc - Fix potential use after free in tests
3c9a3679c6 - Properly cast the list_item_t
cc2ee2eaeb - Fix dmodex operations
a70ce1b0a1 - Fix show_help output to include tools
7ae2993c16 - Update show-help system
54523c3f07 - Fix PMIX_INFO_*PROCESSED macros
09d4463b4e - Remove bad destruct call
c532553236 - Enable pickyness by default in Git repo builds (open-mpi#2631)
be2a27d67c - Return "succeeded" status when outputting help/version info
a3216718ac - Fix pcompress/zlib implementation (open-mpi#2625)
84e1c2319d - Fix typos.
3edfda519f - Add PMIx Standard version info to pmix_info
32ff1b034b - Update the PMIx ABI Query attributes to match the standard
45eaba2284 - Add examples for using PMIx_Query_info with PMIX_QUERY_ABI_VERSION
a978d02e10 - Backend query support for PMIX_QUERY_ABI_VERSION and local keys
52803578fc - Setup PMIX_STD_ABI_VERSION in the VERSION file
7cbe9b67ea - Fix the greek version

Signed-off-by: Austen Lauria <[email protected]>
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