[mpich-commits] [mpi-all-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.2-18-g3003efd

[Dave Goodell]

Perhaps also add a CHANGES entry indicating our "new" Cobalt support?

-Dave

On Feb 15, 2013, at 8:00 AM CST, mysql vizuser wrote:

> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "MPICH primary repository".
> 
> The branch, master has been updated
>       via  3003efd864588017c4e48935ec89040db7e8f5c6 (commit)
>      from  9a7b024b4ff2b1b758b6199d8e5f0297e35415cc (commit)
> 
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
> 
> - Log -----------------------------------------------------------------
> http://git.mpich.org/mpich.git/commitdiff/3003efd864588017c4e48935ec89040db7e8f5c6
> 
> commit 3003efd864588017c4e48935ec89040db7e8f5c6
> Author: Pavan Balaji <balaji at mcs.anl.gov>
> Date:   Thu Feb 14 09:15:47 2013 -0600
> 
>    Bug-fix: Allow configure to check for cobalt as well.
> 
>    No reviewer.
> 
> diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac
> index 5865976..1398dcc 100644
> --- a/src/pm/hydra/configure.ac
> +++ b/src/pm/hydra/configure.ac
> @@ -164,9 +164,9 @@ fi
> #########################################################################
> AC_ARG_WITH(hydra-bss,
> 	[AC_HELP_STRING([--with-hydra-bss=name],
> -		[Bootstrap Server (user,ssh,rsh,fork,slurm,ll,lsf,sge,pbs,manual,persist)])],
> +		[Bootstrap Server (user,ssh,rsh,fork,slurm,ll,lsf,sge,pbs,cobalt,manual,persist)])],
> 	[ hydra_bss=$withval ],
> -	[ hydra_bss="user,ssh,rsh,fork,slurm,ll,lsf,sge,pbs,manual,persist" ])
> +	[ hydra_bss="user,ssh,rsh,fork,slurm,ll,lsf,sge,pbs,cobalt,manual,persist" ])
> AC_MSG_CHECKING(bootstrap server)
> AC_MSG_RESULT($hydra_bss)
> hydra_bss_names="`echo $hydra_bss | sed -e 's/:/ /g' -e 's/,/ /g'`"
> @@ -223,6 +223,10 @@ for hydra_bss_name in ${hydra_bss_names}; do
>                 fi
> 		available_rmks="$available_rmks pbs"
> 		;;
> +	cobalt)
> +		hydra_bss_external=true
> +		available_rmks="$available_rmks cobalt"
> +		;;
> 	manual)
> 		hydra_bss_external=true
> 		available_launchers="$available_launchers manual"
> diff --git a/src/pm/hydra/tools/bootstrap/external/Makefile.mk b/src/pm/hydra/tools/bootstrap/external/Makefile.mk
> index bbd6119..91d5ee1 100644
> --- a/src/pm/hydra/tools/bootstrap/external/Makefile.mk
> +++ b/src/pm/hydra/tools/bootstrap/external/Makefile.mk
> @@ -49,6 +49,7 @@ libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/external/external_common.c
> 	$(top_srcdir)/tools/bootstrap/external/pbs_init.c \
> 	$(top_srcdir)/tools/bootstrap/external/pbs_query_native_int.c \
> 	$(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c \
> +	$(top_srcdir)/tools/bootstrap/external/cobalt_init.c \
> 	$(top_srcdir)/tools/bootstrap/external/cobalt_query_native_int.c \
> 	$(top_srcdir)/tools/bootstrap/external/cobalt_query_node_list.c
> 
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
> src/pm/hydra/configure.ac                         |    8 ++++++--
> src/pm/hydra/tools/bootstrap/external/Makefile.mk |    1 +
> 2 files changed, 7 insertions(+), 2 deletions(-)
> 
> 
> hooks/post-receive
> -- 
> MPICH primary repository