ompi_check_mx: remove now-unused macro
The code base does not support the MX network stack any more.
Этот коммит содержится в:
Jeff Squyres
родитель
68f2d56bb6
Коммит
cb66aeb697
@ -1,140 +0,0 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2004-2007 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 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# _OMPI_CHECK_MX_MAPPER()
|
||||
# ------------------------
|
||||
# Check if the MX library provide the necessary functions in order to
|
||||
# figure out the mapper version and MAC for each board.
|
||||
AC_DEFUN([_OMPI_CHECK_MX_MAPPER],[
|
||||
AC_CACHE_CHECK([for mx_open_board],
|
||||
[ompi_cv_func_mx_open_board],
|
||||
[AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
[
|
||||
#include <mx_extensions.h>
|
||||
#include <mx_io.h>
|
||||
#include <mx_internals/mx__fops.h>
|
||||
], [
|
||||
mx_open_board(0, NULL);
|
||||
])],
|
||||
[ompi_cv_func_mx_open_board="yes"],
|
||||
[ompi_cv_func_mx_open_board="no"])])
|
||||
|
||||
AC_CACHE_CHECK([for mx__get_mapper_state],
|
||||
[ompi_cv_func_mx__get_mapper_state],
|
||||
[AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
[
|
||||
#include <mx_extensions.h>
|
||||
#include <mx_io.h>
|
||||
#include <mx_internals/mx__driver_interface.h>
|
||||
], [
|
||||
mx__get_mapper_state(NULL, NULL);
|
||||
])],
|
||||
[ompi_cv_func_mx__get_mapper_state="yes"],
|
||||
[ompi_cv_func_mx__get_mapper_state="no"])])
|
||||
|
||||
AS_IF([test "$ompi_cv_func_mx_open_board" = "yes" -a "$ompi_cv_func_mx__get_mapper_state" = "yes"],
|
||||
[mx_provide_mapper_state=1
|
||||
$2],
|
||||
[mx_provide_mapper_state=0
|
||||
$3])
|
||||
AC_DEFINE_UNQUOTED([MX_HAVE_MAPPER_STATE], [$mx_provide_mapper_state],
|
||||
[MX installation provide access to the mx_open_board and mx__get_mapper_state functions])
|
||||
])
|
||||
|
||||
|
||||
# OMPI_CHECK_MX(prefix, [action-if-found], [action-if-not-found])
|
||||
# --------------------------------------------------------
|
||||
# check if MX support can be found. sets prefix_{CPPFLAGS,
|
||||
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
|
||||
# support, otherwise executes action-if-not-found
|
||||
AC_DEFUN([OMPI_CHECK_MX],[
|
||||
AC_ARG_WITH([mx],
|
||||
[AC_HELP_STRING([--with-mx(=DIR)],
|
||||
[Build MX (Myrinet Express) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
|
||||
OPAL_CHECK_WITHDIR([mx], [$with_mx], [include/myriexpress.h])
|
||||
AC_ARG_WITH([mx-libdir],
|
||||
[AC_HELP_STRING([--with-mx-libdir=DIR],
|
||||
[Search for MX (Myrinet Express) libraries in DIR])])
|
||||
OPAL_CHECK_WITHDIR([mx-libdir], [$with_mx_libdir], [libmyriexpress.*])
|
||||
|
||||
ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS"
|
||||
ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"
|
||||
ompi_check_mx_$1_save_LIBS="$LIBS"
|
||||
|
||||
AS_IF([test "$with_mx" != "no"],
|
||||
[AS_IF([test ! -z "$with_mx" -a "$with_mx" != "yes"],
|
||||
[ompi_check_mx_dir="$with_mx"])
|
||||
AS_IF([test ! -z "$with_mx_libdir" -a "$with_mx_libdir" != "yes"],
|
||||
[ompi_check_mx_libdir="$with_mx_libdir"])
|
||||
|
||||
OPAL_CHECK_PACKAGE([$1],
|
||||
[myriexpress.h],
|
||||
[myriexpress],
|
||||
[mx_finalize],
|
||||
[],
|
||||
[$ompi_check_mx_dir],
|
||||
[$ompi_check_mx_libdir],
|
||||
[ompi_check_mx_happy="yes"],
|
||||
[ompi_check_mx_happy="no"])],
|
||||
[ompi_check_mx_happy="no"])
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $$1_CPPFLAGS"
|
||||
LDFLAGS="$LDFLAGS $$1_LDFLAGS"
|
||||
LIBS="$LIBS $$1_LIBS"
|
||||
|
||||
# need at least version 1.0
|
||||
AS_IF([test "ompi_check_mx_happy" = "yes"],
|
||||
[AC_CACHE_CHECK([for MX version 1.0 or later],
|
||||
[ompi_cv_mx_version_ok],
|
||||
[AC_PREPROC_IFELSE(
|
||||
[AC_LANG_PROGRAM([
|
||||
#include <myriexpress.h>
|
||||
],[
|
||||
#if MX_API < 0x300
|
||||
#error "Version less than 0x300"
|
||||
#endif
|
||||
])],
|
||||
[ompi_cv_mx_version_ok="yes"],
|
||||
[ompi_cv_mx_version_ok="no"])])])
|
||||
AS_IF([test "$ompi_cv_mx_version_ok" = "no"], [ompi_check_mx_happy="no"])
|
||||
|
||||
AS_IF([test "$ompi_check_mx_happy" = "yes"],
|
||||
[AC_CHECK_HEADERS([mx_extensions.h],
|
||||
[AC_CHECK_FUNCS([mx_forget mx_register_unexp_handler])
|
||||
_OMPI_CHECK_MX_MAPPER()],
|
||||
[AC_MSG_WARN([The MX support for Open MPI will be compiled without the
|
||||
MX extensions, which may result in lower performance. Please upgrade
|
||||
to at least MX 1.2.0 to enable the MX extensions.])])])
|
||||
|
||||
CPPFLAGS="$ompi_check_mx_$1_save_CPPFLAGS"
|
||||
LDFLAGS="$ompi_check_mx_$1_save_LDFLAGS"
|
||||
LIBS="$ompi_check_mx_$1_save_LIBS"
|
||||
|
||||
AS_IF([test "$ompi_check_mx_happy" = "yes" -a "$enable_progress_threads" = "yes"],
|
||||
[AC_MSG_WARN([MX driver does not currently support progress threads. Disabling BTL.])
|
||||
ompi_check_mx_happy="no"])
|
||||
|
||||
AS_IF([test "$ompi_check_mx_happy" = "yes"],
|
||||
[$2],
|
||||
[AS_IF([test ! -z "$with_mx" -a "$with_mx" != "no"],
|
||||
[AC_MSG_ERROR([MX support requested but not found. Aborting])])
|
||||
$3])
|
||||
])
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user