Skip to content

Commit 74125ec

Browse files
author
Ralph Castain
authored
Merge pull request #3141 from rhc54/topic/sync
Sync to latest PMIx master and PMIx reference server
2 parents df8df0d + c6bc3cc commit 74125ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1315
-298
lines changed

‎config/orte_check_moab.m4

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
4+
# University Research and Technology
5+
# Corporation. All rights reserved.
6+
# Copyright (c) 2004-2005 The University of Tennessee and The University
7+
# of Tennessee Research Foundation. All rights
8+
# reserved.
9+
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
10+
# University of Stuttgart. All rights reserved.
11+
# Copyright (c) 2004-2005 The Regents of the University of California.
12+
# All rights reserved.
13+
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
15+
# reserved.
16+
# Copyright (c) 2017 Intel, Inc. All rights reserved.
17+
# $COPYRIGHT$
18+
#
19+
# Additional copyrights may follow
20+
#
21+
# $HEADER$
22+
#
23+
24+
# ORTE_CHECK_MOAB(prefix, [action-if-found], [action-if-not-found])
25+
# --------------------------------------------------------
26+
AC_DEFUN([ORTE_CHECK_MOAB],[
27+
if test -z "$orte_check_moab_happy" ; then
28+
OPAL_VAR_SCOPE_PUSH([orte_check_moab_$1_save_CPPFLAGS orte_check_moab_$1_save_LDFLAGS orte_check_moab_$1_save_LIBS])
29+
30+
AC_ARG_WITH([moab],
31+
[AC_HELP_STRING([--with-moab],
32+
[Build MOAB scheduler component (default: yes)])])
33+
OPAL_CHECK_WITHDIR([moab], [$with_moab], [mapi.h])
34+
AC_ARG_WITH([moab-libdir],
35+
[AC_HELP_STRING([--with-moab-libdir=DIR],
36+
[Search for Moab libraries in DIR])])
37+
OPAL_CHECK_WITHDIR([moab-libdir], [$with_moab_libdir], [libmoab.*])
38+
39+
orte_check_moab_happy="yes"
40+
AS_IF([test "$with_moab" = "no"],
41+
[orte_check_moab_happy=no])
42+
43+
44+
AS_IF([test $orte_check_moab_happy = yes],
45+
[AC_MSG_CHECKING([looking for moab in])
46+
AS_IF([test "$with_moab" != "yes"],
47+
[orte_moab_dir=$with_moab
48+
AC_MSG_RESULT([($orte_moab_dir)])],
49+
[AC_MSG_RESULT([(default search paths)])])
50+
AS_IF([test ! -z "$with_moab_libdir" && \
51+
test "$with_moab_libdir" != "yes"],
52+
[orte_moab_libdir=$with_moab_libdir])
53+
])
54+
55+
orte_check_moab_$1_save_CPPFLAGS=$CPPFLAGS
56+
orte_check_moab_$1_save_LDFLAGS=$LDFLAGS
57+
orte_check_moab_$1_save_LIBS=$LIBS
58+
59+
AS_IF([test $orte_check_moab_happy = yes],
60+
[OPAL_CHECK_PACKAGE([orte_check_moab],
61+
[mapi.h],
62+
[cmoab],
63+
[MCCJobGetRemainingTime],
64+
[],
65+
[$orte_moab_dir],
66+
[$orte_moab_libdir],
67+
[],
68+
[orte_check_moab_happy=no])])
69+
70+
CPPFLAGS=$orte_check_moab_$1_save_CPPFLAGS
71+
LDFLAGS=$orte_check_moab_$1_save_LDFLAGS
72+
LIBS=$orte_check_moab_$1_save_LIBS
73+
74+
OPAL_SUMMARY_ADD([[Resource Managers]],[[Moab]],[$1],[$orte_check_moab_happy])
75+
OPAL_VAR_SCOPE_POP
76+
fi
77+
78+
if test $orte_check_moab_happy = yes ; then
79+
$1_CPPFLAGS="[$]$1_CPPFLAGS $orte_check_moab_CPPFLAGS"
80+
$1_LIBS="[$]$1_LIBS $orte_check_moab_LIBS"
81+
$1_LDFLAGS="[$]$1_LDFLAGS $orte_check_moab_LDFLAGS"
82+
83+
AC_SUBST($1_CPPFLAGS)
84+
AC_SUBST($1_LDFLAGS)
85+
AC_SUBST($1_LIBS)
86+
fi
87+
88+
AS_IF([test "$orte_check_moab_happy" = "yes"],
89+
[$2],
90+
[$3])
91+
])

‎opal/mca/pmix/pmix2x/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=git129dc44
33+
repo_rev=git4cdd5e0
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="Feb 22, 2017"
47+
date="Mar 11, 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/pmix2x/pmix/config/pmix.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,6 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
729729
[AC_HELP_STRING([--enable-dlopen],
730730
[Whether build should attempt to use dlopen (or
731731
similar) to dynamically load components.
732-
Disabling dlopen implies --disable-pdl-dlopen
733732
(default: enabled)])])
734733
AS_IF([test "$enable_dlopen" = "no"],
735734
[enable_mca_dso="no"
@@ -738,6 +737,8 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
738737
AC_MSG_RESULT([no])],
739738
[PMIX_ENABLE_DLOPEN_SUPPORT=1
740739
AC_MSG_RESULT([yes])])
740+
AC_DEFINE_UNQUOTED(PMIX_ENABLE_DLOPEN_SUPPORT, $PMIX_ENABLE_DLOPEN_SUPPORT,
741+
[Whether we want to enable dlopen support])
741742

742743
# Embedded mode, or standalone?
743744
AC_MSG_CHECKING([if embedded mode is enabled])

‎opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
# All rights reserved.
1313
# Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
15-
# Copyright (c) 2014 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
16+
# Copyright (c) 2017 Research Organization for Information Science
17+
# and Technology (RIST). All rights reserved.
1618
# $COPYRIGHT$
1719
#
1820
# Additional copyrights may follow
@@ -76,7 +78,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
7678
[ # libdir was specified - search only there
7779
$1_LDFLAGS="$$1_LDFLAGS -L$6"
7880
LDFLAGS="$LDFLAGS -L$6"
79-
AC_CHECK_LIB([$2], [$3],
81+
AC_SEARCH_LIBS([$3], [$2],
8082
[pmix_check_package_lib_happy="yes"],
8183
[pmix_check_package_lib_happy="no"], [$4])
8284
AS_IF([test "$pmix_check_package_lib_happy" = "no"],
@@ -88,7 +90,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
8890
AS_IF([test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"],
8991
[ # try as is...
9092
AC_VERBOSE([looking for library without search path])
91-
AC_CHECK_LIB([$2], [$3],
93+
AC_SEARCH_LIBS([$3], [$2],
9294
[pmix_check_package_lib_happy="yes"],
9395
[pmix_check_package_lib_happy="no"], [$4])
9496
AS_IF([test "$pmix_check_package_lib_happy" = "no"],
@@ -102,7 +104,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
102104
[$1_LDFLAGS="$$1_LDFLAGS -L$pmix_check_package_libdir/lib"
103105
LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib"
104106
AC_VERBOSE([looking for library in lib])
105-
AC_CHECK_LIB([$2], [$3],
107+
AC_SEARCH_LIBS([$3], [$2],
106108
[pmix_check_package_lib_happy="yes"],
107109
[pmix_check_package_lib_happy="no"], [$4])
108110
AS_IF([test "$pmix_check_package_lib_happy" = "no"],
@@ -116,7 +118,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
116118
[$1_LDFLAGS="$$1_LDFLAGS -L$pmix_check_package_libdir/lib64"
117119
LDFLAGS="$LDFLAGS -L$pmix_check_package_libdir/lib64"
118120
AC_VERBOSE([looking for library in lib64])
119-
AC_CHECK_LIB([$2], [$3],
121+
AC_SEARCH_LIBS([$3], [$2],
120122
[pmix_check_package_lib_happy="yes"],
121123
[pmix_check_package_lib_happy="no"], [$4])
122124
AS_IF([test "$pmix_check_package_lib_happy" = "no"],
@@ -128,6 +130,14 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [
128130
AS_IF([test "$pmix_check_package_lib_happy" = "yes"],
129131
[$1_LIBS="-l$2 $4"
130132
$7], [$8])
133+
AS_IF([test "$pmix_check_package_lib_happy" = "yes"],
134+
[ # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function]
135+
AS_IF([test "$ac_cv_search_$3" != "no" &&
136+
test "$ac_cv_search_$3" != "none required"],
137+
[$1_LIBS="$ac_cv_search_$3 $4"],
138+
[$1_LIBS="$4"])
139+
$7],
140+
[$8])
131141

132142
AS_VAR_POPDEF([pmix_Lib])dnl
133143
])

‎opal/mca/pmix/pmix2x/pmix/config/pmix_setup_libevent.m4

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
5-
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
5+
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
66
# $COPYRIGHT$
77
#
88
# Additional copyrights may follow
@@ -33,10 +33,6 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
3333
AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER],
3434
[Location of event2/thread.h])
3535
AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER])
36-
37-
CPPFLAGS="$CPPFLAGS $PMIX_EVENT_CPPFLAGS"
38-
LDFLAGS="$LDFLAGS $PMIX_EVENT_LDFLAGS"
39-
LIBS="$LIBS $PMIX_EVENT_LIBS"
4036
])
4137

4238
AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
@@ -45,9 +41,6 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
4541

4642
PMIX_EVENT_HEADER="$with_libevent_header"
4743
PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"
48-
PMIX_EVENT_CPPFLAGS=
49-
PMIX_EVENT_LIB=
50-
PMIX_EVENT_LDFLAGS=
5144

5245
])
5346

@@ -96,10 +89,9 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
9689
[AC_MSG_WARN([LIBEVENT SUPPORT NOT FOUND])
9790
AC_MSG_ERROR([CANNOT CONTINE])])
9891

99-
CPPFLAGS="$pmix_libevent_CPPFLAGS $CPPFLAGS"
100-
LIBS="$pmix_libevent_LIBS $LIBS"
101-
LDFLAGS="$pmix_libevent_LDFLAGS $LDFLAGS"
102-
92+
PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_libevent_CPPFLAGS)
93+
PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_libevent_LIBS)
94+
PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_libevent_LDFLAGS)
10395

10496
# Ensure that this libevent has the symbol
10597
# "evthread_set_lock_callbacks", which will only exist if
@@ -120,11 +112,6 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
120112
# Set output variables
121113
PMIX_EVENT_HEADER="<event.h>"
122114
PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
123-
PMIX_EVENT_LIB="-levent -levent_pthreads"
124-
AS_IF([test "$pmix_event_dir" != ""],
125-
[PMIX_EVENT_CPPFLAGS="-I$pmix_event_dir/include"])
126-
AS_IF([test "$pmix_event_libdir" != ""],
127-
[PMIX_EVENT_LDFLAGS="-L$pmix_event_libdir"])
128115

129116
PMIX_VAR_SCOPE_POP
130117
])dnl

‎opal/mca/pmix/pmix2x/pmix/configure.ac

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
2020
# Copyright (c) 2013 Mellanox Technologies, Inc.
2121
# All rights reserved.
22-
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
22+
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
2323
# Copyright (c) 2016 IBM Corporation. All rights reserved.
2424
# Copyright (c) 2016 Research Organization for Information Science
2525
# and Technology (RIST). All rights reserved.
@@ -190,6 +190,11 @@ AS_IF([test -z "$CC_FOR_BUILD"],[
190190

191191
PMIX_SETUP_CC
192192

193+
# Cleanup duplicate flags
194+
PMIX_FLAGS_UNIQ(CPPFLAGS)
195+
PMIX_FLAGS_UNIQ(LDFLAGS)
196+
PMIX_FLAGS_UNIQ(LIBS)
197+
193198
#
194199
# Delayed the substitution of CFLAGS and CXXFLAGS until now because
195200
# they may have been modified throughout the course of this script.
@@ -206,6 +211,12 @@ AC_MSG_RESULT([$CPPFLAGS])
206211
AC_MSG_CHECKING([final CFLAGS])
207212
AC_MSG_RESULT([$CFLAGS])
208213

214+
AC_MSG_CHECKING([final LDFLAGS])
215+
AC_MSG_RESULT([$LDFLAGS])
216+
217+
AC_MSG_CHECKING([final LIBS])
218+
AC_MSG_RESULT([$LIBS])
219+
209220
####################################################################
210221
# Version information
211222
####################################################################

‎opal/mca/pmix/pmix2x/pmix/examples/Makefile.am

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# All rights reserved.
1212
# Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
14-
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
14+
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
1515
# $COPYRIGHT$
1616
#
1717
# Additional copyrights may follow
@@ -21,32 +21,29 @@
2121

2222
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
2323

24-
noinst_PROGRAMS = client dmodex dynamic fault pub tool
24+
noinst_PROGRAMS = client dmodex dynamic fault pub tool debugger debuggerd alloc
2525
if !WANT_HIDDEN
2626
# these examples use internal symbols
2727
# use --disable-visibility
28-
noinst_PROGRAMS += debugger debuggerd
29-
endif
30-
31-
if !WANT_HIDDEN
32-
# this example uses internal symbols
33-
# use --disable-visibility
3428
noinst_PROGRAMS += server
3529
endif
3630

3731
client_SOURCES = client.c
3832
client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
3933
client_LDADD = $(top_builddir)/src/libpmix.la
4034

41-
if !WANT_HIDDEN
4235
debugger_SOURCES = debugger.c
4336
debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
4437
debugger_LDADD = $(top_builddir)/src/libpmix.la
4538

4639
debuggerd_SOURCES = debuggerd.c
4740
debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
4841
debuggerd_LDADD = $(top_builddir)/src/libpmix.la
49-
endif
42+
43+
44+
alloc_SOURCES = alloc.c
45+
alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
46+
alloc_LDADD = $(top_builddir)/src/libpmix.la
5047

5148
dmodex_SOURCES = dmodex.c
5249
dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
@@ -69,8 +66,6 @@ tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
6966
tool_LDADD = $(top_builddir)/src/libpmix.la
7067

7168
if !WANT_HIDDEN
72-
# this example uses internal symbols
73-
# use --disable-visibility
7469
server_SOURCES = server.c
7570
server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
7671
server_LDADD = $(top_builddir)/src/libpmix.la

0 commit comments

Comments
 (0)