Cleanup configure checks for C/R functionality.
Add a WANT_FT_CR flag different from WANT_FT so tools like *-checkpoint are not built when a different FT technique is requested. Also fix the C/R thread check so that it is only enabled if C/R is enabled, not generally when threads are enabled. This commit was SVN r24769.
Этот коммит содержится в:
Josh Hursey
родитель
0173a00f6b
Коммит
6539a31b23
@ -11,6 +11,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2010 IBM Corporation. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -21,11 +22,11 @@
|
||||
amca_paramdir = $(AMCA_PARAM_SETS_DIR)
|
||||
dist_amca_param_DATA = amca-param-sets/example.conf
|
||||
|
||||
if WANT_FT
|
||||
if WANT_FT_CR
|
||||
dist_amca_param_DATA += \
|
||||
amca-param-sets/ft-enable-cr \
|
||||
amca-param-sets/ft-enable-cr-recovery
|
||||
endif
|
||||
endif # WANT_FT_CR
|
||||
|
||||
EXTRA_DIST = \
|
||||
dist/make_dist_tarball \
|
||||
|
||||
@ -10,6 +10,7 @@ dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -239,8 +240,8 @@ elif test "$enable_ft_thread" = "no"; then
|
||||
elif test "$enable_ft_thread" = "undef" -a "$enable_opal_multi_threads" = "no" ; then
|
||||
opal_want_ft_thread=0
|
||||
AC_MSG_RESULT([Disabled (OPAL Thread Support Disabled)])
|
||||
# if default, and MPI threads enabled
|
||||
else
|
||||
# if default, and MPI threads enabled for C/R only
|
||||
elif test "$opal_want_ft_cr" = 1; then
|
||||
# Default: Enable
|
||||
# Make sure we have OPAL Threads enabled
|
||||
if test "$enable_opal_multi_threads" = "no"; then
|
||||
@ -256,6 +257,10 @@ else
|
||||
AC_MSG_WARN([*** should be used when enabling these options. *])
|
||||
AC_MSG_WARN([**************************************************])
|
||||
fi
|
||||
# Otherwise disabled
|
||||
else
|
||||
opal_want_ft_thread=0
|
||||
AC_MSG_RESULT([Disabled (Non-C/R Fault Tolerance enabled)])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([OPAL_ENABLE_FT_THREAD], [$opal_want_ft_thread],
|
||||
[Enable fault tolerance thread in Open PAL])
|
||||
|
||||
@ -15,7 +15,7 @@ dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
|
||||
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
|
||||
dnl reserved.
|
||||
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
|
||||
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
|
||||
dnl Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
|
||||
dnl
|
||||
dnl $COPYRIGHT$
|
||||
@ -413,6 +413,7 @@ AC_DEFINE_UNQUOTED([OPAL_ENABLE_FT], [$opal_want_ft],
|
||||
AC_DEFINE_UNQUOTED([OPAL_ENABLE_FT_CR], [$opal_want_ft_cr],
|
||||
[Enable fault tolerance checkpoint/restart components and logic])
|
||||
AM_CONDITIONAL(WANT_FT, test "$opal_want_ft" = "1")
|
||||
AM_CONDITIONAL(WANT_FT_CR, test "$opal_want_ft_cr" = "1")
|
||||
|
||||
#
|
||||
# Do we want to install binaries?
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -23,6 +24,7 @@ include $(top_srcdir)/Makefile.man-page-rules
|
||||
man_pages = opal-checkpoint.1
|
||||
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
|
||||
|
||||
if WANT_FT_CR
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = opal-checkpoint
|
||||
@ -41,5 +43,7 @@ endif # OMPI_INSTALL_BINARIES
|
||||
opal_checkpoint_SOURCES = opal-checkpoint.c
|
||||
opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
endif # WANT_FT_CR
|
||||
|
||||
distclean-local:
|
||||
rm -f $(man_pages)
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -23,6 +24,7 @@ include $(top_srcdir)/Makefile.man-page-rules
|
||||
man_pages = opal-restart.1
|
||||
EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
|
||||
|
||||
if WANT_FT_CR
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = opal-restart
|
||||
@ -41,5 +43,7 @@ endif # OMPI_INSTALL_BINARIES
|
||||
opal_restart_SOURCES = opal-restart.c
|
||||
opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
endif # WANT_FT_CR
|
||||
|
||||
distclean-local:
|
||||
rm -f $(man_pages)
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -24,7 +25,7 @@ man_pages = orte-checkpoint.1
|
||||
EXTRA_DIST = orte-checkpoint.1in CMakeLists.txt
|
||||
|
||||
if !ORTE_DISABLE_FULL_SUPPORT
|
||||
if WANT_FT
|
||||
if WANT_FT_CR
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orte-checkpoint
|
||||
@ -43,7 +44,7 @@ endif # OMPI_INSTALL_BINARIES
|
||||
orte_checkpoint_SOURCES = orte-checkpoint.c
|
||||
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
endif # WANT_FT
|
||||
endif # WANT_FT_CR
|
||||
endif # !ORTE_DISABLE_FULL_SUPPORT
|
||||
|
||||
distclean-local:
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
# Copyright (c) 2009-2010 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
#
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
@ -16,7 +17,7 @@ man_pages = orte-migrate.1
|
||||
EXTRA_DIST = orte-migrate.1in CMakeLists.txt
|
||||
|
||||
if !ORTE_DISABLE_FULL_SUPPORT
|
||||
if WANT_FT
|
||||
if WANT_FT_CR
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orte-migrate
|
||||
@ -35,7 +36,7 @@ endif # OMPI_INSTALL_BINARIES
|
||||
orte_migrate_SOURCES = orte-migrate.c
|
||||
orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
endif # WANT_FT
|
||||
endif # WANT_FT_CR
|
||||
endif # !ORTE_DISABLE_FULL_SUPPORT
|
||||
|
||||
distclean-local:
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright (c) 2010-2011 Oak Ridge National Labs. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -24,7 +25,7 @@ man_pages = orte-restart.1
|
||||
EXTRA_DIST = orte-restart.1in CMakeLists.txt
|
||||
|
||||
if !ORTE_DISABLE_FULL_SUPPORT
|
||||
if WANT_FT
|
||||
if WANT_FT_CR
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orte-restart
|
||||
@ -43,7 +44,7 @@ endif # OMPI_INSTALL_BINARIES
|
||||
orte_restart_SOURCES = orte-restart.c
|
||||
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
endif # WANT_FT
|
||||
endif # WANT_FT_CR
|
||||
endif # ORTE_DISABLE_FULL_SUPPORT
|
||||
|
||||
distclean-local:
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user