Skip to content

Commit 60b338e

Browse files
author
Ralph Castain
committed
Sync to PMIx v3. Ensure prun uses the ess/tool component.
Signed-off-by: Ralph Castain <[email protected]>
1 parent ba4ec73 commit 60b338e

File tree

22 files changed

+120
-498
lines changed

22 files changed

+120
-498
lines changed

opal/mca/pmix/pmix3x/pmix/NEWS

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,28 @@ Master (not on release branches yet)
8383
and to themselves
8484

8585

86+
1.2.4 -- 13 Oct. 2017
87+
----------------------
88+
- Silence some unnecessary warning messages (PR #487)
89+
- Coverity fix - TOCTOU (PR #465)
90+
- automake 1.13 configure fix (PR #486)
91+
- Update RPM spec file (rpmbuild -ta, and --rebuild fixes) (PR #523)
92+
- Support singletons in PMI-1/PMI-2 (PR #537)
93+
94+
95+
1.2.3 -- 24 Aug. 2017
96+
----------------------
97+
- Resolve visibility issues for public APIs (PR #451)
98+
- Atomics update - remove custom ASM atomics (PR #458)
99+
- Fix job-fence test (PR #423)
100+
- Replace stale PMIX_DECLSPEC with PMIX_EXPORT (PR #448)
101+
- Memory barrier fixes for thread shifting (PR #387)
102+
- Fix race condition in dmodex (PR #346)
103+
- Allow disable backward compatability for PMI-1/2 (PR #350)
104+
- Fix segv in PMIx_server_deregister_nspace (PR #343)
105+
- Fix possible hang in PMIx_Abort (PR #339)
106+
107+
86108
1.2.2 -- 21 March 2017
87109
----------------------
88110
- Compiler fix for Sun/Oracle CC (PR #322)

opal/mca/pmix/pmix3x/pmix/README

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,32 @@ INSTALLATION OPTIONS
128128
--disable-shared; enabling static libraries and disabling shared
129129
libraries are two independent options.
130130

131+
--disable-show-load-errors-by-default
132+
Set the default value of the mca_base_component_show_load_errors MCA
133+
variable: the --enable form of this option sets the MCA variable to
134+
true, the --disable form sets the MCA variable to false. The MCA
135+
mca_base_component_show_load_errors variable can still be overridden
136+
at run time via the usual MCA-variable-setting mechanisms; this
137+
configure option simply sets the default value.
138+
139+
The --disable form of this option is intended for PMIx packagers
140+
who tend to enable support for many different types of networks and
141+
systems in their packages. For example, consider a packager who
142+
includes support for both the FOO and BAR networks in their PMIx
143+
package, both of which require support libraries (libFOO.so and
144+
libBAR.so). If an end user only has BAR hardware, they likely only
145+
have libBAR.so available on their systems -- not libFOO.so.
146+
Disabling load errors by default will prevent the user from seeing
147+
potentially confusing warnings about the FOO components failing to
148+
load because libFOO.so is not available on their systems.
149+
150+
Conversely, system administrators tend to build a PMIx that is
151+
targeted at their specific environment, and contains few (if any)
152+
components that are not needed. In such cases, they might want
153+
their users to be warned that the FOO network components failed to
154+
load (e.g., if libFOO.so was mistakenly unavailable), and thus
155+
some PMIx calls might unexpectedly return "not supported".
156+
131157
--with-platform=FILE
132158
Load configure options for the build from FILE. Options on the
133159
command line that are not in FILE are also used. Options on the

opal/mca/pmix/pmix3x/pmix/VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ greek=
3030
# command, or with the date (if "git describe" fails) in the form of
3131
# "date<date>".
3232

33-
repo_rev=git6001265
33+
repo_rev=gitd74c321
3434

3535
# If tarball_version is not empty, it is used as the version string in
3636
# the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
4444

4545
# The date when this release was created
4646

47-
date="Oct 09, 2017"
47+
date="Oct 14, 2017"
4848

4949
# The shared library version of each of PMIx's public libraries.
5050
# These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix3x/pmix/config/pmix.m4

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,32 @@ AC_DEFUN([PMIX_SETUP_CORE],[
705705

706706
pmix_show_title "Modular Component Architecture (MCA) setup"
707707

708+
#
709+
# Do we want to show component load error messages by default?
710+
#
711+
712+
AC_MSG_CHECKING([for default value of mca_base_component_show_load_errors])
713+
AC_ARG_ENABLE([show-load-errors-by-default],
714+
[AC_HELP_STRING([--enable-show-load-errors-by-default],
715+
[Set the default value for the MCA parameter
716+
mca_base_component_show_load_errors (but can be
717+
overridden at run time by the usual
718+
MCA-variable-setting mechansism). This MCA variable
719+
controls whether warnings are displayed when an MCA
720+
component fails to load at run time due to an error.
721+
(default: enabled, meaning that
722+
mca_base_component_show_load_errors is enabled
723+
by default])])
724+
if test "$enable_show_load_errors_by_default" = "no" ; then
725+
PMIX_SHOW_LOAD_ERRORS_DEFAULT=0
726+
AC_MSG_RESULT([disabled by default])
727+
else
728+
PMIX_SHOW_LOAD_ERRORS_DEFAULT=1
729+
AC_MSG_RESULT([enabled by default])
730+
fi
731+
AC_DEFINE_UNQUOTED(PMIX_SHOW_LOAD_ERRORS_DEFAULT, $PMIX_SHOW_LOAD_ERRORS_DEFAULT,
732+
[Default value for mca_base_component_show_load_errors MCA variable])
733+
708734
AC_MSG_CHECKING([for subdir args])
709735
PMIX_CONFIG_SUBDIR_ARGS([pmix_subdir_args])
710736
AC_MSG_RESULT([$pmix_subdir_args])

opal/mca/pmix/pmix3x/pmix/config/pmix_config_asm.m4

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,8 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
959959
960960
ia64-*)
961961
pmix_cv_asm_arch="IA64"
962-
PMIX_ASM_SUPPORT_64BIT=1
963-
PMIX_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
962+
PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
963+
[AC_MSG_ERROR([No atomic primitives available for $host])])
964964
;;
965965
aarch64*)
966966
pmix_cv_asm_arch="ARM64"
@@ -993,20 +993,16 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
993993
armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
994994
# uses Linux kernel helpers for some atomic operations
995995
pmix_cv_asm_arch="ARM"
996-
PMIX_ASM_SUPPORT_64BIT=0
997-
PMIX_ASM_ARM_VERSION=5
998-
CCASFLAGS="$CCASFLAGS -march=armv7-a"
999-
AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
1000-
[What ARM assembly version to use])
1001-
PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
996+
PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
997+
[AC_MSG_ERROR([No atomic primitives available for $host])])
1002998
;;
1003999
10041000
mips-*|mips64*)
10051001
# Should really find some way to make sure that we are on
10061002
# a MIPS III machine (r4000 and later)
10071003
pmix_cv_asm_arch="MIPS"
1008-
PMIX_ASM_SUPPORT_64BIT=1
1009-
PMIX_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
1004+
PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
1005+
[AC_MSG_ERROR([No atomic primitives available for $host])])
10101006
;;
10111007
10121008
powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)

opal/mca/pmix/pmix3x/pmix/src/atomics/sys/Makefile.include

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ include atomics/sys/x86_64/Makefile.include
3636
include atomics/sys/arm/Makefile.include
3737
include atomics/sys/arm64/Makefile.include
3838
include atomics/sys/ia32/Makefile.include
39-
include atomics/sys/ia64/Makefile.include
40-
include atomics/sys/mips/Makefile.include
4139
include atomics/sys/powerpc/Makefile.include
4240
include atomics/sys/sparcv9/Makefile.include
4341
include atomics/sys/sync_builtin/Makefile.include

opal/mca/pmix/pmix3x/pmix/src/atomics/sys/ia64/Makefile.include

Lines changed: 0 additions & 24 deletions
This file was deleted.

opal/mca/pmix/pmix3x/pmix/src/atomics/sys/ia64/atomic.h

Lines changed: 0 additions & 146 deletions
This file was deleted.

opal/mca/pmix/pmix3x/pmix/src/atomics/sys/ia64/timer.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)