[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-273-gc81cc46
mysql vizuser
noreply at mpich.org
Fri Jun 7 22:03:32 CDT 2013
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 c81cc46764c68fa726a74f1721bb57f222980f15 (commit)
via 6a4899dc20e46dcda7068b353836b3f4f393c731 (commit)
via d7f24c6cf4bab74d31c2f0644eded1c64d200f5c (commit)
via ea85810ee784e0f58c8c300947908477bd04158c (commit)
via 6f062ee4ad1897ed9ed272c4b3a14aa4aca4fb42 (commit)
via 35ddb43264e20c1c39e2c09f95d4331ee46b8f77 (commit)
from 7228af25d5f7490f69c7929841cb7bc24d6d792e (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/c81cc46764c68fa726a74f1721bb57f222980f15
commit c81cc46764c68fa726a74f1721bb57f222980f15
Author: Sameh Sharkawi <sssharka at us.ibm.com>
Date: Fri May 24 12:38:52 2013 -0400
AIX compiler pad fixes
mpi-io cases failed w/ mpich2 on AIX:
AIX compiler pads 3 bytes to chars inside structs.
MPICH2 needed to match that when on AIX. For cross compiles,
two AIX specific cross files are added so the config
is aware of this and match AIX padding.
(ibm) D190327
(ibm) 76997eee0762ee9e4ad22ec0ee8b8f8c820bea94
diff --git a/src/mpid/pamid/cross/pe4-aix b/src/mpid/pamid/cross/pe4-aix
new file mode 100644
index 0000000..f3478d1
--- /dev/null
+++ b/src/mpid/pamid/cross/pe4-aix
@@ -0,0 +1,28 @@
+# begin_generated_IBM_copyright_prolog
+#
+# This is an automatically generated copyright prolog.
+# After initializing, DO NOT MODIFY OR MOVE
+# ---------------------------------------------------------------
+# Licensed Materials - Property of IBM
+# Blue Gene/Q 5765-PER 5765-PRP
+#
+# (C) Copyright IBM Corp. 2011, 2012 All Rights Reserved
+# US Government Users Restricted Rights -
+# Use, duplication, or disclosure restricted
+# by GSA ADP Schedule Contract with IBM Corp.
+#
+# ---------------------------------------------------------------
+#
+# end_generated_IBM_copyright_prolog
+CROSS_F77_SIZEOF_INTEGER=4
+CROSS_F77_SIZEOF_REAL=4
+CROSS_F77_SIZEOF_DOUBLE_PRECISION=8
+CROSS_F90_ADDRESS_KIND=4
+CROSS_F90_OFFSET_KIND=8
+CROSS_F90_INTEGER_KIND=4
+CROSS_F90_REAL_MODEL=6,37
+CROSS_F90_DOUBLE_MODEL=15,307
+CROSS_F90_INTEGER_MODEL_MAP={9,4,4},
+CROSS_F77_TRUE_VALUE=1
+CROSS_F77_FALSE_VALUE=0
+CROSS_ALIGN_DOUBLE_EXCEPTION="four"
diff --git a/src/mpid/pamid/cross/pe8-aix b/src/mpid/pamid/cross/pe8-aix
new file mode 100644
index 0000000..8380c89
--- /dev/null
+++ b/src/mpid/pamid/cross/pe8-aix
@@ -0,0 +1,28 @@
+# begin_generated_IBM_copyright_prolog
+#
+# This is an automatically generated copyright prolog.
+# After initializing, DO NOT MODIFY OR MOVE
+# ---------------------------------------------------------------
+# Licensed Materials - Property of IBM
+# Blue Gene/Q 5765-PER 5765-PRP
+#
+# (C) Copyright IBM Corp. 2011, 2012 All Rights Reserved
+# US Government Users Restricted Rights -
+# Use, duplication, or disclosure restricted
+# by GSA ADP Schedule Contract with IBM Corp.
+#
+# ---------------------------------------------------------------
+#
+# end_generated_IBM_copyright_prolog
+CROSS_F77_SIZEOF_INTEGER=4
+CROSS_F77_SIZEOF_REAL=4
+CROSS_F77_SIZEOF_DOUBLE_PRECISION=8
+CROSS_F90_ADDRESS_KIND=8
+CROSS_F90_OFFSET_KIND=8
+CROSS_F90_INTEGER_KIND=8
+CROSS_F90_REAL_MODEL=6,37
+CROSS_F90_DOUBLE_MODEL=15,307
+CROSS_F90_INTEGER_MODEL_MAP={9,4,4},
+CROSS_F77_TRUE_VALUE=1
+CROSS_F77_FALSE_VALUE=0
+CROSS_ALIGN_DOUBLE_EXCEPTION="four"
http://git.mpich.org/mpich.git/commitdiff/6a4899dc20e46dcda7068b353836b3f4f393c731
commit 6a4899dc20e46dcda7068b353836b3f4f393c731
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Fri Jun 7 21:36:15 2013 -0500
Pick device timer-type if available, by default.
diff --git a/configure.ac b/configure.ac
index 2e3b605..6b18d4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4834,7 +4834,7 @@ AC_ARG_ENABLE(timer-type,
certain situations.
linuxalpha_cycle is no longer supported.
-],timer_type=$enable_timer_type)
+],timer_type=$enable_timer_type,timer_type=$MPID_DEFAULT_TIMER_TYPE)
if test -z "$timer_type" ; then
# Try to pick a timer based on what is available
@@ -5077,14 +5077,6 @@ 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])
;;
http://git.mpich.org/mpich.git/commitdiff/d7f24c6cf4bab74d31c2f0644eded1c64d200f5c
commit d7f24c6cf4bab74d31c2f0644eded1c64d200f5c
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed May 22 10:20:47 2013 -0500
Allow the device to specify a default pm
The pamid device does not require a pm and will set the default to 'no'.
This eliminates the requirement to specify the '--with-pm=no' configure
option in order to configure and build successfully.
(includes modifications by Pavan Balaji @ Argonne).
diff --git a/configure.ac b/configure.ac
index d766e17..2e3b605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1659,7 +1659,11 @@ if test "$with_pmi" = "uni" -a "$with_pm" = "default" ; then
with_pm="no"
fi
if test "$with_pm" = "default" -o "$with_pm" = "yes" ; then
- with_pm=hydra
+ if test -z "$MPID_DEFAULT_PM" ; then
+ with_pm=${MPID_DEFAULT_PM}
+ else
+ with_pm=hydra
+ fi
fi
# We allow multiple pm names, separated by : or ,
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index 1cb0921..1b5171c 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -55,6 +55,7 @@ if test "${pamid_platform}" = "PE" ; then
PM_REQUIRES_PMI=pmi2/poe
elif test "${pamid_platform}" = "BGQ" ; then
MPID_DEFAULT_CROSS_FILE=${master_top_srcdir}/src/mpid/pamid/cross/bgq8
+ MPID_DEFAULT_PM=no
fi
MPID_DEVICE_TIMER_TYPE=double
http://git.mpich.org/mpich.git/commitdiff/ea85810ee784e0f58c8c300947908477bd04158c
commit ea85810ee784e0f58c8c300947908477bd04158c
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed May 22 10:18:08 2013 -0500
Allow the device to specify a default cross file.
For a bgq configure, this means that the following option is no longer
required to be set:
--with-cross-file=src/mpid/pamid/cross/bgq8
(with modifications by Pavan Balaji @ Argonne).
diff --git a/configure.ac b/configure.ac
index 09826a5..d766e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,7 +596,12 @@ AC_ARG_ENABLE([long-double],
AC_ARG_WITH(cross,
AC_HELP_STRING([--with-cross=file],
[Specify the values of variables that configure cannot
- determine in a cross-compilation environment]),,with_cross=no)
+ determine in a cross-compilation environment]),,
+ with_cross=$MPID_DEFAULT_CROSS_FILE)
+if test -z "$with_cross" ; then with_cross=no ; fi
+if test "$with_cross" != "no"; then
+ AC_MSG_NOTICE([Using cross file: $with_cross])
+fi
AC_ARG_WITH(namepublisher,
[ --with-namepublisher=name Choose the system that will support
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index d9db274..1cb0921 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -53,6 +53,8 @@ MPID_MAX_PROCESSOR_NAME=128
PM_REQUIRES_PMI=pmi2
if test "${pamid_platform}" = "PE" ; then
PM_REQUIRES_PMI=pmi2/poe
+elif test "${pamid_platform}" = "BGQ" ; then
+ MPID_DEFAULT_CROSS_FILE=${master_top_srcdir}/src/mpid/pamid/cross/bgq8
fi
MPID_DEVICE_TIMER_TYPE=double
http://git.mpich.org/mpich.git/commitdiff/6f062ee4ad1897ed9ed272c4b3a14aa4aca4fb42
commit 6f062ee4ad1897ed9ed272c4b3a14aa4aca4fb42
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed May 22 10:11:08 2013 -0500
Use the host tuple to determine the pamid implementation if not specified.
When configuring for bgq, the cross compile must be specified which can
then be used as the default pamid implementation.
--host=powerpc64-bgq-linux
--target=powerpc64-bgq-linux
--with-device=pamid
Previously, the device was required to be:
--with-device=pamid:BGQ
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index a845202..d9db274 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -40,6 +40,13 @@ dnl AM_CONDITIONAL([BUILD_CH3_UTIL_FTB],[test "x$enable_ftb" = "xyes"])
AM_COND_IF([BUILD_PAMID],[
pamid_platform=${device_args}
+if test x"$pamid_platform" == "x"; then
+ AS_CASE([$host],
+ [*-bgq-*],[pamid_platform=BGQ])
+fi
+
+AC_MSG_NOTICE([Using the pamid platform '$pamid_platform'])
+
# Set a value for the maximum processor name.
MPID_MAX_PROCESSOR_NAME=128
http://git.mpich.org/mpich.git/commitdiff/35ddb43264e20c1c39e2c09f95d4331ee46b8f77
commit 35ddb43264e20c1c39e2c09f95d4331ee46b8f77
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed May 22 10:06:11 2013 -0500
Repair the bgq system software search logic
The '--with-bgq-install-dir' will no longer be required for a default
bgq configure as the search logic will now choose an appropriate
install.
diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4
index 57ef840..a845202 100644
--- a/src/mpid/pamid/subconfigure.m4
+++ b/src/mpid/pamid/subconfigure.m4
@@ -96,13 +96,15 @@ AC_SUBST(BGQ_INSTALL_DIR)
#
if test "${pamid_platform}" = "BGQ" ; then
+ AC_MSG_CHECKING([for BGQ system software directory])
+
#
# Specify the default bgq system software paths
#
- bgq_driver_search_path="${BGQ_INSTALL_DIR} /bgsys/drivers/ppcfloor "
- for bgq_version in `echo 1 2 3 4`; do
- for bgq_release in `echo 1 2 3 4`; do
- for bgq_mod in `echo 0 1 2 3 4`; do
+ bgq_driver_search_path="${BGQ_INSTALL_DIR} "
+ for bgq_version in `echo 4 3 2 1`; do
+ for bgq_release in `echo 4 3 2 1`; do
+ for bgq_mod in `echo 4 3 2 1 0`; do
bgq_driver_search_path+="/bgsys/drivers/V${bgq_version}R${bgq_release}M${bgq_mod}/ppc64 "
done
done
@@ -149,6 +151,12 @@ if test "${pamid_platform}" = "BGQ" ; then
fi
done
+ if test x"$bgq_driver" != "x"; then
+ AC_MSG_RESULT('$bgq_driver')
+ else
+ AC_MSG_RESULT('no')
+ fi
+
#
# The bgq compile requires these libraries.
#
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 23 ++++++++++++-----------
src/mpid/pamid/cross/{pe4 => pe4-aix} | 3 ++-
src/mpid/pamid/cross/{pe4 => pe8-aix} | 7 ++++---
src/mpid/pamid/subconfigure.m4 | 26 ++++++++++++++++++++++----
4 files changed, 40 insertions(+), 19 deletions(-)
copy src/mpid/pamid/cross/{pe4 => pe4-aix} (93%)
copy src/mpid/pamid/cross/{pe4 => pe8-aix} (87%)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list