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

Fix bugs in PMI configure: set correct include path, fix test command with multiple conditions.

Просмотр исходного кода
Этот коммит содержится в:
Nadezhda Kogteva 2014-10-09 17:23:56 +03:00
родитель b937b31693
Коммит ffa8674e01
1 изменённых файлов: 30 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

63
config/opal_check_pmi.m4
Просмотреть файл

@ -50,8 +50,7 @@ AC_DEFUN([OPAL_CHECK_PMI],[
opal_pmi_rpath=
opal_have_pmi2=0
opal_have_pmi1=0
opal_check_pmi_incdir=
opal_check_pmi_libdir=
opal_check_pmi_install_dir=
opal_default_loc=0
opal_pmi_added_cppflag=no
opal_pmi_added_ldflag=no
@ -67,7 +66,7 @@ AC_DEFUN([OPAL_CHECK_PMI],[
opal_check_pmi_$1_LIBS=
AC_MSG_CHECKING([if user requested PMI support])
AS_IF([test "$with_pmi" = "no"],
AS_IF([test "$with_pmi" == "no"],
[AC_MSG_RESULT([no])
$3],
[AC_MSG_RESULT([yes])
@ -76,70 +75,68 @@ AC_DEFUN([OPAL_CHECK_PMI],[
# support appends "include" to the path, which won't
# work with slurm :-(
AS_IF([test ! -z "$with_pmi" -a "$with_pmi" != "yes"],
[opal_check_pmi_incdir=$with_pmi
opal_check_pmi_libdir=$with_pmi
[opal_check_pmi_install_dir=$with_pmi
opal_default_loc="no"],
[opal_check_pmi_incdir="/usr/include"
opal_check_pmi_libdir="/usr"
[opal_check_pmi_install_dir="/usr"
opal_default_loc="yes"])
# check for pmi-1 lib */
AS_IF([test -f "$opal_check_pmi_libdir/lib64/libpmi.so"],
AS_IF([test -f "$opal_check_pmi_install_dir/lib64/libpmi.so"],
[opal_have_pmi1=1
AS_IF([test "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_libdir/lib64"
opal_pmi_rpath="$opal_check_pmi_libdir/lib64"
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_install_dir/lib64"
opal_pmi_rpath="$opal_check_pmi_install_dir/lib64"
opal_pmi_added_ldflag=yes])
opal_check_pmi_$1_LIBS="-lpmi"],
[AS_IF([test -f "$opal_check_pmi_libdir/lib/libpmi.so"],
[AS_IF([test -f "$opal_check_pmi_install_dir/lib/libpmi.so"],
[opal_have_pmi1=1
AS_IF([test "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_libdir/lib"
opal_pmi_rpath="$opal_check_pmi_libdir/lib"
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_install_dir/lib"
opal_pmi_rpath="$opal_check_pmi_install_dir/lib"
opal_pmi_added_ldflag=yes])
opal_check_pmi_$1_LIBS="-lpmi"])])
# check for pmi.h
AS_IF([test -f "$opal_check_pmi_incdir/include/pmi.h"],
AS_IF([test -f "$opal_check_pmi_install_dir/include/pmi.h"],
[AS_IF([test "$opal_default_loc" == "no"],
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_incdir/include"
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_install_dir/include"
opal_pmi_added_cppflag=yes])],
# this could be SLURM, which puts things in a different location
[AS_IF([test -f "$opal_check_pmi_incdir/include/slurm/pmi.h"],
[AS_IF([test -f "$opal_check_pmi_install_dir/include/slurm/pmi.h"],
# even if this was the default loc, we still need to add it in
# because of the slurm path addition
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_incdir/include/slurm"
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_install_dir/include/slurm"
opal_pmi_added_cppflag=yes])])
# check for pmi2 lib */
AS_IF([test -f "$opal_check_pmi_libdir/lib64/libpmi2.so"],
AS_IF([test -f "$opal_check_pmi_install_dir/lib64/libpmi2.so"],
[opal_have_pmi2=1
AS_IF([test "$opal_pmi_added_ldflag" != "yes" && "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="$-L$opal_check_pmi_libdir/lib64"
opal_pmi_rpath="$opal_check_pmi_libdir/lib64"])
AS_IF([test "$opal_pmi_added_ldflag" != "yes" -a "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_install_dir/lib64"
opal_pmi_rpath="$opal_check_pmi_install_dir/lib64"])
opal_check_pmi_$1_LIBS="$opal_check_pmi_$1_LIBS -lpmi2"],
[AS_IF([test -f "$opal_check_pmi_libdir/lib/libpmi2.so"],
[AS_IF([test -f "$opal_check_pmi_install_dir/lib/libpmi2.so"],
[opal_have_pmi2=1
AS_IF([test "$opal_pmi_added_ldflag" != "yes" && "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="$-L$opal_check_pmi_libdir/lib"
opal_pmi_rpath="$opal_check_pmi_libdir/lib"])
AS_IF([test "$opal_pmi_added_ldflag" != "yes" -a "$opal_default_loc" == "no"],
[opal_check_pmi_$1_LDFLAGS="-L$opal_check_pmi_install_dir/lib"
opal_pmi_rpath="$opal_check_pmi_install_dir/lib"])
opal_check_pmi_$1_LIBS="$opal_check_pmi_$1_LIBS -lpmi2"])])
# check for pmi2.h
AS_IF([test -f "$opal_check_pmi_incdir/include/pmi2.h"],
[AS_IF([test "$opal_pmi_added_cppflag" != "yes" && "$opal_default_loc" == "no"],
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_incdir/include"])],
AS_IF([test -f "$opal_check_pmi_install_dir/include/pmi2.h"],
[AS_IF([test "$opal_pmi_added_cppflag" != "yes" -a "$opal_default_loc" == "no"],
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_install_dir/include"])],
# this could be SLURM, which puts things in a different location
[AS_IF([test -f "$opal_check_pmi_incdir/include/slurm/pmi2.h"],
[AS_IF([test -f "$opal_check_pmi_install_dir/include/slurm/pmi2.h"],
# even if this was the default loc, we still need to add it in
# because of the slurm path addition
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_incdir/include/slurm"])])
[opal_check_pmi_$1_CPPFLAGS="-I$opal_check_pmi_install_dir/include/slurm"])])
# since support was explicitly requested, then we should error out
# if we didn't find the required support
AS_IF([test $opal_have_pmi1 != 1 && $opal_have_pmi2 != 1],
AS_IF([test $opal_have_pmi1 != 1 -a $opal_have_pmi2 != 1],
[AC_MSG_RESULT([not found])
AC_MSG_WARN([PMI support requested (via --with-pmi) but neither libpmi])
AC_MSG_WARN([nor libpmi2 were found under locations:])
AC_MSG_WARN([ $opal_check_pmi_libdir/lib])
AC_MSG_WARN([ $opal_check_pmi_libdir/lib64])
AC_MSG_WARN([ $opal_check_pmi_install_dir/lib])
AC_MSG_WARN([ $opal_check_pmi_install_dir/lib64])
AC_MSG_WARN([Specified path: $with_pmi])
AC_MSG_ERROR([Aborting])
$3],