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 beac0a936b294c39385814ea93640953ae732cd8 (commit) via 3f1080e7ce4070f129afd320111023fc361c7215 (commit) via a4041b98adc9e57d27a96adc8c162327ccc946fb (commit) via 8927c1b1ab0a66b18c78873bd043b628ac0e0726 (commit) from 399b6b866d36494a2732e39fe77a754cf196233c (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/beac0a936b294c39385814ea93640953ae... commit beac0a936b294c39385814ea93640953ae732cd8 Author: Pavan Balaji <[email protected]> Date: Thu Oct 3 03:20:54 2013 -0500 Update libmpich ABI string for the 3.1b2 release. The ABI is broken from the changes contributed by Intel. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/maint/version.m4 b/maint/version.m4 index 4f106a7..a6fad3a 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -31,6 +31,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # # 4. If any interfaces have been removed since the last public # release, then set age to 0. -m4_define([libmpich_so_version_m4],[10:6:0])dnl +m4_define([libmpich_so_version_m4],[11:0:0])dnl [#] end of __file__ http://git.mpich.org/mpich.git/commitdiff/3f1080e7ce4070f129afd320111023fc36... commit 3f1080e7ce4070f129afd320111023fc361c7215 Author: Pavan Balaji <[email protected]> Date: Sun Sep 22 22:39:09 2013 -0500 Fortran ABI changes from Intel. This is a part of the contribution from Intel to update mpich's ABI to match that of Intel MPI's previous versions. Signed-off-by: William Gropp <[email protected]> diff --git a/src/binding/f77/buildiface b/src/binding/f77/buildiface index fe25571..1d8cf1b 100755 --- a/src/binding/f77/buildiface +++ b/src/binding/f77/buildiface @@ -4195,19 +4195,18 @@ if ($write_mpif) { # non-character data) print MPIFFD "\ - CHARACTER*1 PADS_A(3), PADS_B(3) - COMMON /MPIFCMB1/ MPI_STATUS_IGNORE - COMMON /MPIFCMB2/ MPI_STATUSES_IGNORE - COMMON /MPIFCMB3/ MPI_BOTTOM - COMMON /MPIFCMB4/ MPI_IN_PLACE COMMON /MPIFCMB5/ MPI_UNWEIGHTED - COMMON /MPIFCMB6/ MPI_ERRCODES_IGNORE - COMMON /MPIFCMB7/ MPI_ARGVS_NULL, PADS_A - COMMON /MPIFCMB8/ MPI_ARGV_NULL, PADS_B COMMON /MPIFCMB9/ MPI_WEIGHTS_EMPTY - SAVE /MPIFCMB1/,/MPIFCMB2/ - SAVE /MPIFCMB3/,/MPIFCMB4/,/MPIFCMB5/,/MPIFCMB6/ - SAVE /MPIFCMB7/,/MPIFCMB8/,/MPIFCMB9/\n"; + SAVE /MPIFCMB5/ + SAVE /MPIFCMB9/ + + COMMON /MPIPRIV1/ MPI_BOTTOM, MPI_IN_PLACE, MPI_STATUS_IGNORE + + COMMON /MPIPRIV2/ MPI_STATUSES_IGNORE, MPI_ERRCODES_IGNORE + SAVE /MPIPRIV1/,/MPIPRIV2/ + + COMMON /MPIPRIVC/ MPI_ARGVS_NULL, MPI_ARGV_NULL + SAVE /MPIPRIVC/\n"; close( MPIFFD ); &ReplaceIfDifferent( "mpif.h.in", "mpif.h.in.new" ); diff --git a/src/binding/f77/setbotf.f.in b/src/binding/f77/setbotf.f.in index 3053acf..893c5a4 100644 --- a/src/binding/f77/setbotf.f.in +++ b/src/binding/f77/setbotf.f.in @@ -12,19 +12,15 @@ C BOTTOM, IN_PLACE, UNWEIGHTED, ERRCODES_IGNORE integer bt, ip, uw, ecsi(1) C ARGVS_NULL, ARGV_NULL character*1 asn(1,1), an(1) - character*1 pads_a(3), pads_b(3) - common /MPIFCMB1/ si - common /MPIFCMB2/ ssi - common /MPIFCMB3/ bt - common /MPIFCMB4/ ip common /MPIFCMB5/ uw - common /MPIFCMB6/ ecsi - common /MPIFCMB7/ asn, pads_a - common /MPIFCMB8/ an, pads_b common /MPIFCMB9/ we - save /MPIFCMB1/,/MPIFCMB2/ - save /MPIFCMB3/,/MPIFCMB4/,/MPIFCMB5/,/MPIFCMB6/ - save /MPIFCMB7/,/MPIFCMB8/,/MPIFCMB9/ + common /MPIPRIV1/ bt, ip, si + common /MPIPRIV2/ ssi, ecsi + common /MPIPRIVC/ asn, an + save /MPIFCMB5/ + save /MPIFCMB9/ + save /MPIPRIV1/, /MPIPRIV2/ + save /MPIPRIVC/ C MPI_ARGVS_NULL C (Fortran requires character data in a separate common block) call mpirinitc(si, ssi, bt, ip, uw, ecsi, asn, we) http://git.mpich.org/mpich.git/commitdiff/a4041b98adc9e57d27a96adc8c162327cc... commit a4041b98adc9e57d27a96adc8c162327ccc946fb Author: Pavan Balaji <[email protected]> Date: Sun Sep 22 22:12:57 2013 -0500 Renumber MPI_COMBINER constants to maintain ABI. The numbering of MPI_COMBINER constants was changed when we added MPI-2.2 support. This patch reverts that numbering and adds the MPI-2.2 specific combiners to the end, to maintain ABI compatibility with older mpich releases. An initial version of this patch was contributed by Intel. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 923df8d..6d4bf3b 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -493,15 +493,15 @@ enum MPIR_Combiner_enum { MPI_COMBINER_HINDEXED_INTEGER = 8, MPI_COMBINER_HINDEXED = 9, MPI_COMBINER_INDEXED_BLOCK = 10, - MPI_COMBINER_HINDEXED_BLOCK = 11, - MPI_COMBINER_STRUCT_INTEGER = 12, - MPI_COMBINER_STRUCT = 13, - MPI_COMBINER_SUBARRAY = 14, - MPI_COMBINER_DARRAY = 15, - MPI_COMBINER_F90_REAL = 16, - MPI_COMBINER_F90_COMPLEX = 17, - MPI_COMBINER_F90_INTEGER = 18, - MPI_COMBINER_RESIZED = 19 + MPI_COMBINER_STRUCT_INTEGER = 11, + MPI_COMBINER_STRUCT = 12, + MPI_COMBINER_SUBARRAY = 13, + MPI_COMBINER_DARRAY = 14, + MPI_COMBINER_F90_REAL = 15, + MPI_COMBINER_F90_COMPLEX = 16, + MPI_COMBINER_F90_INTEGER = 17, + MPI_COMBINER_RESIZED = 18, + MPI_COMBINER_HINDEXED_BLOCK = 19 }; /* for info */ http://git.mpich.org/mpich.git/commitdiff/8927c1b1ab0a66b18c78873bd043b628ac... commit 8927c1b1ab0a66b18c78873bd043b628ac0e0726 Author: Pavan Balaji <[email protected]> Date: Sat Sep 21 11:19:39 2013 -0500 Change the MPI_MAX_ERROR_STRING back to 512. This was changed to 1024 to give space for larger error strings. But this caused an ABI breakage for a number of MPICH partners. This patch reverts the size back the size to what we had in older mpich releases. An initial version of this patch was contributed by Intel. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/configure.ac b/configure.ac index 3c6de02..8d11040 100644 --- a/configure.ac +++ b/configure.ac @@ -5990,7 +5990,7 @@ AC_SUBST(MPI_MAX_LIBRARY_VERSION_STRING) # Get the value of MPI_MAX_ERROR_STRING if test -z "$MPID_MAX_ERROR_STRING" ; then if test -z "$MPI_MAX_ERROR_STRING" ; then - MPI_MAX_ERROR_STRING=1024 + MPI_MAX_ERROR_STRING=512 fi AC_MSG_WARN([The $with_device device did not set the maximum size of an error string, $MPI_MAX_ERROR_STRING being used.]) else diff --git a/src/mpid/ch3/subconfigure.m4 b/src/mpid/ch3/subconfigure.m4 index f90cc94..461a884 100644 --- a/src/mpid/ch3/subconfigure.m4 +++ b/src/mpid/ch3/subconfigure.m4 @@ -19,9 +19,6 @@ AM_COND_IF([BUILD_CH3],[ # Set a value for the maximum processor name. MPID_MAX_PROCESSOR_NAME=128 -# Set a value for the maximum error string. -MPID_MAX_ERROR_STRING=1024 - # code that formerly lived in setup_device.args if test -z "${device_args}" ; then device_args="nemesis" ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- maint/version.m4 | 2 +- src/binding/f77/buildiface | 21 ++++++++++----------- src/binding/f77/setbotf.f.in | 18 +++++++----------- src/include/mpi.h.in | 18 +++++++++--------- src/mpid/ch3/subconfigure.m4 | 3 --- 6 files changed, 28 insertions(+), 36 deletions(-) hooks/post-receive -- MPICH primary repository