From 366bd96c8829ad94cc4463e31d2c8343a4dff854 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 9 Nov 2009 14:26:24 +0000 Subject: [PATCH] - Allow to work without xt-catamount module on Jaguar, reducing the amount of components, that up to now needed to be deselected. This commit was SVN r22205. --- ompi/mca/btl/portals/configure.m4 | 6 ++++++ ompi/mca/common/portals/common_portals_crayxt3.c | 8 +++++++- orte/mca/ess/alps/configure.m4 | 5 +++++ orte/mca/ess/alps/ess_alps_module.c | 6 +++++- orte/mca/ess/cnos/ess_cnos_module.c | 6 +++++- orte/mca/grpcomm/cnos/grpcomm_cnos_module.c | 6 +++++- 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ompi/mca/btl/portals/configure.m4 b/ompi/mca/btl/portals/configure.m4 index c3176e7051..e887f31b00 100644 --- a/ompi/mca/btl/portals/configure.m4 +++ b/ompi/mca/btl/portals/configure.m4 @@ -32,6 +32,12 @@ AC_DEFUN([MCA_btl_portals_CONFIG],[ $1], [$2]) + AC_CHECK_HEADERS([catamount/cnos_mpi_os.h], [], + [AC_CHECK_HEADERS([cnos_mpi_os.h], [], [$2], + [AC_INCLUDES_DEFAULT])], + [AC_INCLUDES_DEFAULT]) + + # substitute in the things needed to build portals AC_SUBST([btl_portals_CPPFLAGS]) AC_SUBST([btl_portals_LDFLAGS]) diff --git a/ompi/mca/common/portals/common_portals_crayxt3.c b/ompi/mca/common/portals/common_portals_crayxt3.c index 8404dad196..bd19c32dde 100644 --- a/ompi/mca/common/portals/common_portals_crayxt3.c +++ b/ompi/mca/common/portals/common_portals_crayxt3.c @@ -16,7 +16,13 @@ * $HEADER$ */ -#include +#include "ompi_config.h" + +#if defined(HAVE_CNOS_MPI_OS_H) +# include "cnos_mpi_os.h" +#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H) +# include "catamount/cnos_mpi_os.h" +#endif #include "ompi/constants.h" #include "ompi/proc/proc.h" diff --git a/orte/mca/ess/alps/configure.m4 b/orte/mca/ess/alps/configure.m4 index 14536bfe10..f92c0ae718 100644 --- a/orte/mca/ess/alps/configure.m4 +++ b/orte/mca/ess/alps/configure.m4 @@ -21,6 +21,11 @@ # MCA_ess_alps_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_alps_CONFIG],[ + AC_CHECK_HEADERS([catamount/cnos_mpi_os.h], [], + [AC_CHECK_HEADERS([cnos_mpi_os.h], [], [$2], + [AC_INCLUDES_DEFAULT])], + [AC_INCLUDES_DEFAULT]) + ORTE_CHECK_ALPS([ess_alps], [AC_CHECK_FUNC([cnos_get_rank], [$1], [$2])], [$2]) diff --git a/orte/mca/ess/alps/ess_alps_module.c b/orte/mca/ess/alps/ess_alps_module.c index 6cdf377ae7..580f1b33a5 100644 --- a/orte/mca/ess/alps/ess_alps_module.c +++ b/orte/mca/ess/alps/ess_alps_module.c @@ -20,7 +20,11 @@ #include "orte_config.h" #include "orte/constants.h" -#include +#if defined(HAVE_CNOS_MPI_OS_H) +# include "cnos_mpi_os.h" +#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H) +# include "catamount/cnos_mpi_os.h" +#endif #include "orte/util/show_help.h" #include "opal/mca/paffinity/paffinity.h" diff --git a/orte/mca/ess/cnos/ess_cnos_module.c b/orte/mca/ess/cnos/ess_cnos_module.c index c1bd54dd1e..8c51257276 100644 --- a/orte/mca/ess/cnos/ess_cnos_module.c +++ b/orte/mca/ess/cnos/ess_cnos_module.c @@ -20,7 +20,11 @@ #include "orte_config.h" #include "orte/constants.h" -#include +#if defined(HAVE_CNOS_MPI_OS_H) +# include "cnos_mpi_os.h" +#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H) +# include "catamount/cnos_mpi_os.h" +#endif #include "opal/mca/paffinity/paffinity.h" #include "opal/util/output.h" diff --git a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c index 6c33c7f350..4b64eb7c9d 100644 --- a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c +++ b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c @@ -35,7 +35,11 @@ #include "grpcomm_cnos.h" #if OMPI_GRPCOMM_CNOS_HAVE_BARRIER -#include +# if defined(HAVE_CNOS_MPI_OS_H) +# include "cnos_mpi_os.h" +# elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H) +# include "catamount/cnos_mpi_os.h" +# endif #endif /* API functions */