From ea7b9cfc819dc2e1f42d0fb2ce167dc811426ba2 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Sun, 12 Mar 2006 05:32:35 +0000 Subject: [PATCH] * Only enable SLURM support in ORTE if on a platform currently supported by SLURM. Currently, this includes AIX and Linux. If the user wants to build SLURM on another platform, they can specify --with-slurm. * Enable/disable the SLURM sds component using the same logic as the PLS and RDS components. This commit was SVN r9259. --- config/ompi_check_slurm.m4 | 13 +++++++++- orte/mca/sds/slurm/configure.m4 | 37 +++++++++++++++++++++++++++++ orte/mca/sds/slurm/configure.params | 1 + 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 orte/mca/sds/slurm/configure.m4 diff --git a/config/ompi_check_slurm.m4 b/config/ompi_check_slurm.m4 index 5a8a8db93e..1e391ec8a7 100644 --- a/config/ompi_check_slurm.m4 +++ b/config/ompi_check_slurm.m4 @@ -25,8 +25,19 @@ AC_DEFUN([OMPI_CHECK_SLURM],[ [AC_HELP_STRING([--with-slurm], [Build SLURM scheduler component (default: yes)])]) - if test "with_slurm" = "no" ; then + if test "$with_slurm" = "no" ; then ompi_check_slurm_happy="no" + elif test "$with_slurm" = "" ; then + # unless user asked, only build slurm component on + # linux systems. + case $host in + *-linux*|*-aix*) + ompi_check_slurm_happy="yes" + ;; + *) + ompi_check_slurm_happy="no" + ;; + esac else ompi_check_slurm_happy="yes" fi diff --git a/orte/mca/sds/slurm/configure.m4 b/orte/mca/sds/slurm/configure.m4 new file mode 100644 index 0000000000..6a14889ddf --- /dev/null +++ b/orte/mca/sds/slurm/configure.m4 @@ -0,0 +1,37 @@ +# -*- shell-script -*- +# +# Copyright (c) 2004-2005 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 +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_sds_slurm_CONFIG([action-if-found], [action-if-not-found]) +# ----------------------------------------------------------- +AC_DEFUN([MCA_sds_slurm_CONFIG],[ + OMPI_CHECK_SLURM([sds_slurm], [sds_slurm_good=1], [sds_slurm_good=0]) + + # if check worked, set wrapper flags if so. + # Evaluate succeed / fail + AS_IF([test "$sds_slurm_good" = "1"], + [sds_slurm_WRAPPER_EXTRA_LDFLAGS="$sds_slurm_LDFLAGS" + sds_slurm_WRAPPER_EXTRA_LIBS="$sds_slurm_LIBS" + $1], + [$2]) + + # set build flags to use in makefile + AC_SUBST([sds_slurm_CPPFLAGS]) + AC_SUBST([sds_slurm_LDFLAGS]) + AC_SUBST([sds_slurm_LIBS]) +])dnl diff --git a/orte/mca/sds/slurm/configure.params b/orte/mca/sds/slurm/configure.params index 166975134e..55a1842836 100644 --- a/orte/mca/sds/slurm/configure.params +++ b/orte/mca/sds/slurm/configure.params @@ -17,4 +17,5 @@ # $HEADER$ # +PARAM_INIT_FILE=sds_slurm_component.c PARAM_CONFIG_FILES="Makefile"