bd9265c560
A few changes were required to support this move: 1. the PMI component used to identify rte-related data (e.g., host name, bind level) and package them as a unit to reduce the number of PMI keys. This code was moved up to the ORTE layer as the OPAL layer has no understanding of these concepts. In addition, the component locally stored data based on process jobid/vpid - this could no longer be supported (see below for the solution). 2. the hash component was updated to use the new opal_identifier_t instead of orte_process_name_t as its index for storing data in the hash tables. Previously, we did a hash on the vpid and stored the data in a 32-bit hash table. In the revised system, we don't see a separate "vpid" field - we only have a 64-bit opaque value. The orte_process_name_t hash turned out to do nothing useful, so we now store the data in a 64-bit hash table. Preliminary tests didn't show any identifiable change in behavior or performance, but we'll have to see if a move back to the 32-bit table is required at some later time. 3. the db framework was a "select one" system. However, since the PMI component could no longer use its internal storage system, the framework has now been changed to a "select many" mode of operation. This allows the hash component to handle all internal storage, while the PMI component only handles pushing/pulling things from the PMI system. This was something we had planned for some time - when fetching data, we first check internal storage to see if we already have it, and then automatically go to the global system to look for it if we don't. Accordingly, the framework was provided with a custom query function used during "select" that lets you seperately specify the "store" and "fetch" ordering. 4. the ORTE grpcomm and ess/pmi components, and the nidmap code, were updated to work with the new db framework and to specify internal/global storage options. No changes were made to the MPI layer, except for modifying the ORTE component of the OMPI/rte framework to support the new db framework. This commit was SVN r28112.
130 строки
5.9 KiB
Bash
130 строки
5.9 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) 2009-2011 Cisco Systems, Inc. All rights reserved.
|
|
# Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
|
|
# reserved.
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# OPAL_CHECK_PMI(prefix, [action-if-found], [action-if-not-found])
|
|
# --------------------------------------------------------
|
|
AC_DEFUN([OPAL_CHECK_PMI],[
|
|
AC_ARG_WITH([pmi],
|
|
[AC_HELP_STRING([--with-pmi],
|
|
[Build PMI support (default: no)])],
|
|
[], with_pmi=no)
|
|
AC_ARG_WITH([cray-pmi2-ext],
|
|
[AC_HELP_STRING([--with-cray-pmi-ext],
|
|
[Include Cray PMI2 extensions (default: no)])],
|
|
[], with_cray_pmi2_ext=no)
|
|
|
|
opal_enable_pmi=0
|
|
opal_use_cray_pmi2_ext=0
|
|
|
|
# save flags
|
|
opal_check_pmi_$1_save_CPPFLAGS="$CPPFLAGS"
|
|
opal_check_pmi_$1_save_LDFLAGS="$LDFLAGS"
|
|
opal_check_pmi_$1_save_LIBS="$LIBS"
|
|
|
|
# set defaults
|
|
opal_check_pmi_$1_LDFLAGS=
|
|
opal_check_pmi_$1_CPPFLAGS=
|
|
opal_check_pmi_$1_LIBS=
|
|
|
|
AC_MSG_CHECKING([if user requested PMI support])
|
|
AS_IF([test "$with_pmi" = "no"],
|
|
[AC_MSG_RESULT([no])
|
|
opal_use_cray_pmi2_ext=0
|
|
$3],
|
|
[AC_MSG_RESULT([yes])
|
|
AC_MSG_CHECKING([if PMI support installed])
|
|
# cannot use OMPI_CHECK_PACKAGE as its backend header
|
|
# support appends "include" to the path, which won't
|
|
# work with slurm :-(
|
|
AS_IF([test ! -z "$with_pmi" -a "$with_pmi" != "yes"],
|
|
[AS_IF([test -d "$with_pmi/lib64"],
|
|
[opal_check_pmi_$1_LDFLAGS="-L$with_pmi/lib64"
|
|
opal_check_pmi_$1_LIBS="-lpmi -Wl,-rpath=$with_pmi/lib64"],
|
|
[opal_check_pmi_$1_LDFLAGS="-L$with_pmi/lib"
|
|
opal_check_pmi_$1_LIBS="-lpmi -Wl,-rpath=$with_pmi/lib"])
|
|
AS_IF([test -f "$with_pmi/include/pmi.h"],
|
|
[opal_check_pmi_$1_CPPFLAGS="-I$with_pmi/include"],
|
|
[AS_IF([test -f "$with_pmi/include/slurm/pmi.h"],
|
|
[opal_check_pmi_$1_CPPFLAGS="-I$with_pmi/include/slurm"],
|
|
[AC_MSG_RESULT([not found])
|
|
AC_MSG_WARN([PMI support requested (via --with-pmi) but pmi.h])
|
|
AC_MSG_WARN([not found under locations:])
|
|
AC_MSG_WARN([ $with_pmi/include])
|
|
AC_MSG_WARN([ $with_pmi/include/slurm])
|
|
AC_MSG_WARN([Specified path: $with_pmi])
|
|
AC_MSG_ERROR([Aborting])
|
|
$3])])],
|
|
[AS_IF([test -f "/usr/include/slurm/pmi.h"],
|
|
[opal_check_pmi_$1_CPPFLAGS="-I/usr/include/slurm"])])
|
|
|
|
LDFLAGS="$LDFLAGS $opal_check_pmi_$1_LDFLAGS"
|
|
CPPFLAGS="$CPPFLAGS $opal_check_pmi_$1_CPPFLAGS"
|
|
LIBS="$LIBS $opal_check_pmi_$1_LIBS"
|
|
opal_have_pmi_support=no
|
|
AC_CHECK_HEADERS([pmi.h],
|
|
[AC_CHECK_LIB([pmi], [PMI_Init],
|
|
[opal_have_pmi_support=yes])])
|
|
|
|
AS_IF([test "$opal_have_pmi_support" = "yes"],
|
|
[AC_MSG_RESULT([yes])
|
|
opal_enable_pmi=1
|
|
$1_LDFLAGS="$opal_check_pmi_$1_LDFLAGS"
|
|
$1_CPPFLAGS="$opal_check_pmi_$1_CPPFLAGS"
|
|
$1_LIBS="-lpmi"
|
|
$2],
|
|
[AC_MSG_RESULT([no])
|
|
AC_MSG_WARN([PMI support requested (via --with-pmi) but not found.])
|
|
AC_MSG_ERROR([Aborting.])
|
|
$3])
|
|
|
|
AC_MSG_CHECKING([if user requested Cray PMI2 extensions])
|
|
AS_IF([test "$with_cray_pmi2_ext" = "no"],
|
|
[AC_MSG_RESULT([no])
|
|
opal_use_pmi2_ext=0],
|
|
[AC_MSG_RESULT([yes])
|
|
# check to see if pmi2.h header is present. if it is, then we
|
|
# will use some of the functions in it.
|
|
AC_MSG_CHECKING([if PMI2 extensions installed])
|
|
AS_IF([test -f "$with_pmi/include/pmi2.h"],
|
|
[opal_use_pmi2_ext=1
|
|
AC_MSG_RESULT(yes)],
|
|
[AC_MSG_RESULT([no])
|
|
AC_MSG_WARN([PMI2 extensions requested (via --with-cray-pmi2-ext) but not found.])
|
|
AC_MSG_ERROR([Aborting.])
|
|
opal_use_pmi2_ext=0
|
|
opal_enable_pmi=0
|
|
$3])])])
|
|
|
|
# restore flags - have to add CPPFLAGS so base functions can find pmi.h
|
|
CPPFLAGS="$opal_check_pmi_$1_save_CPPFLAGS $opal_check_pmi_$1_CPPFLAGS"
|
|
LDFLAGS="$opal_check_pmi_$1_save_LDFLAGS"
|
|
LIBS="$opal_check_pmi_$1_save_LIBS"
|
|
|
|
AC_DEFINE_UNQUOTED([WANT_PMI_SUPPORT],
|
|
[$opal_enable_pmi],
|
|
[Whether we want PMI support])
|
|
AC_DEFINE_UNQUOTED([WANT_CRAY_PMI2_EXT],
|
|
[$opal_use_pmi2_ext],
|
|
[Whether we want to use Cray PMI2 extensions])
|
|
AM_CONDITIONAL(WANT_PMI_SUPPORT, [test "$opal_enable_pmi" = 1])
|
|
])
|