Merge pull request open-mpi#8312 from bosilca/issues/remove_ft

Remove C/R from OPAL, OMPI

Author: jjhursey

.gitignore

@@ -185,8 +185,6 @@ ompi/mca/coll/ml/coll_ml_lex.c
 ompi/mca/coll/self/coll-self-version.h*
 ompi/mca/coll/sm/coll-sm-version.h*
 
-ompi/mca/crcp/ompi_crcp.7
-
 ompi/mca/io/romio321/romio/adio/include/romioconf.h
 ompi/mca/io/romio321/romio/include/mpio.h
 ompi/mca/io/romio321/romio/localdefs

NEWS

@@ -79,6 +79,7 @@ Master (not on release branches yet)
 - Do not build Open SHMEM layer when there are no SPMLs available.
   Currently, this means the Open SHMEM layer will only build if
   a MXM or UCX library is found.
+- Remove all vestiges of the C/R support
 
 4.0.5 -- August, 2020
 ---------------------

config/opal_config_files.m4

@@ -1,6 +1,9 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2020      The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -23,7 +26,5 @@ AC_DEFUN([OPAL_CONFIG_FILES],[
         opal/tools/wrappers/opalcc-wrapper-data.txt
         opal/tools/wrappers/opalc++-wrapper-data.txt
         opal/tools/wrappers/opal.pc
-        opal/tools/opal-checkpoint/Makefile
-        opal/tools/opal-restart/Makefile
     ])
 ])

config/opal_configure_options.m4

@@ -512,9 +512,6 @@ OPAL_WITH_OPTION_MIN_MAX_VALUE(port_name,      1024, 255, 2048)
 # Min length accroding to MPI-2.1, p. 418
 OPAL_WITH_OPTION_MIN_MAX_VALUE(datarep_string,  128,  64,  256)
 
-AC_DEFINE_UNQUOTED([OPAL_ENABLE_CRDEBUG], [0],
-    [Whether we want checkpoint/restart enabled debugging functionality or not])
-
 # some systems don't want/like getpwuid
 AC_MSG_CHECKING([if want getpwuid support])
 AC_ARG_ENABLE([getpwuid],

config/opal_setup_ft.m4

@@ -25,9 +25,6 @@ dnl
 #  /* ULFM Specific sections */
 #  #if OPAL_ENABLE_FT_MPI == 0 /* FT ULFM Disabled */
 #  #if OPAL_ENABLE_FT_MPI == 1 /* FT ULFM Enabled */
-#  /* CR Specific sections */
-#  #if OPAL_ENABLE_FT_CR == 0 /* FT Ckpt/Restart Disabled */
-#  #if OPAL_ENABLE_FT_CR == 1 /* FT Ckpt/Restart Enabled */
 #
 
 # This macro is necessary to get the title to be displayed first.  :-)
@@ -40,30 +37,9 @@ AC_DEFUN([OPAL_SETUP_FT_OPTIONS],[
     opal_setup_ft_options="yes"
     AC_ARG_WITH(ft,
                 [AC_HELP_STRING([--with-ft=TYPE],
-                [Specify the type of fault tolerance to enable. Options: mpi (ULFM), LAM (LAM/MPI-like), cr (Checkpoint/Restart) (default: mpi)])],
+                [Specify the type of fault tolerance to enable. Options: mpi (ULFM), (default: mpi)])],
                 [],
                 [with_ft=auto]) # If not specified act as if --with-ft=mpi, but make external prte support failure only if hard requested
-
-    #
-    # Checkpoint/restart enabled debugging
-    #
-    AC_ARG_ENABLE([crdebug],
-                  [AC_HELP_STRING([--enable-crdebug],
-                  [enable checkpoint/restart debugging functionality (default: disabled)])])
-
-    #
-    # Fault Tolerance Thread
-    #
-    # --enable-ft-thread
-    #  #if OPAL_ENABLE_FT_THREAD == 0 /* Disabled */
-    #  #if OPAL_ENABLE_FT_THREAD == 1 /* Enabled  */
-    #
-    AC_ARG_ENABLE([ft_thread],
-                  [AC_HELP_STRING([--disable-ft-thread],
-                  [Disable fault tolerance thread running inside all processes. Requires OPAL thread support (default: enabled)])],
-                  [enable_ft_thread="$enableval"],
-                  [enable_ft_thread="undef"])
-
 ])
 
 AC_DEFUN([OPAL_SETUP_FT],[
@@ -74,7 +50,6 @@ AC_DEFUN([OPAL_SETUP_FT],[
 
     if test x"$with_ft" != "xno"; then
         opal_want_ft=1
-        opal_want_ft_cr=0
         opal_want_ft_mpi=0
         opal_want_ft_type=none
 
@@ -83,6 +58,9 @@ AC_DEFUN([OPAL_SETUP_FT],[
         for opt in $with_ft; do
             IFS=$as_save_IFS
 
+            if test "$opt" = "LAM" || test "$opt" = "lam" || test "$opt" = "CR" || test "$opt" = "cr"; then
+                AC_MSG_RESULT([Support for C/R FT has been removed in OMPI 5.0])
+            fi
             # Default value
             if test "$opt" = "auto"; then
                 opal_want_ft_mpi=1
@@ -96,23 +74,13 @@ AC_DEFUN([OPAL_SETUP_FT],[
                 opal_want_ft_mpi=1
             elif test "$opt" = "mpi"; then
                 opal_want_ft_mpi=1
-            elif test "$opt" = "LAM"; then
-                opal_want_ft_cr=1
-            elif test "$opt" = "lam"; then
-                opal_want_ft_cr=1
-            elif test "$opt" = "CR"; then
-                opal_want_ft_cr=1
-            elif test "$opt" = "cr"; then
-                opal_want_ft_cr=1
             else
                 AC_MSG_RESULT([Unrecognized FT TYPE: $opt])
                 AC_MSG_ERROR([Cannot continue])
             fi
         done
         if test "$opal_want_ft_mpi" = 1; then
             opal_want_ft_type="mpi"
-        elif test "$opal_want_ft_cr" = 1; then
-            opal_want_ft_type="cr"
         fi
 
         # If we use external PRTE, does it support FT?
@@ -130,7 +98,6 @@ AC_DEFUN([OPAL_SETUP_FT],[
                     AC_MSG_WARN([*** DISABLING FAULT TOLERANCE SUPPORT.           *])
                     AC_MSG_WARN([**************************************************])
                     opal_want_ft_mpi=0
-                    opal_want_ft_cr=0
                     opal_want_ft_type="none"
                 ])
             ])
@@ -147,7 +114,6 @@ AC_DEFUN([OPAL_SETUP_FT],[
     else
         opal_want_ft=0
         opal_want_ft_mpi=0
-        opal_want_ft_cr=0
         if test "$opal_setup_ft_options" = "yes"; then
             AC_MSG_RESULT([Disabled fault tolerance])
         fi
@@ -156,73 +122,21 @@ AC_DEFUN([OPAL_SETUP_FT],[
                        [Enable fault tolerance general components and logic])
     AC_DEFINE_UNQUOTED([OPAL_ENABLE_FT_MPI], [$opal_want_ft_mpi],
                        [Enable fault tolerance MPI ULFM components and logic])
-    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_MPI, test "$opal_want_ft_mpi" = "1")
-    AM_CONDITIONAL(WANT_FT_CR,  test "$opal_want_ft_cr" = "1")
 
     if test "$opal_setup_ft_options" = "yes"; then
         AC_MSG_CHECKING([if want checkpoint/restart enabled debugging option])
     fi
     if test "$opal_want_ft" = "0"; then
-        opal_want_prd=0
         if test "$opal_setup_ft_options" = "yes"; then
             AC_MSG_RESULT([Disabled (fault tolerance disabled --without-ft)])
         fi
-    elif test "$enable_crdebug" = "yes"; then
-        opal_want_prd=1
-        AC_MSG_RESULT([Enabled])
     else
-        opal_want_prd=0
         if test "$opal_setup_ft_options" = "yes"; then
             AC_MSG_RESULT([Disabled])
         fi
     fi
-    AC_DEFINE_UNQUOTED([OPAL_ENABLE_CRDEBUG], [$opal_want_prd],
-                       [Whether we want checkpoint/restart enabled debugging functionality or not])
 
-    if test "$opal_setup_ft_options" = "yes"; then
-        AC_MSG_CHECKING([if want fault tolerance thread])
-    fi
-    # if they do not want FT support, then they do not want this thread either
-    if test "$opal_want_ft" = "0"; then
-        opal_want_ft_thread=0
-        if test "$opal_setup_ft_options" = "yes"; then
-            AC_MSG_RESULT([Disabled (fault tolerance disabled --without-ft)])
-        fi
-    # if --disable-ft-thread
-    elif test "$enable_ft_thread" = "no"; then
-        opal_want_ft_thread=0
-        AC_MSG_RESULT([Disabled])
-    # if default, and no progress or MPI threads
-    elif test "$enable_ft_thread" = "undef" && test "$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 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
-            AC_MSG_RESULT([Must enable OPAL basic thread support to use this option])
-            AC_MSG_ERROR([Cannot continue])
-        else
-            AC_MSG_RESULT([yes])
-            opal_want_ft_thread=1
-            AC_MSG_WARN([**************************************************])
-            AC_MSG_WARN([*** Fault Tolerance with a thread in Open MPI    *])
-            AC_MSG_WARN([*** is an experimental, research quality option. *])
-            AC_MSG_WARN([*** It requires OPAL thread support and care     *])
-            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])
-    AM_CONDITIONAL(WANT_FT_THREAD, test "$opal_want_ft_thread" = "1")
     OPAL_SUMMARY_ADD([[Miscellaneous]],[[Fault Tolerance support]],[unnecessary], [$opal_want_ft_type])
 ])

contrib/Makefile.am

@@ -2,7 +2,7 @@
 # Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
+# Copyright (c) 2004-2020 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
 # Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
@@ -31,12 +31,6 @@ if WANT_FT_MPI
 dist_amca_param_DATA += amca-param-sets/ft-mpi
 endif # WANT_FT_MPI
 
-if WANT_FT_CR
-dist_amca_param_DATA += \
-	amca-param-sets/ft-enable-cr \
-	amca-param-sets/ft-enable-cr-recovery
-endif # WANT_FT_CR
-
 EXTRA_DIST = \
         completion/mpirun.sh \
         completion/mpirun.zsh \