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

treematch: ensure hwloc support is enabled

Просмотр исходного кода 
This commit does the following:

* s/ompi_check_treematch/ompi_topo_treematch/ (i.e., abide by the
  prefix rule)
* change the value of ompi_topo_treematch_happy from yes/no to 0/1, so
  that we can use -eq for numerical comparisons (vs. string
  comparisons).  It's the little things in life, no?
* Check the valueo f $OPAL_HAVE_HWLOC to ensure that hwloc support is
  enabled.  If not, disqualify treematch from building.
* Fixes a few places that were underquoted
* Convert from "test ... -a ..." to "test ... && test ..."

Fixes open-mpi/ompi#797
Этот коммит содержится в:
Jeff Squyres 2015-08-12 11:41:06 -07:00
родитель 6a7d5271c4
Коммит e9b7203ece
1 изменённых файлов: 45 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

80
ompi/mca/topo/treematch/configure.m4
Просмотреть файл

@ -5,6 +5,7 @@
# reserved.
# Copyright (c) 2011-2015 INRIA. All rights reserved.
# Copyright (c) 2011-2015 Universite Bordeaux 1
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -20,9 +21,7 @@ AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
AC_ARG_WITH([treematch],
[AC_HELP_STRING([--with-treematch(=DIR)],
[Build TreeMatch topology support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])],
[],
[with_treematch=yes])
[Build TreeMatch topology support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
AC_ARG_WITH([treematch-include],
[AC_HELP_STRING([--with-treematch-include(=DIR)],
["Search for TreeMatch headers in DIR"])])
@ -31,39 +30,49 @@ AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
["Search for TreeMatch libraries in DIR"])])
treematch_files_local="no"
ompi_check_treematch_dir=$srcdir
ompi_check_treematch_libdir=""
ompi_check_treematch_happy="no"
ompi_topo_treematch_dir=$srcdir
ompi_topo_treematch_libdir=
ompi_topo_treematch_happy=0
AS_IF([test "x$with_treematch" != xno],
[AC_MSG_CHECKING([TreeMatch headers])
AS_IF([test "x$with_treematch_include" = x],
[AS_IF([test "x$with_treematch" = xyes],
[treematch_files_local="yes"
with_treematch_include=$OMPI_TOP_SRCDIR/ompi/mca/topo/treematch/treematch],
[with_treematch_include=$with_treematch/include])])
AS_IF([test -f $with_treematch_include/tm_tree.h],
[AS_IF([test "x$with_treematch" = xyes],
[AC_MSG_RESULT([in the source])],
[AC_MSG_RESULT([user provided])])
opal_check_treematch_dir=$with_treematch_include
ompi_check_treematch_happy="yes"],
[AC_MSG_ERROR([missing tm_tree.h (${with_treematch}:${with_treematch_include})])])])
AC_MSG_CHECKING([for hwloc support])
AS_IF([test $OPAL_HAVE_HWLOC -eq 0],
[AC_MSG_RESULT([no (treematch requires hwloc)])
ompi_topo_treematch_happy=0],
[AC_MSG_RESULT([yes])
ompi_topo_treematch_happy=1])
AS_IF([test "$ompi_check_treematch_happy" = "yes"],
[AC_MSG_CHECKING([TreeMatch library])
OPAL_CHECK_WITHDIR([treematch], [$with_treematch_include], [tm_tree.h])
AS_IF([test $ompi_topo_treematch_happy -eq 1],
[AS_IF([test "x$with_treematch" != xno],
[AC_MSG_CHECKING([TreeMatch headers])
AS_IF([test "x$with_treematch_include" = x],
[AS_IF([test "x$with_treematch" != "xno"],
[treematch_files_local="yes"
with_treematch_include="$OMPI_TOP_SRCDIR/ompi/mca/topo/treematch/treematch"],
[with_treematch_include="$with_treematch/include"])])
AS_IF([test -f "$with_treematch_include/tm_tree.h"],
[AS_IF([test "x$with_treematch" != "xno"],
[AC_MSG_RESULT([in the source])],
[AC_MSG_RESULT([user provided])])
opal_check_treematch_dir=$with_treematch_include
ompi_topo_treematch_happy=1],
[AC_MSG_ERROR([missing tm_tree.h (${with_treematch}:${with_treematch_include})])])])
])
AS_IF([test $ompi_topo_treematch_happy -eq 1],
[OPAL_CHECK_WITHDIR([treematch],
[$with_treematch_include],
[tm_tree.h])
AS_IF([test "x$with_treematch_libdir" = x],
[AS_IF([test "x$with_treematch" != xyes],
[AS_IF([test "x$with_treematch" != "xyes"],
[with_treematch_libdir=$with_treematch/lib]
[with_treematch_libdir=$OMPI_TOP_SRCDIR/ompi/mca/topo/treematch/treematch])])
AS_IF([test "x$treematch_files_local" = xno],
[OPAL_CHECK_WITHDIR([treematch-libdir], [$with_treematch_libdir], [libtreematch.*])
AS_IF([test "x$with_treematch" != xno -a "x$with_treematch" != xyes],
[AS_IF([test ! -z "$with_treematch" -a "$with_treematch" != "yes"],
[ompi_check_treematch_dir="$with_treematch"])
AS_IF([test ! -z "$with_treematch_libdir" -a "$with_treematch_libdir" != "yes"],
[ompi_check_treematch_libdir="$with_treematch_libdir"])
AS_IF([test "x$with_treematch" != xno && test "x$with_treematch" != "xyes"],
[AS_IF([test ! -z "$with_treematch" && test "$with_treematch" != "yes"],
[ompi_topo_treematch_dir="$with_treematch"])
AS_IF([test ! -z "$with_treematch_libdir" && test "$with_treematch_libdir" != "yes"],
[ompi_topo_treematch_libdir="$with_treematch_libdir"])
OPAL_CHECK_PACKAGE([topo_treematch],
[tm_tree.h],
[treematch],
@ -71,17 +80,18 @@ AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
[],
[$with_treematch_include],
[$with_treematch_libdir],
[ompi_check_treematch_happy="yes"],
[ompi_check_treematch_happy="no"])],
[ompi_check_treematch_happy="no"])])])
[ompi_topo_treematch_happy=1],
[ompi_topo_treematch_happy=1])],
[ompi_topo_treematch_happy=1])])])
AS_IF([test "$ompi_check_treematch_happy" = "yes"],
AS_IF([test $ompi_topo_treematch_happy -eq 1],
[$1],
[AS_IF([test ! -z "$with_treematch" -a "$with_treematch" != "no"],
[AS_IF([test ! -z "$with_treematch" && test "$with_treematch" != "no"],
[AC_MSG_ERROR([TreeMatch support requested but not found. Aborting])])
$2])
AC_CONFIG_FILES([ompi/mca/topo/treematch/Makefile])
AM_CONDITIONAL(topo_treematch_local,
[test "x$treematch_files_local" = "xyes"])
[test $ompi_topo_treematch_happy -eq 1 && \
test "x$treematch_files_local" = "xyes"])
])