[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-300-g40e4efb

[mysql vizuser]

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  40e4efb73d8b88f8a47ea38f95cd67c1df96c700 (commit)
      from  c2417a7c15e7eef43d74bbef1ccc3d0915155cd8 (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/40e4efb73d8b88f8a47ea38f95cd67c1df96c700

commit 40e4efb73d8b88f8a47ea38f95cd67c1df96c700
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Mon Jun 10 07:14:27 2013 -0500

    Revert [6a4899dc].
    
    The previous patch was meant to allow devices to automatically pick
    the default timer type they like.  However, it forces the device to
    pick one of the predefined timer types.

diff --git a/configure.ac b/configure.ac
index 6c20767..39c20a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4819,7 +4819,7 @@ AC_ARG_ENABLE(timer-type,
         certain situations.
 
         linuxalpha_cycle is no longer supported.
-],timer_type=$enable_timer_type,timer_type=$MPID_DEFAULT_TIMER_TYPE)
+],timer_type=$enable_timer_type)
 
 if test -z "$timer_type" ; then 
     # Try to pick a timer based on what is available
@@ -5062,6 +5062,14 @@ pac_cv_ia64_cycle,[
     MPID_TIMER_TYPE="uint64_t"
     ;;
 
+    device)
+    # The device selected should export the datatype for the timer
+    # in MPID_DEVICE_TIMER_TYPE if something other than long is needed
+    if test -n "$MPID_DEVICE_TIMER_TYPE" ; then
+       MPID_TIMER_TYPE=$MPID_DEVICE_TIMER_TYPE
+    fi
+    ;;
+
     *)
     AC_MSG_ERROR([Invalid timer type $timer_type])
     ;;

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository