Merge pull request #6082 from hzhou/2207_rm_hydra2

pm: remove hydra2

Approved-by: Ken Raffenetti

Author: hzhou

.gitignore

@@ -114,15 +114,10 @@ apply-xfail.sh
 /src/mpl/confdb
 /src/pm/hydra/confdb
 /src/pm/hydra/modules
-/src/pm/hydra2/confdb
-/src/pm/hydra2/mpl
-/src/pm/hydra2/mpl/confdb
-/src/pm/hydra2/libhydra/topo/hwloc/hwloc
 /src/mpi/romio/mpl
 /src/mpi/romio/mpl/confdb
 /src/mpi/romio/version.m4
 /src/pm/hydra/version.m4
-/src/pm/hydra2/version.m4
 /test/mpi/version.m4
 
 # created by the build process in the test dirs

autogen.sh

@@ -62,7 +62,6 @@ do_json=yes
 do_yaksa=yes
 do_test=yes
 do_hydra=yes
-do_hydra2=yes
 do_romio=yes
 do_pmi=yes
 do_doc=no
@@ -81,7 +80,6 @@ for arg in "$@" ; do
         do_yaksa=no
         do_test=yes
         do_hydra=yes
-        do_hydra2=no
         do_romio=no
 
         if test -e 'modules.tar.gz' -a ! -e 'modules/PREBUILT' ; then
@@ -201,10 +199,6 @@ set_externals() {
             externals="${externals} src/pm/hydra"
         fi
 
-        if [ "yes" = "$do_hydra2" ] ; then
-            externals="${externals} src/pm/hydra2"
-        fi
-
         if [ "yes" = "$do_romio" ] ; then
             externals="${externals} src/mpi/romio"
         fi
@@ -322,14 +316,6 @@ fn_copy_confdb_etc() {
             confdb_dirs="${confdb_dirs} src/pm/hydra/modules/mpl/confdb"
         fi
     fi
-    if test "$do_hydra2" = "yes" ; then
-        confdb_dirs="${confdb_dirs} src/pm/hydra2/confdb"
-        sync_external src/mpl src/pm/hydra2/mpl
-        sync_external modules/hwloc src/pm/hydra2/libhydra/topo/hwloc/hwloc
-        # remove .git directories to avoid confusing git clean
-        rm -rf src/pm/hydra2/libhydra/topo/hwloc/hwloc/.git
-        confdb_dirs="${confdb_dirs} src/pm/hydra2/mpl/confdb"
-    fi
     if test "$do_test" = "yes" ; then
         confdb_dirs="${confdb_dirs} test/mpi/confdb"
         confdb_dirs="${confdb_dirs} test/mpi/dtpools/confdb"
@@ -343,7 +329,6 @@ fn_copy_confdb_etc() {
     # a couple of other random files
     if [ -f maint/version.m4 ] ; then
         cp -pPR maint/version.m4 src/pm/hydra/version.m4
-        cp -pPR maint/version.m4 src/pm/hydra2/version.m4
         cp -pPR maint/version.m4 src/mpi/romio/version.m4
         cp -pPR maint/version.m4 src/pmi/version.m4
         cp -pPR maint/version.m4 test/mpi/version.m4

configure.ac

@@ -1579,12 +1579,6 @@ for pm_name in $pm_names ; do
         fi
         subsystems="$subsystems src/pm/hydra"
         ;;
-      hydra2)
-        if test "$with_pmi" = "pmix" ; then
-            AC_MSG_ERROR([$pm_name does not support $with_pmi.])
-        fi
-        subsystems="$subsystems src/pm/hydra2"
-        ;;
       *)
         AC_MSG_WARN([PM $pm_name is unknown])
 	hasError=yes

src/pm/Makefile.mk

@@ -29,10 +29,3 @@ DIST_SUBDIRS += src/pm/hydra
 MANDOC_SUBDIRS += src/pm/hydra
 HTMLDOC_SUBDIRS += src/pm/hydra
 endif BUILD_PM_HYDRA
-
-# has its own full automake setup, not Makefile.mk
-if BUILD_PM_HYDRA2
-SUBDIRS += src/pm/hydra2
-DIST_SUBDIRS += src/pm/hydra2
-MANDOC_SUBDIRS += src/pm/hydra2
-endif BUILD_PM_HYDRA2

src/pm/hydra/lib/utils/sock.c

@@ -56,7 +56,6 @@ HYD_status HYDU_sock_listen(int *listen_fd, char *port_range, uint16_t * port)
 
     /* setup_socket */
     *listen_fd = MPL_socket();
-    /* FIXME: duplicate with pm/hydra2/libhydra/sock/hydra_sock.c */
     if (*listen_fd < 0)
         HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "cannot open socket (%s)\n",
                             MPL_strerror(errno));