Correct the external pmix configury
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain
родитель
88b5ec3597
Коммит
2d65908184
@ -13,7 +13,7 @@
|
|||||||
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
|
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
|
||||||
# Copyright (c) 2015-2017 Research Organization for Information Science
|
# Copyright (c) 2015-2017 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||||
@ -31,7 +31,13 @@ AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
|
|||||||
AC_CONFIG_FILES([opal/mca/pmix/ext1x/Makefile])
|
AC_CONFIG_FILES([opal/mca/pmix/ext1x/Makefile])
|
||||||
|
|
||||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||||
[AS_IF([test "$opal_event_external_support" != "yes"],
|
[ # check for the 1.x version ( >= 1.1.4 ?)
|
||||||
|
AC_MSG_CHECKING([if external component is version 1.x])
|
||||||
|
AS_IF([test "$opal_external_pmix_version" = "11" ||
|
||||||
|
test "$opal_external_pmix_version" = "12" ||
|
||||||
|
test "$opal_external_pmix_version" = "1x"],
|
||||||
|
[AC_MSG_RESULT([yes])
|
||||||
|
AS_IF([test "$opal_event_external_support" != "yes"],
|
||||||
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
|
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
|
||||||
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
|
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
|
||||||
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
||||||
@ -41,13 +47,6 @@ AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
|
|||||||
AC_MSG_WARN([LIBRARY THIS LIBRARY MUST POINT TO THE SAME ONE USED ])
|
AC_MSG_WARN([LIBRARY THIS LIBRARY MUST POINT TO THE SAME ONE USED ])
|
||||||
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
||||||
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
|
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
|
||||||
|
|
||||||
# check for the 1.x version ( >= 1.1.4 ?)
|
|
||||||
AC_MSG_CHECKING([if external component is version 1.x])
|
|
||||||
AS_IF([test "$opal_external_pmix_version" = "11" ||
|
|
||||||
test "$opal_external_pmix_version" = "12" ||
|
|
||||||
test "$opal_external_pmix_version" = "1x"],
|
|
||||||
[AC_MSG_RESULT([yes])
|
|
||||||
opal_pmix_external_1x_happy=yes],
|
opal_pmix_external_1x_happy=yes],
|
||||||
[AC_MSG_RESULT([no])
|
[AC_MSG_RESULT([no])
|
||||||
opal_pmix_external_1x_happy=no])
|
opal_pmix_external_1x_happy=no])
|
||||||
|
|||||||
@ -12,10 +12,12 @@
|
|||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
|
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
|
||||||
# Copyright (c) 2015-2016 Research Organization for Information Science
|
# Copyright (c) 2015-2017 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
|
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
|
||||||
|
# All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -28,93 +30,34 @@
|
|||||||
AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
|
AC_DEFUN([MCA_opal_pmix_ext2x_CONFIG],[
|
||||||
AC_CONFIG_FILES([opal/mca/pmix/ext2x/Makefile])
|
AC_CONFIG_FILES([opal/mca/pmix/ext2x/Makefile])
|
||||||
|
|
||||||
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])
|
|
||||||
|
|
||||||
opal_pmix_ext2x_basedir=opal/mca/pmix/ext2x
|
|
||||||
|
|
||||||
opal_pmix_ext2x_save_CFLAGS=$CFLAGS
|
|
||||||
opal_pmix_ext2x_save_CPPFLAGS=$CPPFLAGS
|
|
||||||
opal_pmix_ext2x_save_LDFLAGS=$LDFLAGS
|
|
||||||
opal_pmix_ext2x_save_LIBS=$LIBS
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([pmix-dstore],
|
|
||||||
[AC_HELP_STRING([--enable-pmix-dstore],
|
|
||||||
[Enable PMIx shared memory data store (default: enabled)])])
|
|
||||||
AC_MSG_CHECKING([if PMIx shared memory data store is enabled])
|
|
||||||
if test "$enable_pmix_dstore" != "no"; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
opal_pmix_ext2x_sm_flag=--enable-dstore
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no (disabled)])
|
|
||||||
opal_pmix_ext2x_sm_flag=--disable-dstore
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([pmix-timing],
|
|
||||||
[AC_HELP_STRING([--enable-pmix-timing],
|
|
||||||
[Enable PMIx timing measurements (default: disabled)])])
|
|
||||||
AC_MSG_CHECKING([if PMIx timing is enabled])
|
|
||||||
if test "$enable_pmix_timing" == "yes"; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
opal_pmix_ext2x_timing_flag=--enable-pmix-timing
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no (disabled)])
|
|
||||||
opal_pmix_ext2x_timing_flag=--disable-pmix-timing
|
|
||||||
fi
|
|
||||||
|
|
||||||
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"
|
|
||||||
AS_IF([test "$enable_debug" = "yes"],
|
|
||||||
[opal_pmix_ext2x_args="--enable-debug $opal_pmix_ext2x_args"
|
|
||||||
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
|
|
||||||
[opal_pmix_ext2x_args="--disable-debug $opal_pmix_ext2x_args"
|
|
||||||
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
|
|
||||||
AS_IF([test "$with_devel_headers" = "yes"],
|
|
||||||
[opal_pmix_ext2x_args="--with-devel-headers $opal_pmix_ext2x_args"],
|
|
||||||
[opal_pmix_ext2x_args=$opal_pmix_ext2x_args])
|
|
||||||
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
|
|
||||||
|
|
||||||
OPAL_CONFIG_SUBDIR([$opal_pmix_ext2x_basedir/pmix],
|
|
||||||
[$opal_pmix_ext2x_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
|
|
||||||
[opal_pmix_ext2x_happy=1], [opal_pmix_ext2x_happy=0])
|
|
||||||
|
|
||||||
CFLAGS=$opal_pmix_ext2x_save_CFLAGS
|
|
||||||
CPPFLAGS=$opal_pmix_ext2x_save_CPPFLAGS
|
|
||||||
LDFLAGS=$opal_pmix_ext2x_save_LDFLAGS
|
|
||||||
LIBS=$opal_pmix_ext2x_save_LIBS
|
|
||||||
|
|
||||||
# if we are linking to an external v2.x library. If not, then
|
|
||||||
# do not use this component.
|
|
||||||
AC_MSG_CHECKING([if external v2.x component is to be used])
|
|
||||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||||
[AS_IF([test "$opal_external_pmix_version" = "2x"],
|
[ # check for the 2.x version
|
||||||
[AC_MSG_RESULT([yes - using an external v2.x library])
|
AC_MSG_CHECKING([if external component is version 2.x])
|
||||||
opal_pmix_ext2x_happy=1
|
AS_IF([test "$opal_external_pmix_version" = "2x"],
|
||||||
# Build flags for our Makefile.am
|
[AC_MSG_RESULT([yes])
|
||||||
|
AS_IF([test "$opal_event_external_support" != "yes"],
|
||||||
|
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
|
||||||
|
AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
|
||||||
|
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
|
||||||
|
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
|
||||||
|
opal_pmix_external_2x_happy=yes],
|
||||||
|
[AC_MSG_RESULT([no])
|
||||||
|
opal_pmix_external_2x_happy=no])
|
||||||
|
|
||||||
|
AS_IF([test "$opal_pmix_external_2x_happy" = "yes"],
|
||||||
|
[$1
|
||||||
|
# need to set the wrapper flags for static builds
|
||||||
|
pmix_ext2x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||||
|
pmix_ext2x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
||||||
|
[$2])],
|
||||||
|
[$2])
|
||||||
|
|
||||||
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
opal_pmix_ext2x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
|
||||||
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
|
opal_pmix_ext2x_LDFLAGS=$opal_external_pmix_LDFLAGS
|
||||||
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
|
opal_pmix_ext2x_LIBS=$opal_external_pmix_LIBS
|
||||||
# setup wrapper flags
|
|
||||||
pmix_ext2x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
|
|
||||||
pmix_ext2x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
|
|
||||||
[AC_MSG_RESULT([no - disqualifying this component])
|
|
||||||
opal_pmix_ext2x_happy=0])],
|
|
||||||
[AC_MSG_RESULT([no])
|
|
||||||
opal_pmix_ext2x_happy=0])
|
|
||||||
|
|
||||||
AC_SUBST([opal_pmix_ext2x_LIBS])
|
|
||||||
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
|
AC_SUBST([opal_pmix_ext2x_CPPFLAGS])
|
||||||
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
|
AC_SUBST([opal_pmix_ext2x_LDFLAGS])
|
||||||
AC_SUBST([opal_pmix_ext2x_DEPENDENCIES])
|
AC_SUBST([opal_pmix_ext2x_LIBS])
|
||||||
|
|
||||||
AC_MSG_CHECKING([PMIx extra wrapper CPPFLAGS])
|
|
||||||
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_CPPFLAGS])
|
|
||||||
AC_MSG_CHECKING([PMIx extra wrapper LDFLAGS])
|
|
||||||
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LDFLAGS])
|
|
||||||
AC_MSG_CHECKING([PMIx extra wrapper LIBS])
|
|
||||||
AC_MSG_RESULT([$pmix_ext2x_WRAPPER_EXTRA_LIBS])
|
|
||||||
|
|
||||||
AS_IF([test $opal_pmix_ext2x_happy -eq 1],
|
|
||||||
[$1],
|
|
||||||
[$2])
|
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
|
||||||
])dnl
|
])dnl
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user