b400b84162
Remove the --enable-progress-threads option as this is no longer functional, and hardcode OPAL_ENABLE_PROGRESS_THREADS to 0. Replace the --enable-mpi-threads option with --enable-mpi-thread-multiple as this is clearer as to meaning. This option automatically turns "on" opal thread support if it wasn't already so specified. If the user specifies --disable-opal-multi-threads --enable-mpi-thread-multiple, we will error out with a message Add a new --enable-opal-multi-threads option that turns "on" opal thread support without doing anything wrt mpi-thread-multiple This commit was SVN r22841.
84 строки
3.1 KiB
Plaintext
84 строки
3.1 KiB
Plaintext
dnl
|
|
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
dnl University Research and Technology
|
|
dnl Corporation. All rights reserved.
|
|
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
dnl of Tennessee Research Foundation. All rights
|
|
dnl reserved.
|
|
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
dnl University of Stuttgart. All rights reserved.
|
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
|
dnl All rights reserved.
|
|
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
|
dnl $COPYRIGHT$
|
|
dnl
|
|
dnl Additional copyrights may follow
|
|
dnl
|
|
dnl $HEADER$
|
|
dnl
|
|
|
|
AC_DEFUN([OMPI_CONFIG_THREADS],[
|
|
#
|
|
# Arguments: none
|
|
#
|
|
# Dependencies: None
|
|
#
|
|
# Modifies:
|
|
# none - see called tests
|
|
#
|
|
# configure threads
|
|
#
|
|
|
|
#
|
|
# Thread Multiple
|
|
#
|
|
# --enable-mpi-thread-multiple
|
|
# #if OMPI_ENABLE_THREAD_MULTIPLE == 0 /* Not available */
|
|
# #if OMPI_ENABLE_THREAD_MULTIPLE == 1 /* Available */
|
|
#
|
|
AC_MSG_CHECKING([if want MPI thread support])
|
|
AC_ARG_ENABLE([mpi_thread_multiple],
|
|
[AC_HELP_STRING([--enable-mpi-thread-multiple],
|
|
[Enable thread support for MPI applications (default: disabled)])],
|
|
[enable_mpi_threads="$enableval"],
|
|
[enable_mpi_threads="undef"])
|
|
|
|
# if they did not want OPAL thread support, then they cannot have this option
|
|
if test "$enable_mpi_threads" = "yes" -a "$enable_opal_multi_threads" = "no"; then
|
|
AC_MSG_WARN(["failed"])
|
|
AC_MSG_WARN(["*** You have requested MPI thread multiple support but thread"])
|
|
AC_MSG_WARN(["*** support was disabled within the OPAL code base by"])
|
|
AC_MSG_WARN(["*** --disable-opal-multi-threads on your configure command."])
|
|
AC_MSG_ERROR(["*** Can not continue."])
|
|
# if --disable-mpi-thread-multiple
|
|
elif test "$enable_mpi_threads" = "no"; then
|
|
ompi_want_mpi_threads=0
|
|
OMPI_ENABLE_THREAD_MULTIPLE=0
|
|
AC_MSG_RESULT([Disabled])
|
|
#if requested and OPAL thread support is enabled
|
|
elif test "$enable_mpi_threads" = "yes" -a "$enable_opal_multi_threads" = "yes" ; then
|
|
ompi_want_mpi_threads=1
|
|
OMPI_ENABLE_THREAD_MULTIPLE=1
|
|
AC_MSG_RESULT([Enabled])
|
|
#if requested and OPAL thread support was not explicitly enabled or disabled
|
|
elif test "$enable_mpi_threads" = "yes" -a "$enable_opal_multi_threads" = "undef" ; then
|
|
# ensure that OPAL thread support is turned on
|
|
OPAL_ENABLE_MULTI_THREADS=1
|
|
enable_opal_multi_threads="yes"
|
|
AC_DEFINE_UNQUOTED([OPAL_ENABLE_MULTI_THREADS], [$OPAL_ENABLE_MULTI_THREADS],
|
|
[Whether we should enable support for multiple user threads])
|
|
ompi_want_mpi_threads=1
|
|
OMPI_ENABLE_THREAD_MULTIPLE=1
|
|
AC_MSG_RESULT([Enabled - OPAL thread support automatically enabled])
|
|
else
|
|
# Default: disable
|
|
ompi_want_mpi_threads=0
|
|
OMPI_ENABLE_THREAD_MULTIPLE=0
|
|
AC_MSG_RESULT([Disabled])
|
|
fi
|
|
AC_DEFINE_UNQUOTED([OMPI_ENABLE_THREAD_MULTIPLE], [$ompi_want_mpi_threads],
|
|
[Enable MPI Thread Multiple])
|
|
|
|
])dnl
|
|
|