Skip to content

Cherrypicks from PMIx v1.2.1 #3118

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 8, 2017
Merged

Cherrypicks from PMIx v1.2.1 #3118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889b663
Fix some missing includes and one #ifdef that shouldn't have been
jjhursey Mar 7, 2017
ad3e85a
pmix/pmix112: Update README with one more v1.2.1 cherry-pick
jjhursey Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions opal/mca/pmix/pmix112/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ $HEADER$
===========================================================================
This internal component includes PMIx v1.2.1 plus these two commits
cherry-picked from the PMIx v1.2 branch (which will be included in the
eventual PMIx v1.2.2 release).
eventual PMIx v1.2.2 release). Newer patches at top.

* https://github.com/pmix/master/commit/a2d431cbec162b01e15920cc75df1af9ad244f06
* https://github.com/pmix/master/commit/8587f278a17301633ccf6f0d7cb086e3be8f4793
* https://github.com/pmix/pmix/commit/4269e8484bd883523ae485bf2e1b7bbc0719c494
* https://github.com/pmix/pmix/commit/a2d431cbec162b01e15920cc75df1af9ad244f06
* https://github.com/pmix/pmix/commit/8587f278a17301633ccf6f0d7cb086e3be8f4793
5 changes: 2 additions & 3 deletions opal/mca/pmix/pmix112/pmix/include/pmix/pmix_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -50,9 +50,8 @@
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h> /* for struct timeval */
#endif

#include <pmix_version.h>

#if defined(c_plusplus) || defined(__cplusplus)
Expand Down
2 changes: 2 additions & 0 deletions opal/mca/pmix/pmix112/pmix/src/sm/pmix_mmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
* All rights reserved.
* Copyright (c) 2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/

#include <src/include/pmix_config.h>

#include <unistd.h>
#ifdef HAVE_SYS_TYPES_H
Expand Down
2 changes: 2 additions & 0 deletions opal/mca/pmix/pmix112/pmix/src/sm/pmix_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/*
* Copyright (c) 2015-2016 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include <src/include/pmix_config.h>

#include <pmix/pmix_common.h>
#include "src/include/pmix_globals.h"
Expand Down
3 changes: 3 additions & 0 deletions opal/mca/pmix/pmix112/pmix/src/sm/pmix_sm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2015-2016 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -11,6 +12,8 @@
#ifndef PMIX_SM_H
#define PMIX_SM_H

#include <src/include/pmix_config.h>

#include <pmix/pmix_common.h>
#include <src/include/pmix_config.h>

Expand Down