This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6cd74de933244725ec9c919649d849898861b529 (commit) via 641a6c4e0d9741c088225ea81bfdb9c1ee04d3bc (commit) via 7051290d24003fbf9ffb90174efde7a353d01406 (commit) via 2c8cf8cbd56e25743a3d0c96932a749e87051959 (commit) via f7c27569b955062a31bc151bc10096aff0c9fd40 (commit) via 89f6629432c864d2b653972f1059960c27ff9e3a (commit) from c81cc46764c68fa726a74f1721bb57f222980f15 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6cd74de933244725ec9c919649d8498988... commit 6cd74de933244725ec9c919649d849898861b529 Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 23:07:53 2013 -0500 Fix for tt#231. If a higher than single or funneled thread level is required and no thread package is provided, abort. diff --git a/configure.ac b/configure.ac index c8c302e..858ef02 100644 --- a/configure.ac +++ b/configure.ac @@ -5272,14 +5272,18 @@ AC_ARG_WITH([thread-package], none - no threads ],,with_thread_package=posix) -if test "$thread_pkg_required" = "no" ; then +if test "${thread_pkg_required}" = "no" -o "${with_thread_package}" = "no" ; then with_thread_package=none fi -if test "$with_thread_package" = "yes" ; then +if test "${with_thread_package}" = "yes" ; then with_thread_package=posix fi +if test "${thread_pkg_required}" = "yes" -a "${with_thread_package}" = "none" ; then + AC_ERROR([if no thread package is available, use --enable-threads=single or funneled]) +fi + MPIU_THREAD_PACKAGE_NAME=MPIU_THREAD_PACKAGE_INVALID case $with_thread_package in posix|pthreads) http://git.mpich.org/mpich.git/commitdiff/641a6c4e0d9741c088225ea81bfdb9c1ee... commit 641a6c4e0d9741c088225ea81bfdb9c1ee04d3bc Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 23:03:42 2013 -0500 Cleanup of the --enable-threads configure option. 1. Remove the option for default, since that can be picked with just --enable-threads without any additional arguments as well. 2. Don't do any device-specific assignments in the top-level configure. This is not the right place to do that. If the device wants to use a particular thread-level, it should set that in its subconfigure.m4. diff --git a/configure.ac b/configure.ac index 970bb84..c8c302e 100644 --- a/configure.ac +++ b/configure.ac @@ -506,8 +506,6 @@ AC_ARG_ENABLE(threads, DO NOT select this option. The option runtime is more efficient and also supports thread_multiple. (multiple aliased to runtime now) - default - Make a good choice depending on the communication - device. For ch3:nemesis, this is runtime. See also the --enable-thread-cs option for controlling the granularity of the concurrency inside of the library @@ -1282,6 +1280,7 @@ fi # # Threads must be supported by the device. First, set the default to # be the highest supported by the device +if test "$enable_threads" = "yes" ; then enable_threads=default ; fi if test "$enable_threads" = default ; then # XXX DJG bug is here, PREREQ is not being used right now if test -n "$MPID_MAX_THREAD_LEVEL" ; then @@ -1298,14 +1297,10 @@ if test "$enable_threads" = default ; then fi fi -if test "$enable_threads" = "yes" ; then - enable_threads=multiple +if test "$enable_threads" = "default" ; then + enable_threads=runtime elif test "$enable_threads" = "no" ; then enable_threads=single -elif test "$enable_threads" = "default"; then - if test "$with_device" = "default" -o "$with_device" = "ch3:sock" ; then - enable_threads=runtime - fi fi # Runtime is an alias for multiple with an additional value http://git.mpich.org/mpich.git/commitdiff/7051290d24003fbf9ffb90174efde7a353... commit 7051290d24003fbf9ffb90174efde7a353d01406 Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 22:41:07 2013 -0500 Only try to find a thread package, if it is required. diff --git a/configure.ac b/configure.ac index 0ecaf09..970bb84 100644 --- a/configure.ac +++ b/configure.ac @@ -1375,11 +1375,6 @@ fi export MPICH_THREAD_LEVEL AC_DEFINE_UNQUOTED(MPICH_THREAD_LEVEL,$MPICH_THREAD_LEVEL,[Level of thread support selected at compile time]) -if test "$thread_pkg_required" = "no" ; then - MPIU_THREAD_DEFAULT=${MPIU_THREAD_DEFAULT:-none} -fi -export MPIU_THREAD_DEFAULT - # Check for value thread_cs choice; set the refcount default if necessary thread_granularity=MPIU_THREAD_GRANULARITY_SINGLE thread_refcount=MPIU_REFCOUNT_NONE @@ -5274,19 +5269,17 @@ dnl invoke the configure scripts (if present) directly. # # # ----------------------------------------------------------------------------- -MPIU_THREAD_DEFAULT=${MPIU_THREAD_DEFAULT:-posix} - AC_ARG_WITH([thread-package], [ --with-thread-package=package Thread package to use. Supported thread packages include: - posix or pthreads - POSIX threads + posix or pthreads - POSIX threads (default, if required) solaris - Solaris threads (Solaris OS only) win - windows threads none - no threads +],,with_thread_package=posix) - If the option is not specified, the default package is - ${MPIU_THREAD_DEFAULT}. If the option is specified, but a package - is not given, then the default is posix -],,with_thread_package=${MPIU_THREAD_DEFAULT}) +if test "$thread_pkg_required" = "no" ; then + with_thread_package=none +fi if test "$with_thread_package" = "yes" ; then with_thread_package=posix http://git.mpich.org/mpich.git/commitdiff/2c8cf8cbd56e25743a3d0c96932a749e87... commit 2c8cf8cbd56e25743a3d0c96932a749e87051959 Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 22:29:21 2013 -0500 Improve comment for thread-package requirement in serialized. diff --git a/configure.ac b/configure.ac index 1ede3ff..0ecaf09 100644 --- a/configure.ac +++ b/configure.ac @@ -1325,7 +1325,8 @@ case "$enable_threads" in MPICH_THREAD_LEVEL=MPI_THREAD_FUNNELED ;; serialized) - # FIXME: Why does serialized require a thread package? + # We require a thread package even in serialized mode, since we + # use that for the aynchronous threads thread_pkg_required=yes MPICH_THREAD_LEVEL=MPI_THREAD_SERIALIZED ;; http://git.mpich.org/mpich.git/commitdiff/f7c27569b955062a31bc151bc10096aff0... commit f7c27569b955062a31bc151bc10096aff0c9fd40 Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 22:19:31 2013 -0500 Remove unused variable. diff --git a/configure.ac b/configure.ac index 6b18d4c..1ede3ff 100644 --- a/configure.ac +++ b/configure.ac @@ -5291,7 +5291,6 @@ if test "$with_thread_package" = "yes" ; then with_thread_package=posix fi -MPICH_THREAD_PACKAGE=none MPIU_THREAD_PACKAGE_NAME=MPIU_THREAD_PACKAGE_INVALID case $with_thread_package in posix|pthreads) @@ -5382,7 +5381,6 @@ void f1(void *a) { return; }], PAC_FUNC_NEEDS_DECL([#include <pthread.h>],pthread_mutexattr_settype) - MPICH_THREAD_PACKAGE=pthreads MPIU_THREAD_PACKAGE_NAME=MPIU_THREAD_PACKAGE_POSIX ;; solaris) @@ -5393,12 +5391,10 @@ void f1(void *a) { return; }], AC_MSG_ERROR([unable to find Solaris threads library]) fi # FIXME: need to add -mt if using solaris compilers - MPICH_THREAD_PACKAGE=solaris MPIU_THREAD_PACKAGE_NAME=MPIU_THREAD_PACKAGE_SOLARIS ;; win|windows) with_thread_package=win - MPICH_THREAD_PACKAGE=win MPIU_THREAD_PACKAGE_NAME=MPIU_THREAD_PACKAGE_WIN AC_MSG_ERROR([The 'win' thread package is not supported via autoconf builds at this time.]) ;; @@ -5413,7 +5409,6 @@ esac # Define and export the selected thread library so that other packages # know what's used in MPICH -export MPICH_THREAD_PACKAGE AC_DEFINE_UNQUOTED([MPIU_THREAD_PACKAGE_NAME],[$MPIU_THREAD_PACKAGE_NAME],[set to the name of the thread package]) # check for compiler-support for thread-local storage (MPIU_TLS_SPECIFIER) http://git.mpich.org/mpich.git/commitdiff/89f6629432c864d2b653972f1059960c27... commit 89f6629432c864d2b653972f1059960c27ff9e3a Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 23:14:59 2013 -0500 Remove accidentally added debug messages. diff --git a/confdb/aclocal_runlog.m4 b/confdb/aclocal_runlog.m4 index 6446af8..dd9928f 100644 --- a/confdb/aclocal_runlog.m4 +++ b/confdb/aclocal_runlog.m4 @@ -145,8 +145,6 @@ dnl Save a copy of ac_compile on a stack dnl which is safe through nested invocations of this macro. PAC_VAR_PUSHVAL([ac_compile]) dnl Modify ac_compile based on the unmodified ac_compile. -echo "ac_compile: $ac_compile" -echo "pac_FirstSavedValueOf_ac_compile: $pac_FirstSavedValueOf_ac_compile" ac_compile="`echo $pac_FirstSavedValueOf_ac_compile | sed -e 's|>.*$|> $1 2>\&1|g'`" AC_COMPILE_IFELSE([$2],[ ifelse([$3],[],[:],[$3]) @@ -208,8 +206,6 @@ AC_DEFUN([PAC_COMPLINK_IFELSE],[ AC_COMPILE_IFELSE([$1],[ PAC_RUNLOG([mv conftest.$OBJEXT pac_conftest.$OBJEXT]) PAC_VAR_PUSHVAL([LIBS]) - echo "LIBS: $LIBS" - echo "pac_FirstSavedValueOf_LIBS: $pac_FirstSavedValueOf_LIBS" LIBS="pac_conftest.$OBJEXT $pac_FirstSavedValueOf_LIBS" AC_LINK_IFELSE([$2],[ ifelse([$3],[],[:],[$3]) ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_runlog.m4 | 4 ---- configure.ac | 42 +++++++++++++++--------------------------- 2 files changed, 15 insertions(+), 31 deletions(-) hooks/post-receive -- MPICH primary repository