Skip to content

Commit 8113a8d

Browse files
author
Ralph Castain
committed
Now that we are hiding symbols in the internal PMIx component, we cannot reuse that component for integration to the external PMIx master as the symbols don't match. So create a new "ext3x" component and copy the PMIx v3 integration over there.
Also, remove a couple of build-product files from the pmix3x component.
1 parent 7be6075 commit 8113a8d

File tree

13 files changed

+4910
-3945
lines changed

13 files changed

+4910
-3945
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h
314314
opal/mca/pmix/pmix3x/pmix/src/include/pmix_config.h.in
315315
opal/mca/pmix/pmix3x/pmix/include/pmix_rename.h
316316
opal/mca/pmix/pmix3x/pmix/include/pmix_version.h
317+
opal/mca/pmix/pmix3x/pmix/src/util/keyval/keyval_lex.c
318+
opal/mca/pmix/pmix3x/pmix/src/util/show_help_lex.c
317319

318320
opal/tools/opal-checkpoint/opal-checkpoint
319321
opal/tools/opal-checkpoint/opal-checkpoint.1

‎opal/mca/pmix/ext3x/Makefile.am

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#
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.
6+
# $COPYRIGHT$
7+
#
8+
# Additional copyrights may follow
9+
#
10+
# $HEADER$
11+
#
12+
13+
sources = \
14+
pmix3x.h \
15+
pmix3x_component.c \
16+
pmix3x.c \
17+
pmix3x_client.c \
18+
pmix3x_server_south.c \
19+
pmix3x_server_north.c
20+
21+
# Make the output library in this directory, and name it either
22+
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
23+
# (for static builds).
24+
25+
if MCA_BUILD_opal_pmix_ext3x_DSO
26+
component_noinst =
27+
component_install = mca_pmix_ext3x.la
28+
else
29+
component_noinst = libmca_pmix_ext3x.la
30+
component_install =
31+
endif
32+
33+
mcacomponentdir = $(opallibdir)
34+
mcacomponent_LTLIBRARIES = $(component_install)
35+
mca_pmix_ext3x_la_SOURCES = $(sources)
36+
mca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
37+
mca_pmix_ext3x_la_CPPFLAGS =$(opal_pmix_ext3x_CPPFLAGS)
38+
mca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
39+
mca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)
40+
41+
noinst_LTLIBRARIES = $(component_noinst)
42+
libmca_pmix_ext3x_la_SOURCES =$(sources)
43+
libmca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
44+
libmca_pmix_ext3x_la_CPPFLAGS = $(opal_pmix_ext3x_CPPFLAGS)
45+
libmca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
46+
libmca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)

‎opal/mca/pmix/ext3x/common_sym_whitelist.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ignore symbols in this component that are auto-generated and we
2+
# can't do anything about them (e.g., flex/bison symbols).
3+
pmix_util_keyval_yyleng
4+
pmix_util_keyval_yytext
5+
pmix_show_help_yyleng
6+
pmix_show_help_yytext

‎opal/mca/pmix/ext3x/configure.m4

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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) 2011-2013 Los Alamos National Security, LLC.
14+
# All rights reserved.
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
18+
# and Technology (RIST). All rights reserved.
19+
# $COPYRIGHT$
20+
#
21+
# Additional copyrights may follow
22+
#
23+
# $HEADER$
24+
#
25+
26+
# MCA_pmix_ext3x_CONFIG([action-if-found], [action-if-not-found])
27+
# -----------------------------------------------------------
28+
AC_DEFUN([MCA_opal_pmix_ext3x_CONFIG],[
29+
AC_CONFIG_FILES([opal/mca/pmix/ext3x/Makefile])
30+
31+
# check to see
32+
# if we are linking to an external v3.x library. If not, then
33+
# do not use this component.
34+
AC_MSG_CHECKING([if external v3.x component is to be used])
35+
AS_IF([test "$opal_external_pmix_happy" = "yes"],
36+
[AS_IF([test "$opal_external_pmix_version" = "3X"],
37+
[AC_MSG_RESULT([yes - using an external v3.x library])
38+
opal_pmix_ext3x_happy=1
39+
# Build flags for our Makefile.am
40+
opal_pmix_ext3x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
41+
opal_pmix_ext3x_LDFLAGS=$opal_external_pmix_LDFLAGS
42+
opal_pmix_ext3x_LIBS=$opal_external_pmix_LIBS
43+
# setup wrapper flags
44+
pmix_ext3x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
45+
pmix_ext3x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
46+
[AC_MSG_RESULT([no - disqualifying this component])
47+
opal_pmix_ext3x_happy=0])],
48+
[AC_MSG_RESULT([no - disqualifying this component])
49+
opal_pmix_ext3x_happy=0])
50+
51+
AC_SUBST([opal_pmix_ext3x_LIBS])
52+
AC_SUBST([opal_pmix_ext3x_CPPFLAGS])
53+
AC_SUBST([opal_pmix_ext3x_LDFLAGS])
54+
AC_SUBST([opal_pmix_ext3x_DEPENDENCIES])
55+
56+
AS_IF([test $opal_pmix_ext3x_happy -eq 1],
57+
[$1],
58+
[$2])
59+
60+
])dnl

0 commit comments

Comments
 (0)