cf6137b530
Bring Slurm PMI-1 component online Bring the s2 component online Little cleanup - let the various PMIx modules set the process name during init, and then just raise it up to the ORTE level. Required as the different PMI environments all pass the jobid in different ways. Bring the OMPI pubsub/pmi component online Get comm_spawn working again Ensure we always provide a cpuset, even if it is NULL pmix/cray: adjust cray pmix component for pmix Make changes so cray pmix can work within the integrated ompi/pmix framework. Bring singletons back online. Implement the comm_spawn operation using pmix - not tested yet Cleanup comm_spawn - procs now starting, error in connect_accept Complete integration
83 строки
3.8 KiB
Bash
83 строки
3.8 KiB
Bash
# -*- 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 (c) 2011-2013 Los Alamos National Security, LLC.
|
|
# All rights reserved.
|
|
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
|
# Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# MCA_pmix_pmix1xx_CONFIG([action-if-found], [action-if-not-found])
|
|
# -----------------------------------------------------------
|
|
AC_DEFUN([MCA_opal_pmix_pmix1xx_CONFIG],[
|
|
AC_CONFIG_FILES([opal/mca/pmix/pmix1xx/Makefile])
|
|
|
|
OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix1xx_save_CPPFLAGS opal_pmix_pmix1xx_save_LDFLAGS opal_pmix_pmix1xx_save_LIBS opal_pmix_pmix1xx_basedir opal_pmix_pmix1xx_save_cflags])
|
|
|
|
PMIX_VERSION=
|
|
opal_pmix_pmix1xx_basedir=opal/mca/pmix/pmix1xx
|
|
|
|
opal_pmix_pmix1xx_save_CFLAGS=$CFLAGS
|
|
opal_pmix_pmix1xx_save_CPPFLAGS=$CPPFLAGS
|
|
opal_pmix_pmix1xx_save_LDFLAGS=$LDFLAGS
|
|
opal_pmix_pmix1xx_save_LIBS=$LIBS
|
|
|
|
opal_pmix_pmix1xx_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix1xx_ --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
|
|
if test "$enable_debug" = "yes"; then
|
|
opal_pmix_pmix1xx_args = "--enable-debug $opal_pmix_pmix1xx_args"
|
|
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"
|
|
else
|
|
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
|
|
fi
|
|
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
|
|
export CFLAGS
|
|
export CPPFLAGS
|
|
|
|
OPAL_CONFIG_SUBDIR([$opal_pmix_pmix1xx_basedir/pmix],
|
|
[$opal_pmix_pmix1xx_args $opal_subdir_args],
|
|
[opal_pmix_pmix1xx_happy=1], [opal_pmix_pmix1xx_happy=0])
|
|
|
|
if test $opal_pmix_pmix1xx_happy -eq 1; then
|
|
PMIX_VERSION="internal v`$srcdir/$opal_pmix_pmix1xx_basedir/pmix/config/pmix_get_version.sh $srcdir/$opal_pmix_pmix1xx_basedir/pmix/VERSION`"
|
|
# Build flags for our Makefile.am
|
|
opal_pmix_pmix1xx_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_pmix_pmix1xx_basedir"'/pmix/libpmix.la'
|
|
opal_pmix_pmix1xx_CPPFLAGS='-I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix1xx/pmix/include/pmix -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix1xx/pmix/include -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix1xx/pmix -I$(OPAL_TOP_SRCDIR)/opal/mca/pmix/pmix1xx/pmix'
|
|
AC_SUBST([opal_pmix_pmix1xx_LIBS])
|
|
AC_SUBST([opal_pmix_pmix1xx_CPPFLAGS])
|
|
fi
|
|
|
|
AC_DEFINE_UNQUOTED([PMIX_PMIX1XX_PMIX_VERSION],
|
|
["$PMIX_VERSION"],
|
|
[Version of PMIx])
|
|
|
|
# Finally, add some flags to the wrapper compiler if we're
|
|
# building with developer headers so that our headers can
|
|
# be found.
|
|
pmix1xx_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/$opal_pmix_pmix1xx_basedir/pmix -I${includedir}/openmpi/$opal_pmix_pmix1xx_basedir/pmix/include'
|
|
|
|
CFLAGS=$opal_pmix_pmix1xx_save_CFLAGS
|
|
CPPFLAGS=$opal_pmix_pmix1xx_save_CPPFLAGS
|
|
LDFLAGS=$opal_pmix_pmix1xx_save_LDFLAGS
|
|
LIBS=$opal_pmix_pmix1xx_save_LIBS
|
|
|
|
AS_IF([test $opal_pmix_pmix1xx_happy -eq 1],
|
|
[$1],
|
|
[$2])
|
|
|
|
OPAL_VAR_SCOPE_POP
|
|
])dnl
|