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

* Make the format of the --with-BTL options the same for all the BTLs

Просмотр исходного кода 
* Make sure --without-BTL works for all BTLs
* Fix copy-n-paste error in aix timer configrue help string

This should go to the v1.0 branch

This commit was SVN r8554.
Этот коммит содержится в:
Brian Barrett 2005-12-20 00:47:36 +00:00
родитель d3ed56e845
Коммит 08799e4a48
5 изменённых файлов: 136 добавлений и 136 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -122,12 +122,12 @@ AC_DEFUN([_OMPI_CHECK_GM_CONFIG],[
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_GM],[
AC_ARG_WITH([gm],
[AC_HELP_STRING([--with-gm=GM_DIR],
[Additional directory to search for GM installation])])
[AC_HELP_STRING([--with-gm(=DIR)],
[Build GM (Myrinet) support, searching for libraries in DIR])])
AC_ARG_WITH([gm-libdir],
[AC_HELP_STRING([--with-gm-libdir=GMLIBDIR],
[directory where the GM library can be found, if it is not in GM_DIR/lib or GM_DIR/lib64])])
[AC_HELP_STRING([--with-gm-libdir=DIR],
[Search for GM (Myrinet) libraries in DIR/lib and DIR/lib64
in addition to other search paths])])
AS_IF([test "$with_gm" != "no"],
[AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"],

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

@ -25,55 +25,57 @@
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_MVAPI],[
AC_ARG_WITH([mvapi],
[AC_HELP_STRING([--with-mvapi=MVAPI_DIR],
[Additional directory to search for MVAPI installation])])
[AC_HELP_STRING([--with-mvapi(=DIR)],
[Build MVAPI (InfiniBand) support, searching for libraries in DIR])])
AC_ARG_WITH([mvapi-libdir],
[AC_HELP_STRING([--with-mvapi-libdir=IBLIBDIR],
[directory where the IB library can be found, if it is not in MVAPI_DIR/lib or MVAPI_DIR/lib64])])
[AC_HELP_STRING([--with-mvapi-libdir=DIR],
[Search for MVAPI (InfiniBand) libraries in DIR/lib and DIR/lib64
in addition to other search paths])])
AS_IF([test ! -z "$with_mvapi" -a "$with_mvapi" != "yes"],
[ompi_check_mvapi_dir="$with_mvapi"])
AS_IF([test ! -z "$with_mvapi_libdir" -a "$with_mvapi_libdir" != "yes"],
[ompi_check_mvapi_libdir="$with_mvapi_libdir"])
# check for pthreads and emit a warning that things might go south...
AS_IF([test "$HAVE_POSIX_THREADS" != "1"],
[AC_MSG_WARN([POSIX threads not enabled. May not be able to link with mvapi])])
AS_IF([test "$with_mvapi" != "no"],
[ # check for pthreads and emit a warning that
# things might go south...
AS_IF([test "$HAVE_POSIX_THREADS" != "1"],
[AC_MSG_WARN([POSIX threads not enabled. May not be able to link with mvapi])])
ompi_check_mvapi$1_save_CFLAGS="$CFLAGS"
ompi_check_mvapi$1_save_CPPFLAGS="$CPPFLAGS"
# ugly hack for topspin which stores include files in include/vapi
AS_IF([test -d "$ompi_check_mvapi_dir/include/vapi"],
[CPPFLAGS="$CPPFLAGS -I $ompi_check_mvapi_dir/include/vapi"
$1_CPPFLAGS="$$1_CPPFLAGS -I $ompi_check_mvapi_dir/include/vapi"])
# some mellanox vapi implemenations only need lvapi and lmosal
OMPI_CHECK_PACKAGE([$1],
[vapi.h],
[vapi],
[VAPI_open_hca],
[-lmosal],
[$ompi_check_mvapi_dir],
[$ompi_check_mvapi_libdir],
[ompi_check_mvapi_happy="yes"],
[ompi_check_mvapi_happy="no"])
ompi_check_mvapi$1_save_CFLAGS="$CFLAGS"
ompi_check_mvapi$1_save_CPPFLAGS="$CPPFLAGS"
#ugly hack for topspin which stores include files in include/vapi
AS_IF([test -d "$ompi_check_mvapi_dir/include/vapi"],
[CPPFLAGS="$CPPFLAGS -I $ompi_check_mvapi_dir/include/vapi"
$1_CPPFLAGS="$$1_CPPFLAGS -I $ompi_check_mvapi_dir/include/vapi"])
#some mellanox vapi implemenations only need lvapi and lmosal
OMPI_CHECK_PACKAGE([$1],
[vapi.h],
[vapi],
[VAPI_open_hca],
[-lmosal],
[$ompi_check_mvapi_dir],
[$ompi_check_mvapi_libdir],
[ompi_check_mvapi_happy="yes"],
[ompi_check_mvapi_happy="no"])
# if needed use both lmpga and lmtl_common
AS_IF([test "$ompi_check_mvapi_happy" = "no"],
[OMPI_CHECK_PACKAGE([$1],
[vapi.h],
[vapi],
[VAPI_open_hca],
[-lmosal -lmpga -lmtl_common],
[$ompi_check_mvapi_dir],
[$ompi_check_mvapi_libdir],
[ompi_check_mvapi_happy="yes"],
[ompi_check_mvapi_happy="no"])])
#if needed use both lmpga and lmtl_common
AS_IF([test "$ompi_check_mvapi_happy" = "no"],
[OMPI_CHECK_PACKAGE([$1],
[vapi.h],
[vapi],
[VAPI_open_hca],
[-lmosal -lmpga -lmtl_common],
[$ompi_check_mvapi_dir],
[$ompi_check_mvapi_libdir],
[ompi_check_mvapi_happy="yes"],
[ompi_check_mvapi_happy="no"])])
CPPFLAGS="$ompi_check_mvapi$1_save_CPPFLAGS"
CPPFLAGS="$ompi_check_mvapi$1_save_CPPFLAGS"],
[ompi_check_mvapi_happy="no"])
AS_IF([test "$ompi_check_mvapi_happy" = "yes"],
[$2],

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

@ -54,11 +54,12 @@ AC_DEFUN([_OMPI_CHECK_MX_CONFIG],[
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_MX],[
AC_ARG_WITH([mx],
[AC_HELP_STRING([--with-mx=MX_DIR],
[Additional directory to search for MX installation])])
[AC_HELP_STRING([--with-mx(=DIR)],
[Build MX (Myrinet Express) support, searching for libraries in DIR])])
AC_ARG_WITH([mx-libdir],
[AC_HELP_STRING([--with-mx-libdir=MXLIBDIR],
[directory where the MX library can be found, if it is not in MX_DIR/lib or MX_DIR/lib64])])
[AC_HELP_STRING([--with-mx-libdir=DIR],
[Search for MX (Myrinet Express) libraries in DIR/lib and DIR/lib64
in addition to other search paths])])
ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS"
ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"

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

@ -25,114 +25,111 @@
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_OPENIB],[
AC_ARG_WITH([openib],
[AC_HELP_STRING([--with-openib=OPENIB_DIR],
[Additional directory to search for OPENIB installation])])
[AC_HELP_STRING([--with-openib(=DIR)],
[Build OpenIB (InfiniBand) support, searching for libraries in DIR])])
AC_ARG_WITH([openib-libdir],
[AC_HELP_STRING([--with-openib-libdir=IBLIBDIR],
[directory where the IB library can be found, if it is not in OPENIB_DIR/lib or OPENIB_DIR/lib64])])
[AC_HELP_STRING([--with-openib-libdir=DIR],
[Search for OpenIB (InfiniBand) libraries in DIR/lib and DIR/lib64
in addition to other search paths])])
AS_IF([test ! -z "$with_openib" -a "$with_openib" != "yes"],
[ompi_check_openib_dir="$with_openib"])
AS_IF([test ! -z "$with_openib_libdir" -a "$with_openib_libdir" != "yes"],
[ompi_check_openib_libdir="$with_openib_libdir"])
AS_IF([test "$with_openib" != "no"],
[ # check for pthreads and emit a warning that things might go south...
AS_IF([test "$HAVE_POSIX_THREADS" != "1"],
[AC_MSG_WARN([POSIX threads not enabled. May not be able to link with OpenIB])])
# check for pthreads and emit a warning that things might go south...
AS_IF([test "$HAVE_POSIX_THREADS" != "1"],
[AC_MSG_WARN([POSIX threads not enabled. May not be able to link with openib])])
ompi_check_openib_$1_save_CPPFLAGS="$CPPFLAGS"
ompi_check_openib_$1_save_LDFLAGS="$LDFLAGS"
ompi_check_openib_$1_save_LIBS="$LIBS"
ompi_check_openib_$1_save_CPPFLAGS="$CPPFLAGS"
ompi_check_openib_$1_save_LDFLAGS="$LDFLAGS"
ompi_check_openib_$1_save_LIBS="$LIBS"
AC_CHECK_LIB(sysfs,
sysfs_open_class,
[ompi_check_openib_sysfs=yes
LIBS="$LIBS -lsysfs"
$1_LIBS="-lsysfs"],
[ompi_check_openib_sysfs=no])
AC_CHECK_LIB([sysfs],
[sysfs_open_class],
[ompi_check_openib_sysfs=yes
LIBS="$LIBS -lsysfs"
$1_LIBS="-lsysfs"],
[ompi_check_openib_sysfs=no])
AS_IF([test "$ompi_check_openib_sysfs" = "yes"],
[$2],
[AS_IF([test ! -z "$with_openib" -a "$with_openib" != "no"],
[AC_MSG_ERROR([OPENIB support requested but required sysfs not found. Aborting])])
$3])
AS_IF([test "$ompi_check_openib_sysfs" != "yes"],
[AS_IF([test ! -z "$with_openib" -a "$with_openib" != "no"],
[AC_MSG_ERROR([OpenIB support requested but required sysfs not found. Aborting])])])
AS_IF([test "$ompi_check_openib_libdir" = ""],
[ompi_check_openib_my_libdir=$ompi_check_openib_dir],
[ompi_check_openib_my_libdir=$ompi_check_openib_libdir])
AS_IF([test "$ompi_check_openib_libdir" = ""],
[ompi_check_openib_my_libdir=$ompi_check_openib_dir],
[ompi_check_openib_my_libdir=$ompi_check_openib_libdir])
AS_IF([test -d "$ompi_check_openib_my_libdir/lib64/infiniband"],
[ompi_check_openib_libflag=" -L$ompi_check_openib_my_libdir/lib64/infiniband"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib64/infiniband"],
[AS_IF([test -d "$ompi_check_openib_my_libdir/lib/infiniband"],
[ompi_check_openib_libflag=" -L$ompi_check_openib_my_libdir/lib/infiniband"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib/infiniband"])])
AS_IF([test -d "$ompi_check_openib_my_libdir/lib64"],
[ompi_check_openib_libflag="$ompi_check_openib_libflag -L$ompi_check_openib_my_libdir/lib64"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib64"],
[AS_IF([test -d "$ompi_check_openib_my_libdir/lib"],
[ompi_check_openib_libflag="$ompi_check_openib_libflag -L$ompi_check_openib_my_libdir/lib"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib"])])
AC_CHECK_LIB([cm], [cm_timeout],
[ompi_check_openib_libdeps="-lcm"]
[ompi_check_openib_libdeps=""])
AS_IF([test -d "$ompi_check_openib_my_libdir/lib64/infiniband"],
[ompi_check_openib_libflag=" -L$ompi_check_openib_my_libdir/lib64/infiniband"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib64/infiniband"],
[AS_IF([test -d "$ompi_check_openib_my_libdir/lib/infiniband"],
[ompi_check_openib_libflag=" -L$ompi_check_openib_my_libdir/lib/infiniband"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib/infiniband"])])
AS_IF([test -d "$ompi_check_openib_my_libdir/lib64"],
[ompi_check_openib_libflag="$ompi_check_openib_libflag -L$ompi_check_openib_my_libdir/lib64"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib64"],
[AS_IF([test -d "$ompi_check_openib_my_libdir/lib"],
[ompi_check_openib_libflag="$ompi_check_openib_libflag -L$ompi_check_openib_my_libdir/lib"
LDFLAGS="$LDFLAGS -L$ompi_check_openib_my_libdir/lib"])])
OMPI_CHECK_PACKAGE([$1],
[infiniband/verbs.h],
[ibverbs],
[ibv_open_device],
[$ompi_check_openib_libdeps],
[$ompi_check_openib_dir],
[$ompi_check_openib_libdir],
[ompi_check_openib_happy="yes"],
[ompi_check_openib_happy="no"])
AC_CHECK_LIB([cm], [cm_timeout],
[ompi_check_openib_libdeps="-lcm"]
[ompi_check_openib_libdeps=""])
# ok, now see if ibv_create_cq takes 3 arguments or 6
CPPFLAGS="$CPPFLAGS $$1_CPPFLAGS"
LDFLAGS="$LDFLAGS $$1_LDFLAGS"
LIBS="$LIBS $$1_LIBS"
OMPI_CHECK_PACKAGE([$1],
[infiniband/verbs.h],
[ibverbs],
[ibv_open_device],
[$ompi_check_openib_libdeps],
[$ompi_check_openib_dir],
[$ompi_check_openib_libdir],
[ompi_check_openib_happy="yes"],
[ompi_check_openib_happy="no"])
AS_IF([test "$ompi_check_openib_happy" = "yes"],
[AC_CACHE_CHECK(
[number of arguments to ibv_create_cq],
[ompi_cv_func_ibv_create_cq_args],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <infiniband/verbs.h> ]],
[[ibv_create_cq(NULL, 0, NULL, NULL, 0);]])],
[ompi_cv_func_ibv_create_cq_args=5],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <infiniband/verbs.h> ]],
[[ibv_create_cq(NULL, 0, NULL);]])],
[ompi_cv_func_ibv_create_cq_args=3],
[ompi_cv_func_ibv_create_cq_args="unknown"])])])
AS_IF([test "$ompi_cv_func_ibv_create_cq_args" = "unknown"],
[AC_MSG_ERROR([Can not determine number of args to ibv_create_cq. Aborting])],
[AC_DEFINE_UNQUOTED([OMPI_MCA_]m4_translit([$1], [a-z], [A-Z])[_IBV_CREATE_CQ_ARGS],
[$ompi_cv_func_ibv_create_cq_args],
[Number of arguments to ibv_create_cq])])])
# ok, now see if ibv_create_cq takes 3 arguments or 6
CPPFLAGS="$CPPFLAGS $$1_CPPFLAGS"
LDFLAGS="$LDFLAGS $$1_LDFLAGS"
LIBS="$LIBS $$1_LIBS"
AC_CHECK_FUNCS([ibv_create_srq], [ompi_check_openib_have_srq=1], [ompi_check_openib_have_srq=0])
AC_DEFINE_UNQUOTED([OMPI_MCA_]m4_translit([$1], [a-z], [A-Z])[_HAVE_SRQ],
[$ompi_check_openib_have_srq],
[Whether install of OpenIB includes shared receive queue support])
AS_IF([test "$ompi_check_openib_happy" = "yes"],
[AC_CACHE_CHECK(
[number of arguments to ibv_create_cq],
[ompi_cv_func_ibv_create_cq_args],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <infiniband/verbs.h> ]],
[[ibv_create_cq(NULL, 0, NULL, NULL, 0);]])],
[ompi_cv_func_ibv_create_cq_args=5],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <infiniband/verbs.h> ]],
[[ibv_create_cq(NULL, 0, NULL);]])],
[ompi_cv_func_ibv_create_cq_args=3],
[ompi_cv_func_ibv_create_cq_args="unknown"])])])
AS_IF([test "$ompi_cv_func_ibv_create_cq_args" = "unknown"],
[AC_MSG_ERROR([Can not determine number of args to ibv_create_cq. Aborting])],
[AC_DEFINE_UNQUOTED([OMPI_MCA_]m4_translit([$1], [a-z], [A-Z])[_IBV_CREATE_CQ_ARGS],
[$ompi_cv_func_ibv_create_cq_args],
[Number of arguments to ibv_create_cq])])])
CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
LIBS="$ompi_check_openib_$1_save_LIBS"
AC_CHECK_FUNCS([ibv_create_srq], [ompi_check_openib_have_srq=1], [ompi_check_openib_have_srq=0])
AC_DEFINE_UNQUOTED([OMPI_MCA_]m4_translit([$1], [a-z], [A-Z])[_HAVE_SRQ],
[$ompi_check_openib_have_srq],
[Whether install of OpenIB includes shared receive queue support])
CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"
LIBS="$ompi_check_openib_$1_save_LIBS"],
[ompi_check_openib_happy="no"])
AS_IF([test "$ompi_check_openib_happy" = "yes"],
[$2],
[AS_IF([test ! -z "$with_openib" -a "$with_openib" != "no"],
[AC_MSG_ERROR([Open IB support requested but not found. Aborting])])
[AC_MSG_ERROR([OpenIB support requested but not found. Aborting])])
$3])
$1_LDFLAGS="$$1_LDFLAGS $ompi_check_openib_libflag"
])

2
opal/mca/timer/aix/configure.m4
Просмотреть файл

@ -30,7 +30,7 @@ AC_DEFUN([MCA_timer_aix_COMPILE_MODE], [
AC_DEFUN([MCA_timer_aix_CONFIG],[
AC_ARG_WITH([timer],
[AC_HELP_STRING([--with-timer=TYPE],
[high resolution timer component])])
[Build high resolution timer component TYPE])])
AS_IF([test "$with_timer" = "aix"],
[timer_aix_happy="yes"