Skip to content

Commit b030f9a

Browse files
author
rhc54
authored
Merge pull request #2506 from rhc54/topic/pmixext
Now that PMIx has settled on its release strategy and numbering, update the OPAL pmix framework to track
2 parents 6319332 + a4e3f61 commit b030f9a

File tree

354 files changed

+2939
-7478
lines changed

Some content is hidden

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

354 files changed

+2939
-7478
lines changed

.gitignore

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@ opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
309309
opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
310310
opal/mca/hwloc/base/static-components.h.new.extern
311311
opal/mca/hwloc/base/static-components.h.new.struct
312-
opal/mca/pmix/pmix3x/pmix/src/include/frameworks.h
313-
opal/mca/pmix/pmix3x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
314-
opal/mca/pmix/pmix3x/pmix/config/autogen_found_items.m4
315-
opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h
316-
opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h.in
317-
opal/mca/pmix/pmix3x/pmix/include/pmix_rename.h
318-
opal/mca/pmix/pmix3x/pmix/include/pmix_version.h
319-
opal/mca/pmix/pmix3x/pmix/src/util/keyval/keyval_lex.c
320-
opal/mca/pmix/pmix3x/pmix/src/util/show_help_lex.c
312+
opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
313+
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
314+
opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4
315+
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h
316+
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h.in
317+
opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h
318+
opal/mca/pmix/pmix2x/pmix/include/pmix_version.h
319+
opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.c
320+
opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.c
321321

322322
opal/tools/opal-checkpoint/opal-checkpoint
323323
opal/tools/opal-checkpoint/opal-checkpoint.1

config/opal_check_pmi.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
281281
#endif
282282
], [])],
283283
[AC_MSG_RESULT([found])
284-
opal_external_pmix_version=3X
284+
opal_external_pmix_version=3x
285285
opal_external_pmix_version_found=1],
286286
[AC_MSG_RESULT([not found])])])
287287
@@ -294,7 +294,7 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
294294
#endif
295295
], [])],
296296
[AC_MSG_RESULT([found])
297-
opal_external_pmix_version=2X
297+
opal_external_pmix_version=2x
298298
opal_external_pmix_version_found=1],
299299
[AC_MSG_RESULT([not found])])])
300300
@@ -307,7 +307,7 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
307307
#endif
308308
], [])],
309309
[AC_MSG_RESULT([found])
310-
opal_external_pmix_version=1X
310+
opal_external_pmix_version=1x
311311
opal_external_pmix_version_found=1],
312312
[AC_MSG_RESULT([not found])])])
313313

opal/mca/pmix/ext11/configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ AC_DEFUN([MCA_opal_pmix_ext11_CONFIG],[
4545
# check for the 1.1.4 version
4646
AC_MSG_CHECKING([if external component is version 1.1.4])
4747
AS_IF([test "$opal_external_pmix_version" = "11" ||
48-
test "$opal_external_pmix_version" = "1X"],
48+
test "$opal_external_pmix_version" = "1x"],
4949
[AC_MSG_RESULT([yes])
5050
opal_pmix_external_11_happy=yes],
5151
[AC_MSG_RESULT([no])

opal/mca/pmix/ext2x/Makefile.am

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
2-
# Copyright (c) 2x14-2x16 Intel, Inc. All rights reserved.
3-
# Copyright (c) 2x15 Cisco Systems, Inc. All rights reserved.
4-
# Copyright (c) 2x14-2x15 Mellanox Technologies, Inc.
5-
# All rights reserved.
2+
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
3+
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
4+
# Copyright (c) 2015 Research Organization for Information Science
5+
# and Technology (RIST). All rights reserved.
66
# $COPYRIGHT$
77
#
88
# Additional copyrights may follow
@@ -11,12 +11,12 @@
1111
#
1212

1313
sources = \
14-
pmix_ext2x.h \
15-
pmix_ext2x_component.c \
16-
pmix_ext2x.c \
17-
pmix_ext2x_client.c \
18-
pmix_ext2x_server_south.c \
19-
pmix_ext2x_server_north.c
14+
pmix2x.h \
15+
pmix2x_component.c \
16+
pmix2x.c \
17+
pmix2x_client.c \
18+
pmix2x_server_south.c \
19+
pmix2x_server_north.c
2020

2121
# Make the output library in this directory, and name it either
2222
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
@@ -33,14 +33,14 @@ endif
3333
mcacomponentdir = $(opallibdir)
3434
mcacomponent_LTLIBRARIES = $(component_install)
3535
mca_pmix_ext2x_la_SOURCES = $(sources)
36-
mca_pmix_ext2x_la_CFLAGS =
37-
mca_pmix_ext2x_la_CPPFLAGS = $(opal_pmix_ext2x_CPPFLAGS)
36+
mca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
37+
mca_pmix_ext2x_la_CPPFLAGS =$(opal_pmix_ext2x_CPPFLAGS)
3838
mca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
3939
mca_pmix_ext2x_la_LIBADD = $(opal_pmix_ext2x_LIBS)
4040

4141
noinst_LTLIBRARIES = $(component_noinst)
4242
libmca_pmix_ext2x_la_SOURCES =$(sources)
43-
libmca_pmix_ext2x_la_CFLAGS =
43+
libmca_pmix_ext2x_la_CFLAGS = $(opal_pmix_ext2x_CFLAGS)
4444
libmca_pmix_ext2x_la_CPPFLAGS = $(opal_pmix_ext2x_CPPFLAGS)
4545
libmca_pmix_ext2x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext2x_LDFLAGS)
4646
libmca_pmix_ext2x_la_LIBADD = $(opal_pmix_ext2x_LIBS)

opal/mca/pmix/ext2x/configure.m4

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
# -*- shell-script -*-
22
#
3-
# Copyright (c) 2x04-2x05 The Trustees of Indiana University and Indiana
3+
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
44
# University Research and Technology
55
# Corporation. All rights reserved.
6-
# Copyright (c) 2x04-2x05 The University of Tennessee and The University
6+
# Copyright (c) 2004-2005 The University of Tennessee and The University
77
# of Tennessee Research Foundation. All rights
88
# reserved.
9-
# Copyright (c) 2x04-2x05 High Performance Computing Center Stuttgart,
9+
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
# University of Stuttgart. All rights reserved.
11-
# Copyright (c) 2x04-2x05 The Regents of the University of California.
11+
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2x11-2x13 Los Alamos National Security, LLC.
13+
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
15-
# Copyright (c) 2x10-2x15 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2x13-2x16 Intel, Inc. All rights reserved.
17-
# Copyright (c) 2x15 Research Organization for Information Science
15+
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
16+
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
17+
# Copyright (c) 2015-2016 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
19-
# Copyright (c) 2x14-2x15 Mellanox Technologies, Inc.
20-
# All rights reserved.
2119
# $COPYRIGHT$
2220
#
2321
# Additional copyrights may follow
@@ -30,36 +28,33 @@
3028
AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
3129
AC_CONFIG_FILES([opal/mca/pmix/ext2x/Makefile])
3230

31+
# check to see
32+
# if we are linking to an external v2.x library. If not, then
33+
# do not use this component.
34+
AC_MSG_CHECKING([if external v2.x component is to be used])
3335
AS_IF([test "$opal_external_pmix_happy" = "yes"],
34-
[AS_IF([test "$opal_event_external_support" != "yes"],
35-
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
36-
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
37-
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
38-
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
39-
AS_IF([test "$opal_hwloc_external_support" != "yes"],
40-
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL HWLOC])
41-
AC_MSG_WARN([LIBRARY THIS LIBRARY MUST POINT TO THE SAME ONE USED ])
42-
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
43-
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
44-
external_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/$opal_pmix_external_basedir/pmix -I${includedir}/openmpi/$opal_pmix_external_basedir/pmix/include'
45-
46-
AC_MSG_CHECKING([if external component is version 2.x])
47-
AS_IF([test "$opal_external_pmix_version" = "2X"],
48-
[AC_MSG_RESULT([yes])
49-
opal_pmix_ext2x_happy=yes],
50-
[AC_MSG_RESULT([no])
51-
opal_pmix_ext2x_happy=no])
36+
[AS_IF([test "$opal_external_pmix_version" = "2x"],
37+
[AC_MSG_RESULT([yes - using an external v2.x library])
38+
opal_pmix_ext2x_happy=1
39+
# Build flags for our Makefile.am
40+
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
41+
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
42+
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
43+
# setup wrapper flags
44+
pmix_ext2x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
45+
pmix_ext2x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
46+
[AC_MSG_RESULT([no - disqualifying this component])
47+
opal_pmix_ext2x_happy=0])],
48+
[AC_MSG_RESULT([no - disqualifying this component])
49+
opal_pmix_ext2x_happy=0])
5250

53-
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
54-
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
55-
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
51+
AC_SUBST([opal_pmix_ext2x_LIBS])
52+
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
53+
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
54+
AC_SUBST([opal_pmix_ext2x_DEPENDENCIES])
5655

57-
AC_SUBST(opal_pmix_ext2x_CPPFLAGS)
58-
AC_SUBST(opal_pmix_ext2x_LDFLAGS)
59-
AC_SUBST(opal_pmix_ext2x_LIBS)
60-
61-
AS_IF([test "$opal_pmix_ext2x_happy" = "yes"],
62-
[$1],
63-
[$2])],
56+
AS_IF([test $opal_pmix_ext2x_happy -eq 1],
57+
[$1],
6458
[$2])
59+
6560
])dnl

0 commit comments

Comments
 (0)