ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность
19a2dbb04f
openmpi/config/opal_check_pmi.m4

255 строки
11 KiB
Plaintext
Исходник Обычный вид История

Correct some typos in Cray PMI detection
2014-10-14 20:28:36 +04:00
# -*- shell-script ; indent-tabs-mode:nil -*-
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
#
# 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.
update ess alps configuration file to include CNOS and PMI checks. some of the features committed here aren't being used, but they will be. also update orte_check_pmi.m4 to include missing call to action-if-not-found if --with-pmi is not specified or is disabled. This commit was SVN r25422.
2011-11-03 06:14:47 +04:00
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
opal_check_pmi: protect un-prefixed shell variables Since there's unfortunately only a global namespace for shell variables, we need to protect un-prefixed shell variables with OPAL_VAR_SCOPE_PUSH/POP.
2015-03-13 14:48:31 +03:00
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
Modify Cray PMI check to detect PMI on older systems
2014-10-10 02:25:26 +04:00
# Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# reserved.
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
pmix/external: revamp external pmix package detection
2016-05-02 10:23:31 +03:00
# Copyright (c) 2014-2016 Research Organization for Information Science
configury: fix a typo in config/opal_check_pmi.m4
2014-10-24 08:31:36 +04:00
# and Technology (RIST). All rights reserved.
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
# Copyright (c) 2016 IBM Corporation. All rights reserved.
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# $COPYRIGHT$
update ess alps configuration file to include CNOS and PMI checks. some of the features committed here aren't being used, but they will be. also update orte_check_pmi.m4 to include missing call to action-if-not-found if --with-pmi is not specified or is disabled. This commit was SVN r25422.
2011-11-03 06:14:47 +04:00
#
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# Additional copyrights may follow
update ess alps configuration file to include CNOS and PMI checks. some of the features committed here aren't being used, but they will be. also update orte_check_pmi.m4 to include missing call to action-if-not-found if --with-pmi is not specified or is disabled. This commit was SVN r25422.
2011-11-03 06:14:47 +04:00
#
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# $HEADER$
#
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
# define an internal function for checking the existence
# and validity of a PMI library
#
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
# OPAL_CHECK_PMI_LIB(installdir, libdir, pmi, function, [action-if-slurm], [action-if-valid], [action-if-not-valid])
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
# --------------------------------------------------------
AC_DEFUN([OPAL_CHECK_PMI_LIB],
[
# save flags
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
opal_check_$3_save_CPPFLAGS=$CPPFLAGS
opal_check_$3_save_LDFLAGS=$LDFLAGS
opal_check_$3_save_LIBS=$LIBS
opal_check_$3_hdr_happy=
opal_check_$3_mycppflags=
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
# check for the header
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_MSG_CHECKING([for $3.h in $1/include])
AS_IF([test -f $1/include/$3.h],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[AC_MSG_RESULT([found])
Fix PMI and PMI2 builds
2015-08-11 18:43:45 +03:00
opal_check_$3_mycppflags="-I$1/include"],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[AC_MSG_RESULT([not found])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_MSG_CHECKING([for $3.h in $1/include/slurm])
AS_IF([test -f $1/include/slurm/$3.h],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[AC_MSG_RESULT([found])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
opal_check_$3_mycppflags="-I$1/include/slurm"
$5],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[AC_MSG_RESULT([not found])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
opal_check_$3_hdr_happy=no])])
AS_IF([test "$opal_check_$3_hdr_happy" != "no"],
[CPPFLAGS="$CPPFLAGS $opal_check_$3_mycppflags"
AC_CHECK_HEADER([$3.h],
[opal_check_$3_hdr_happy=yes
$3_CPPFLAGS="$opal_check_$3_mycppflags"],
[opal_check_$3_hdr_happy=no])])
# check for library and function
opal_check_$3_lib_happy=
LIBS="$LIBS -l$3"
# check for the library in the given location in case
# an exact path was given
AC_MSG_CHECKING([for lib$3 in $2])
files=`ls $2/lib$3.* 2> /dev/null | wc -l`
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
AS_IF([test "$files" -gt "0"],
[AC_MSG_RESULT([found])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
LDFLAGS="$LDFLAGS -L$2"
AC_CHECK_LIB([$3], [$4],
[opal_check_$3_lib_happy=yes
$3_LDFLAGS=-L$2
$3_rpath=$2],
[opal_check_$3_lib_happy=no])],
[opal_check_$3_lib_happy=no
AC_MSG_RESULT([not found])])
Purge whitespace from the repo
2015-06-24 06:59:57 +03:00
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
# check for presence of lib64 directory - if found, see if the
# desired library is present and matches our build requirements
files=`ls $2/lib64/lib$3.* 2> /dev/null | wc -l`
AS_IF([test "$opal_check_$3_lib_happy" != "yes"],
[AC_MSG_CHECKING([for lib$3 in $2/lib64])
AS_IF([test "$files" -gt "0"],
[AC_MSG_RESULT([found])
LDFLAGS="$LDFLAGS -L$2/lib64"
AC_CHECK_LIB([$3], [$4],
[opal_check_$3_lib_happy=yes
$3_LDFLAGS=-L$2/lib64
$3_rpath=$2/lib64],
[opal_check_$3_lib_happy=no])],
[opal_check_$3_lib_happy=no
AC_MSG_RESULT([not found])])])
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
# if we didn't find lib64, or the library wasn't present or correct,
# then try a lib directory if present
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
files=`ls $2/lib/lib$3.* 2> /dev/null | wc -l`
AS_IF([test "$opal_check_$3_lib_happy" != "yes"],
[AC_MSG_CHECKING([for lib$3 in $2/lib])
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
AS_IF([test "$files" -gt "0"],
[AC_MSG_RESULT([found])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
LDFLAGS="$LDFLAGS -L$2/lib"
AC_CHECK_LIB([$3], [$4],
[opal_check_$3_lib_happy=yes
$3_LDFLAGS=-L$2/lib
$3_rpath=$2/lib],
[opal_check_$3_lib_happy=no])],
[opal_check_$3_lib_happy=no
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
AC_MSG_RESULT([not found])])])
# restore flags
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
CPPFLAGS=$opal_check_$3_save_CPPFLAGS
LDFLAGS=$opal_check_$3_save_LDFLAGS
LIBS=$opal_check_$3_save_LIBS
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AS_IF([test "$opal_check_$3_hdr_happy" = "yes" && test "$opal_check_$3_lib_happy" = "yes"],
[$6], [$7])
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
])
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
# OPAL_CHECK_PMI()
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
# --------------------------------------------------------
Per the meeting on moving the BTLs to OPAL, move the ORTE database "db" framework to OPAL so the relocated BTLs can access it. Because the data is indexed by process, this requires that we define a new "opal_identifier_t" that corresponds to the orte_process_name_t struct. In order to support multiple run-times, this is defined in opal/mca/db/db_types.h as a uint64_t without identifying the meaning of any part of that data. 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.
2013-02-26 21:50:04 +04:00
AC_DEFUN([OPAL_CHECK_PMI],[
opal_check_pmi: protect un-prefixed shell variables Since there's unfortunately only a global namespace for shell variables, we need to protect un-prefixed shell variables with OPAL_VAR_SCOPE_PUSH/POP.
2015-03-13 14:48:31 +03:00
OPAL_VAR_SCOPE_PUSH([check_pmi_install_dir check_pmi_lib_dir default_pmi_loc default_pmi_libloc slurm_pmi_found])
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
AC_ARG_WITH([pmi],
Make clear that --with-pmi can/should be used to specify the path to the pmi installation since at least one person didn't realize it. cmr=v1.7.4:reviewer=jsquyres This commit was SVN r30439.
2014-01-28 02:50:37 +04:00
[AC_HELP_STRING([--with-pmi(=DIR)],
[Build PMI support, optionally adding DIR to the search path (default: no)])],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[], with_pmi=no)
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_ARG_WITH([pmi-libdir],
[AC_HELP_STRING([--with-pmi-libdir(=DIR)],
[Look for libpmi or libpmi2 in the given directory, DIR/lib or DIR/lib64])])
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
check_pmi_install_dir=
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
check_pmi_lib_dir=
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
default_pmi_loc=
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
default_pmi_libloc=
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
slurm_pmi_found=
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
AC_MSG_CHECKING([if user requested PMI support])
Cleanup the PMI m4 syntax with respect to -a, and look for libpmi* so we can pickup both .a, .la, and whatever other extensions that particular system might use.
2014-10-10 01:00:40 +04:00
AS_IF([test "$with_pmi" = "no"],
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
[AC_MSG_RESULT([no])
update ess alps configuration file to include CNOS and PMI checks. some of the features committed here aren't being used, but they will be. also update orte_check_pmi.m4 to include missing call to action-if-not-found if --with-pmi is not specified or is disabled. This commit was SVN r25422.
2011-11-03 06:14:47 +04:00
$3],
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
[AC_MSG_RESULT([yes])
First stage of RFC to rename OMPI_foo build system support: change OMPI_CHECK_PACKAGE -> OPAL_CHECK_PACKAGE This commit was SVN r31582.
2014-05-01 18:24:56 +04:00
# cannot use OPAL_CHECK_PACKAGE as its backend header
Complete the PMI support. Generalize PMI operations to support both slurm and non-slurm environments. Correct some configuration issues - we really only want the PMI integration at the individual component level. Ensure that the pmi grpcomm component doesn't get selected when launching via mpirun by setting its priority below the bad component. Only verified in a slurm environment as that's all I have access to... This commit was SVN r25275.
2011-10-13 00:59:25 +04:00
# support appends "include" to the path, which won't
# work with slurm :-(
Cleanup the PMI m4 syntax with respect to -a, and look for libpmi* so we can pickup both .a, .la, and whatever other extensions that particular system might use.
2014-10-10 01:00:40 +04:00
AS_IF([test ! -z "$with_pmi" && test "$with_pmi" != "yes"],
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
[check_pmi_install_dir=$with_pmi
default_pmi_loc=no],
[check_pmi_install_dir=/usr
default_pmi_loc=yes])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AS_IF([test ! -z "$with_pmi_libdir"],
[check_pmi_lib_dir=$with_pmi_libdir
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
default_pmi_libloc=no],
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
[check_pmi_lib_dir=$check_pmi_install_dir
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
AS_IF([test "$default_pmi_loc" = "no"],
[default_pmi_libloc=no],
[default_pmi_libloc=yes])])
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
Update the PMI configure logic to handle the oddball case where both lib and lib64 may exist, and the required files may be in one or the other of them.
2014-10-07 21:18:59 +04:00
# check for pmi-1 lib */
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
slurm_pmi_found=no
OPAL_CHECK_PMI_LIB([$check_pmi_install_dir],
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
[$check_pmi_lib_dir],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[pmi], [PMI_Init],
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
[slurm_pmi_found=yes],
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
[opal_enable_pmi1=yes
opal_pmi1_LIBS="-lpmi"
AC_SUBST(opal_pmi1_LIBS)],
[opal_enable_pmi1=no])
AS_IF([test "$opal_enable_pmi1" = "yes"],
[AS_IF([test "$default_pmi_loc" = "no" || test "$slurm_pmi_found" = "yes"],
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
[opal_pmi1_CPPFLAGS="$pmi_CPPFLAGS"
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_SUBST(opal_pmi1_CPPFLAGS)])
AS_IF([test "$default_pmi_libloc" = "no" || test "$slurm_pmi_found" = "yes"],
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
[opal_pmi1_LDFLAGS="$pmi_LDFLAGS"
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
AC_SUBST(opal_pmi1_LDFLAGS)
opal_pmi1_rpath="$pmi_rpath"
AC_SUBST(opal_pmi1_rpath)])])
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
Update the PMI configure logic to handle the oddball case where both lib and lib64 may exist, and the required files may be in one or the other of them.
2014-10-07 21:18:59 +04:00
# check for pmi2 lib */
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
slurm_pmi_found=no
OPAL_CHECK_PMI_LIB([$check_pmi_install_dir],
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
[$check_pmi_lib_dir],
Refactor the PMI configure check logic to be a lot cleaner and simpler.
2014-10-24 05:35:18 +04:00
[pmi2], [PMI2_Init],
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
[slurm_pmi_found=yes],
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
[opal_enable_pmi2=yes
opal_pmi2_LIBS="-lpmi2"
AC_SUBST(opal_pmi2_LIBS)],
[opal_enable_pmi2=no])
AS_IF([test "$opal_enable_pmi2" = "yes"],
[AS_IF([test "$default_pmi_loc" = "no" || test "$slurm_pmi_found" = "yes"],
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
[opal_pmi2_CPPFLAGS="$pmi2_CPPFLAGS"
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_SUBST(opal_pmi2_CPPFLAGS)])
AS_IF([test "$default_pmi_libloc" = "no" || test "$slurm_pmi_found" = "yes"],
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
[opal_pmi2_LDFLAGS="$pmi2_LDFLAGS"
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
AC_SUBST(opal_pmi2_LDFLAGS)
Fix PMI and PMI2 builds
2015-08-11 18:43:45 +03:00
opal_pmi2_rpath="$pmi2_rpath"
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
AC_SUBST(opal_pmi2_rpath)])])
opal_check_pmi.m4: trivial whitespace cleanup; no code changes
2014-11-01 14:02:23 +03:00
Update the PMI configure logic to handle the oddball case where both lib and lib64 may exist, and the required files may be in one or the other of them.
2014-10-07 21:18:59 +04:00
# since support was explicitly requested, then we should error out
# if we didn't find the required support
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
AC_MSG_CHECKING([can PMI support be built])
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
AS_IF([test "$opal_enable_pmi1" != "yes" && test "$opal_enable_pmi2" != "yes"],
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
[AC_MSG_RESULT([no])
AC_MSG_WARN([PMI support requested (via --with-pmi) but neither pmi.h])
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
AC_MSG_WARN([nor pmi2.h were found under locations:])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_MSG_WARN([ $check_pmi_install_dir])
AC_MSG_WARN([ $check_pmi_install_dir/slurm])
Update the PMI configure logic to handle the oddball case where both lib and lib64 may exist, and the required files may be in one or the other of them.
2014-10-07 21:18:59 +04:00
AC_MSG_WARN([Specified path: $with_pmi])
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
AC_MSG_WARN([OR neither libpmi nor libpmi2 were found under:])
Update the PMI configury to support addition of --with-pmi-libdir option for environments that install the PMI libs in a non-default location
2015-02-27 21:48:28 +03:00
AC_MSG_WARN([ $check_pmi_lib_dir/lib])
AC_MSG_WARN([ $check_pmi_lib_dir/lib64])
AC_MSG_WARN([Specified path: $with_pmi_libdir])
Continue cleanup of the PMI config code. Eliminate the multiple calls to check for pmi1 and pmi2 - we must check it only once to get the pmix components to build only in the correct situations. Ensure we set the wrapper flags so we handle static builds correctly.
2014-10-27 23:24:52 +03:00
AC_MSG_ERROR([Aborting])],
[AC_MSG_RESULT([yes])])
Add 'generic' support for PMI2 (previously, we checked for PMI2 only on Cray systems.) If your resource manager (e.g. SLURM) has support for PMI2, then the --with-pmi configure flag will enable its usage. If you don't have PMI2, then you will fallback to regular old PMI1. This patch was submitted by Ralph Castain and reviewed and pushed by Josh Ladd. This should be added to cmr:v1.7:reviewer=jladd This commit was SVN r28666.
2013-06-21 19:28:14 +04:00
])
opal_check_pmi: protect un-prefixed shell variables Since there's unfortunately only a global namespace for shell variables, we need to protect un-prefixed shell variables with OPAL_VAR_SCOPE_PUSH/POP.
2015-03-13 14:48:31 +03:00
OPAL_VAR_SCOPE_POP
first cut at general pmi check This commit was SVN r25234.
2011-10-05 21:14:24 +04:00
])
Modify Cray PMI check to detect PMI on older systems
2014-10-10 02:25:26 +04:00
Create the pmix external component. Fix a few places where opal/util/argv.h were required when building with an external pmix (go figure). NOTE: Building with external pmix *requires* that you also build with external libevent and hwloc libraries. Detect this at configure and error out with large message if this requirement is violated. Closes #1204 (replaces it) Fixes #1064
2015-12-16 02:26:13 +03:00
AC_DEFUN([OPAL_CHECK_PMIX],[
configury: use --with-pmix option instead of --with-external-pmix
2015-12-28 11:25:41 +03:00
AC_ARG_WITH([pmix],
[AC_HELP_STRING([--with-pmix(=DIR)],
[Build PMIx support. DIR can take one of three values: "internal", "external", or a valid directory name. "internal" (or no DIR value) forces Open MPI to use its internal copy of PMIx. "external" forces Open MPI to use an external installation of PMIx. Supplying a valid directory name also forces Open MPI to use an external installation of PMIx, and adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries. Note that Open MPI does not support --without-pmix.])])
AS_IF([test "$with_pmix" = "no"],
[AC_MSG_WARN([Open MPI requires PMIx support. It can be built])
AC_MSG_WARN([with either its own internal copy of PMIx, or with])
AC_MSG_WARN([an external copy that you supply.])
AC_MSG_ERROR([Cannot continue])])
Ensure we fail to configure if external PMIx was requested and is not found.
2016-05-11 17:59:05 +03:00
AC_MSG_CHECKING([if user requested external PMIx support($with_pmix)])
Fix typo
2015-12-29 18:04:28 +03:00
AS_IF([test -z "$with_pmix" || test "$with_pmix" = "yes" || test "$with_pmix" = "internal"],
Create the pmix external component. Fix a few places where opal/util/argv.h were required when building with an external pmix (go figure). NOTE: Building with external pmix *requires* that you also build with external libevent and hwloc libraries. Detect this at configure and error out with large message if this requirement is violated. Closes #1204 (replaces it) Fixes #1064
2015-12-16 02:26:13 +03:00
[AC_MSG_RESULT([no])
Split the pmix external component into one for the 1.1.4 release, and another for the upcoming 2.0 release. Clean up the configury so the components look for a series-specific function instead of running a program. NOTE: the changes for the 2.0 series are not yet in the PMIx master.
2016-06-02 00:15:24 +03:00
opal_external_pmix_happy=no],
Create the pmix external component. Fix a few places where opal/util/argv.h were required when building with an external pmix (go figure). NOTE: Building with external pmix *requires* that you also build with external libevent and hwloc libraries. Detect this at configure and error out with large message if this requirement is violated. Closes #1204 (replaces it) Fixes #1064
2015-12-16 02:26:13 +03:00
[AC_MSG_RESULT([yes])
# check for external pmix lib */
configury: use --with-pmix option instead of --with-external-pmix
2015-12-28 11:25:41 +03:00
AS_IF([test "$with_pmix" = "external"],
Create the pmix external component. Fix a few places where opal/util/argv.h were required when building with an external pmix (go figure). NOTE: Building with external pmix *requires* that you also build with external libevent and hwloc libraries. Detect this at configure and error out with large message if this requirement is violated. Closes #1204 (replaces it) Fixes #1064
2015-12-16 02:26:13 +03:00
[pmix_ext_install_dir=/usr],
configury: use --with-pmix option instead of --with-external-pmix
2015-12-28 11:25:41 +03:00
[pmix_ext_install_dir=$with_pmix])
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
# Make sure we have the headers and libs in the correct location
OPAL_CHECK_WITHDIR([external-pmix], [$pmix_ext_install_dir/include], [pmix.h])
OPAL_CHECK_WITHDIR([external-libpmix], [$pmix_ext_install_dir/lib], [libpmix.*])
Split the pmix external component into one for the 1.1.4 release, and another for the upcoming 2.0 release. Clean up the configury so the components look for a series-specific function instead of running a program. NOTE: the changes for the 2.0 series are not yet in the PMIx master.
2016-06-02 00:15:24 +03:00
opal_external_pmix_happy=yes])
Stealing some pieces of Josh Hursey's PR #1583 and modifying a bit, allow the opal/pmix external component to handle both PMIx 1.1.4 and PMIx 2.0 versions. Automatically detect the version of the target external library and adjust the only two APIs that changed (PMIx_Init and PMIx_Finalize) Rename temp vars in .m4 to avoid conflict with Travis
2016-05-27 06:53:32 +03:00
Create the pmix external component. Fix a few places where opal/util/argv.h were required when building with an external pmix (go figure). NOTE: Building with external pmix *requires* that you also build with external libevent and hwloc libraries. Detect this at configure and error out with large message if this requirement is violated. Closes #1204 (replaces it) Fixes #1064
2015-12-16 02:26:13 +03:00
])
Копировать постоянную ссылку