Skip to content

Commit c9a0fd3

Browse files
author
Ralph Castain
authored
Merge pull request #3666 from rhc54/topic/extpmix
Correct the external pmix configury
2 parents ea5649d + 2d65908 commit c9a0fd3

File tree

2 files changed

+41
-99
lines changed

2 files changed

+41
-99
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
16+
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2017 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
@@ -31,23 +31,22 @@ AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
3131
AC_CONFIG_FILES([opal/mca/pmix/ext1x/Makefile])
3232

3333
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-
45-
# check for the 1.x version ( >= 1.1.4 ?)
34+
[ # check for the 1.x version ( >= 1.1.4 ?)
4635
AC_MSG_CHECKING([if external component is version 1.x])
4736
AS_IF([test "$opal_external_pmix_version" = "11" ||
4837
test "$opal_external_pmix_version" = "12" ||
4938
test "$opal_external_pmix_version" = "1x"],
5039
[AC_MSG_RESULT([yes])
40+
AS_IF([test "$opal_event_external_support" != "yes"],
41+
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
42+
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
43+
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
44+
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
45+
AS_IF([test "$opal_hwloc_external_support" != "yes"],
46+
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL HWLOC])
47+
AC_MSG_WARN([LIBRARY THIS LIBRARY MUST POINT TO THE SAME ONE USED ])
48+
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
49+
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
5150
opal_pmix_external_1x_happy=yes],
5251
[AC_MSG_RESULT([no])
5352
opal_pmix_external_1x_happy=no])

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

Lines changed: 29 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
# All rights reserved.
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
15-
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17-
# Copyright (c) 2015-2016 Research Organization for Information Science
15+
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
16+
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17+
# Copyright (c) 2015-2017 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
19+
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
20+
# All rights reserved.
1921
# $COPYRIGHT$
2022
#
2123
# Additional copyrights may follow
@@ -28,93 +30,34 @@
2830
AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
2931
AC_CONFIG_FILES([opal/mca/pmix/ext2x/Makefile])
3032

31-
OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_ext2x_save_CPPFLAGS opal_pmix_pmix2_save_CFLAGS opal_pmix_ext2x_save_LDFLAGS opal_pmix_ext2x_save_LIBS opal_pmix_ext2x_basedir opal_pmix_ext2x_args opal_pmix_ext2x_happy opal_pmix_ext2x_sm_flag pmix_ext2x_status_filename])
32-
33-
opal_pmix_ext2x_basedir=opal/mca/pmix/ext2x
34-
35-
opal_pmix_ext2x_save_CFLAGS=$CFLAGS
36-
opal_pmix_ext2x_save_CPPFLAGS=$CPPFLAGS
37-
opal_pmix_ext2x_save_LDFLAGS=$LDFLAGS
38-
opal_pmix_ext2x_save_LIBS=$LIBS
39-
40-
AC_ARG_ENABLE([pmix-dstore],
41-
[AC_HELP_STRING([--enable-pmix-dstore],
42-
[Enable PMIx shared memory data store (default: enabled)])])
43-
AC_MSG_CHECKING([if PMIx shared memory data store is enabled])
44-
if test "$enable_pmix_dstore" != "no"; then
45-
AC_MSG_RESULT([yes])
46-
opal_pmix_ext2x_sm_flag=--enable-dstore
47-
else
48-
AC_MSG_RESULT([no (disabled)])
49-
opal_pmix_ext2x_sm_flag=--disable-dstore
50-
fi
51-
52-
AC_ARG_ENABLE([pmix-timing],
53-
[AC_HELP_STRING([--enable-pmix-timing],
54-
[Enable PMIx timing measurements (default: disabled)])])
55-
AC_MSG_CHECKING([if PMIx timing is enabled])
56-
if test "$enable_pmix_timing" == "yes"; then
57-
AC_MSG_RESULT([yes])
58-
opal_pmix_ext2x_timing_flag=--enable-pmix-timing
59-
else
60-
AC_MSG_RESULT([no (disabled)])
61-
opal_pmix_ext2x_timing_flag=--disable-pmix-timing
62-
fi
63-
64-
opal_pmix_ext2x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX2X_ $opal_pmix_ext2x_sm_flag $opal_pmix_ext2x_timing_flag --without-tests-examples --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-mode"
65-
AS_IF([test "$enable_debug" = "yes"],
66-
[opal_pmix_ext2x_args="--enable-debug $opal_pmix_ext2x_args"
67-
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
68-
[opal_pmix_ext2x_args="--disable-debug $opal_pmix_ext2x_args"
69-
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
70-
AS_IF([test "$with_devel_headers" = "yes"],
71-
[opal_pmix_ext2x_args="--with-devel-headers $opal_pmix_ext2x_args"],
72-
[opal_pmix_ext2x_args=$opal_pmix_ext2x_args])
73-
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
74-
75-
OPAL_CONFIG_SUBDIR([$opal_pmix_ext2x_basedir/pmix],
76-
[$opal_pmix_ext2x_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
77-
[opal_pmix_ext2x_happy=1], [opal_pmix_ext2x_happy=0])
78-
79-
CFLAGS=$opal_pmix_ext2x_save_CFLAGS
80-
CPPFLAGS=$opal_pmix_ext2x_save_CPPFLAGS
81-
LDFLAGS=$opal_pmix_ext2x_save_LDFLAGS
82-
LIBS=$opal_pmix_ext2x_save_LIBS
83-
84-
# if we are linking to an external v2.x library. If not, then
85-
# do not use this component.
86-
AC_MSG_CHECKING([if external v2.x component is to be used])
8733
AS_IF([test "$opal_external_pmix_happy" = "yes"],
88-
[AS_IF([test "$opal_external_pmix_version" = "2x"],
89-
[AC_MSG_RESULT([yes - using an external v2.x library])
90-
opal_pmix_ext2x_happy=1
91-
# Build flags for our Makefile.am
92-
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
93-
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
94-
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
95-
# setup wrapper flags
34+
[ # check for the 2.x version
35+
AC_MSG_CHECKING([if external component is version 2.x])
36+
AS_IF([test "$opal_external_pmix_version" = "2x"],
37+
[AC_MSG_RESULT([yes])
38+
AS_IF([test "$opal_event_external_support" != "yes"],
39+
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
40+
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
41+
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
42+
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
43+
opal_pmix_external_2x_happy=yes],
44+
[AC_MSG_RESULT([no])
45+
opal_pmix_external_2x_happy=no])
46+
47+
AS_IF([test "$opal_pmix_external_2x_happy" = "yes"],
48+
[$1
49+
# need to set the wrapper flags for static builds
9650
pmix_ext2x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
9751
pmix_ext2x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
98-
[AC_MSG_RESULT([no - disqualifying this component])
99-
opal_pmix_ext2x_happy=0])],
100-
[AC_MSG_RESULT([no])
101-
opal_pmix_ext2x_happy=0])
102-
103-
AC_SUBST([opal_pmix_ext2x_LIBS])
104-
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
105-
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
106-
AC_SUBST([opal_pmix_ext2x_DEPENDENCIES])
52+
[$2])],
53+
[$2])
10754

108-
AC_MSG_CHECKING([PMIx extra wrapper CPPFLAGS])
109-
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_CPPFLAGS])
110-
AC_MSG_CHECKING([PMIx extra wrapper LDFLAGS])
111-
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LDFLAGS])
112-
AC_MSG_CHECKING([PMIx extra wrapper LIBS])
113-
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LIBS])
55+
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
56+
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
57+
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
11458

115-
AS_IF([test $opal_pmix_ext2x_happy -eq 1],
116-
[$1],
117-
[$2])
59+
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
60+
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
61+
AC_SUBST([opal_pmix_ext2x_LIBS])
11862

119-
OPAL_VAR_SCOPE_POP
12063
])dnl

0 commit comments

Comments
 (0)