February 2014 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1-2-gd5b73df
by noreply＠mpich.org 20 Feb '14

20 Feb '14

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 d5b73dfd501b59baecb718dfbe7c09b632ed1e2a (commit) via df03ffd5bb1387633e9d53016bd60a9034d8bc40 (commit) from 82f13590e34c406d76fc6ce6648cefa8d708d300 (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/d5b73dfd501b59baecb718dfbe7c09b63… commit d5b73dfd501b59baecb718dfbe7c09b632ed1e2a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Tue Feb 18 15:58:15 2014 -0600 Added a new test for Reduce_scatter_block in C++. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/test/mpi/cxx/coll/Makefile.am b/test/mpi/cxx/coll/Makefile.am index 2bd72a9..a2723b0 100644 --- a/test/mpi/cxx/coll/Makefile.am +++ b/test/mpi/cxx/coll/Makefile.am @@ -28,7 +28,8 @@ noinst_PROGRAMS = \ icreducex \ icalltoallx \ alltoallw2x \ - reduceboolx + reduceboolx \ + redscatblk arcomplex_SOURCES = arcomplex.cxx uallredx_SOURCES = uallredx.cxx @@ -49,4 +50,4 @@ icreducex_SOURCES = icreducex.cxx icalltoallx_SOURCES = icalltoallx.cxx alltoallw2x_SOURCES = alltoallw2x.cxx reduceboolx_SOURCES = reduceboolx.cxx - +redscatblk_SOURCES = redscatblk.cxx diff --git a/test/mpi/cxx/coll/redscatblk.cxx b/test/mpi/cxx/coll/redscatblk.cxx new file mode 100644 index 0000000..edfa71f --- /dev/null +++ b/test/mpi/cxx/coll/redscatblk.cxx @@ -0,0 +1,75 @@ +/* -*- Mode: C++; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +/* + * Test of reduce scatter with large data (needed in MPICH to trigger the + * long-data algorithm) + * + * Each processor contributes its rank + the index to the reduction, + * then receives the ith sum + * + * Can be called with any number of processors. + */ + +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> + +int main(int argc, char **argv) +{ + int err = 0; + int *sendbuf, *recvbuf; + int size, rank, i, j, idx, mycount, sumval; + + MPI::Init(); + + size = MPI::COMM_WORLD.Get_size(); + rank = MPI::COMM_WORLD.Get_rank(); + + mycount = (1024 * 1024) / size; + + sendbuf = new int[mycount * size]; + idx = 0; + for (i = 0; i < size; i++) { + for (j = 0; j < mycount; j++) { + sendbuf[idx++] = rank + i; + } + } + recvbuf = new int[mycount]; + + MPI::COMM_WORLD.Reduce_scatter_block(sendbuf, recvbuf, mycount, MPI::INT, MPI::SUM); + + sumval = size * rank + ((size - 1) * size) / 2; + /* recvbuf should be size * (rank + i) */ + for (i = 0; i < mycount; i++) { + if (recvbuf[i] != sumval) { + err++; + fprintf(stdout, "Did not get expected value for reduce scatter\n"); + fprintf(stdout, "[%d] Got %d expected %d\n", rank, recvbuf[i], sumval); + } + } + + MPI::COMM_WORLD.Reduce_scatter_block(MPI_IN_PLACE, sendbuf, mycount, MPI::INT, MPI::SUM); + + sumval = size * rank + ((size - 1) * size) / 2; + /* recv'ed values for my process should be size * (rank + i) */ + for (i = 0; i < mycount; i++) { + if (sendbuf[rank * mycount + i] != sumval) { + err++; + fprintf(stdout, "Did not get expected value for reduce scatter (in place)\n"); + fprintf(stdout, "[%d] Got %d expected %d\n", rank, sendbuf[rank * mycount + i], sumval); + } + } + + delete [] sendbuf; + delete [] recvbuf; + + MPI_Finalize(); + + if (err == 0 && rank == 0) + printf(" No Errors\n"); + + return 0; +} diff --git a/test/mpi/cxx/coll/testlist b/test/mpi/cxx/coll/testlist index cf7f7bf..2c0b9e1 100644 --- a/test/mpi/cxx/coll/testlist +++ b/test/mpi/cxx/coll/testlist @@ -18,3 +18,4 @@ icgathervx 5 icscattervx 5 icalltoallx 5 reduceboolx 5 +redscatblk 4 mpiversion=2.2 http://git.mpich.org/mpich.git/commitdiff/df03ffd5bb1387633e9d53016bd60a903… commit df03ffd5bb1387633e9d53016bd60a9034d8bc40 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Fri Feb 14 13:23:24 2014 -0600 Remove MPIX_ usage for program internal function names. MPIX_ is used for non-MPI functionality exposed by MPICH. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/test/mpi/datatype/large_type_sendrec.c b/test/mpi/datatype/large_type_sendrec.c index f6500fb..4b56f37 100644 --- a/test/mpi/datatype/large_type_sendrec.c +++ b/test/mpi/datatype/large_type_sendrec.c @@ -18,7 +18,7 @@ #include <mpi.h> #include <assert.h> -static void MPIX_Verbose_abort(int errorcode) +static void verbose_abort(int errorcode) { /* We do not check error codes here * because if MPI is in a really sorry state, @@ -44,9 +44,9 @@ static void MPIX_Verbose_abort(int errorcode) return; } #define MPI_ASSERT(rc) \ - ((void) ((rc==MPI_SUCCESS) ? 0 : MPIX_Verbose_abort(rc) )) + ((void) ((rc==MPI_SUCCESS) ? 0 : verbose_abort(rc) )) -int MPIX_Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, +int Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, MPI_Datatype * newtype); #define BIGMPI_MAX INT_MAX @@ -54,7 +54,7 @@ int MPIX_Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, /* * Synopsis * - * int MPIX_Type_contiguous_x(MPI_Count count, + * int Type_contiguous_x(MPI_Count count, * MPI_Datatype oldtype, * MPI_Datatype * newtype) * @@ -68,7 +68,7 @@ int MPIX_Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, * newtype new datatype (handle) * */ -int MPIX_Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, MPI_Datatype * newtype) +int Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, MPI_Datatype * newtype) { MPI_Count c = count/BIGMPI_MAX; MPI_Count r = count%BIGMPI_MAX; @@ -116,7 +116,7 @@ int main(int argc, char * argv[]) size_t count = (size_t)1<<logn; /* explicit cast required */ MPI_Datatype bigtype; - MPI_ASSERT(MPIX_Type_contiguous_x( (MPI_Count)count, MPI_CHAR, &bigtype)); + MPI_ASSERT(Type_contiguous_x( (MPI_Count)count, MPI_CHAR, &bigtype)); MPI_ASSERT(MPI_Type_commit(&bigtype)); MPI_Request requests[2]; ----------------------------------------------------------------------- Summary of changes: test/mpi/cxx/coll/Makefile.am | 5 +- test/mpi/cxx/coll/redscatblk.cxx | 75 ++++++++++++++++++++++++++++++++ test/mpi/cxx/coll/testlist | 1 + test/mpi/datatype/large_type_sendrec.c | 12 +++--- 4 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 test/mpi/cxx/coll/redscatblk.cxx hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1, created. v3.1
by noreply＠mpich.org 20 Feb '14

20 Feb '14

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 annotated tag, v3.1 has been created at 2e375335bfa5c7e8b40cec2e817d2fefb1548a11 (tag) tagging 82f13590e34c406d76fc6ce6648cefa8d708d300 (commit) replaces v3.1rc4 tagged by Pavan Balaji on Thu Feb 20 11:39:41 2014 -0600 - Log ----------------------------------------------------------------- tagging v3.1 Ken Raffenetti (2): add missing copyright statements Update README with ABI compatibility info Pavan Balaji (5): Reorder C++ virtual functions to match Intel MPI. Better control virtual function ordering. Update version and ABI string for the mpich-3.1 release. Fix the git URL in the CHANGES file. Added a comment on process binding to CHANGES. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc4-7-g82f1359
by noreply＠mpich.org 20 Feb '14

20 Feb '14

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 82f13590e34c406d76fc6ce6648cefa8d708d300 (commit) via b5a9659920e8b5675b1ea87331af734441fb2d5c (commit) from d8ad5bd24d5d14a9e21449b6c4e63db5d926d37c (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/82f13590e34c406d76fc6ce6648cefa8d… commit 82f13590e34c406d76fc6ce6648cefa8d708d300 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Feb 20 00:21:27 2014 -0600 Added a comment on process binding to CHANGES. diff --git a/CHANGES b/CHANGES index 11b1a60..97e9947 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,10 @@ # Several improvements to the Hydra-SLURM integration. + # Several improvements to the Hydra process binding code. See the + Hydra wiki page for more information: + http://wiki.mpich.org/mpich/index.php/Using_the_Hydra_Process_Manager + # MPICH now supports operations on very large datatypes (those that describe more than 32 bits of data). This work also allows MPICH to fully support MPI-3's introduction of MPI_Count. http://git.mpich.org/mpich.git/commitdiff/b5a9659920e8b5675b1ea87331af73444… commit b5a9659920e8b5675b1ea87331af734441fb2d5c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Feb 20 00:20:11 2014 -0600 Fix the git URL in the CHANGES file. diff --git a/CHANGES b/CHANGES index ffb2ca8..11b1a60 100644 --- a/CHANGES +++ b/CHANGES @@ -41,7 +41,7 @@ A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1rc4 + http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1 A full list of bugs that have been fixed is available at the following link: ----------------------------------------------------------------------- Summary of changes: CHANGES | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1, deleted. v3.1rc4-5-gd8ad5bd
by noreply＠mpich.org 20 Feb '14

20 Feb '14

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 annotated tag, v3.1 has been deleted was 148243e810a326de687a6fe42e3f6a97ff82445c ----------------------------------------------------------------------- tag v3.1 tagging v3.1 d8ad5bd24d5d14a9e21449b6c4e63db5d926d37c Update version and ABI string for the mpich-3.1 release. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1, created. v3.1
by noreply＠mpich.org 19 Feb '14

19 Feb '14

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 annotated tag, v3.1 has been created at 148243e810a326de687a6fe42e3f6a97ff82445c (tag) tagging d8ad5bd24d5d14a9e21449b6c4e63db5d926d37c (commit) replaces v3.1rc4 tagged by Pavan Balaji on Wed Feb 19 17:53:38 2014 -0600 - Log ----------------------------------------------------------------- tagging v3.1 Ken Raffenetti (2): add missing copyright statements Update README with ABI compatibility info Pavan Balaji (3): Reorder C++ virtual functions to match Intel MPI. Better control virtual function ordering. Update version and ABI string for the mpich-3.1 release. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc4-5-gd8ad5bd
by noreply＠mpich.org 19 Feb '14

19 Feb '14

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 d8ad5bd24d5d14a9e21449b6c4e63db5d926d37c (commit) from d5822be073237589fbb2c9670e94420bdfd63cbf (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/d8ad5bd24d5d14a9e21449b6c4e63db5d… commit d8ad5bd24d5d14a9e21449b6c4e63db5d926d37c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Wed Feb 19 17:34:00 2014 -0600 Update version and ABI string for the mpich-3.1 release. The C++ virtual function ordering was changed, thus breaking ABI. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/maint/version.m4 b/maint/version.m4 index 2c89d00..eaf0221 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.1rc4])dnl +m4_define([MPICH_VERSION_m4],[3.1])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: @@ -35,6 +35,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # libmpich so version only includes functionality defined in the MPI # standard, and does not include MPIX_ functions and C++ bindings. -m4_define([libmpich_so_version_m4],[11:3:0])dnl +m4_define([libmpich_so_version_m4],[12:0:0])dnl [#] end of __file__ ----------------------------------------------------------------------- Summary of changes: maint/version.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc4-4-gd5822be
by noreply＠mpich.org 19 Feb '14

19 Feb '14

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 d5822be073237589fbb2c9670e94420bdfd63cbf (commit) from bc39d1b02dec4719db957286fb17f3730100da8e (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/d5822be073237589fbb2c9670e94420bd… commit d5822be073237589fbb2c9670e94420bdfd63cbf Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Feb 19 13:27:35 2014 -0600 Update README with ABI compatibility info Provide some guidance on how to run MPICH programs using Intel's MPI package and vice-versa. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> (includes some clarifications to the text from Pavan Balaji). diff --git a/README.vin b/README.vin index a343d0f..cf23510 100644 --- a/README.vin +++ b/README.vin @@ -26,6 +26,7 @@ information on bug fixes and new releases. 8. Fault Tolerance 9. Developer Builds 10. Multiple Fortran compiler support +11. ABI Compatibility ------------------------------------------------------------------------- @@ -788,3 +789,80 @@ Fortran program compiled/linked by another fortran compiler, say pgf77, say through mpif77 -f77=pgf77. As long as the Fortran program is linked without any errors by one of these compilers, the program shall be running fine. + +------------------------------------------------------------------------- + +11. ABI Compatibility +===================== + +The MPICH ABI compatibility initiative was announced at SC 2014 +(http://www.mpich.org/abi). As a part of this initiative, Argonne, +Intel, IBM and Cray, have committed to maintaining ABI compatibility +with each other. + +As a first step in this initiative, starting with version 3.1, MPICH +is binary (ABI) compatible with Intel MPI 5.0. This means you can +build your program with one MPI implementation and run with the other. +Specifically, binary-only applications that were built and distributed +with one of these MPI implementations and now be executed with the +other MPI implementation. + +Some setup is required to achieve this. Below details how to +accomplish this. + +To run an MPICH-built program with Intel: +---------------------------------------- + +1. The current MPI library names do not currently match. This is + planned to be fixed in the future, but for now, you need to employ + some symbolic links in order for the linker to find the necessary + libraries correctly. We recommend doing this in a separate + directory. + + For applications built with the default Intel MPI configuration: + + ln -s /path/to/intel/lib/libmpi.so libmpich.so.12 + ln -s /path/to/intel/lib/libmpigc4.so libmpichcxx.so.12 + ln -s /path/to/intel/lib/libmpigf.so libfmpich.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpichf90.so.12 + ln -s /path/to/intel/lib/libmpi.so libmpl.so.1 + ln -s /path/to/intel/lib/libmpi.so libopa.so.1 + + For applications built with the debug configuration of Intel MPI: + + ln -s /path/to/intel/lib/libmpi_dbg.so libmpich.so.12 + ln -s /path/to/intel/lib/libmpigc4.so libmpichcxx.so.12 + ln -s /path/to/intel/lib/libmpigf.so libfmpich.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpichf90.so.12 + ln -s /path/to/intel/lib/libmpi_dbg.so libmpl.so.1 + ln -s /path/to/intel/lib/libmpi_dbg.so libopa.so.1 + +2. Add directory to LD_LIBRARY_PATH + + export LD_LIBRARY_PATH=/path/to/symlinks:$LD_LIBRARY_PATH + +3. For Fortran programs, you must also modify LD_PRELOAD + + export LD_PRELOAD=/path/to/intel/lib/libmpi.so:/path/to/intel/lib/libmpigf.so:$LD_PRELOAD + +4. Run your program + + /path/to/intel/bin/mpiexec <mpi_program> + +To run an Intel-built program with MPICH: +---------------------------------------- + +1. Create symlinks + + ln -s /path/to/mpich/lib/libmpich.so libmpi.so.5 + ln -s /path/to/mpich/lib/libmpich.so libmpi_dbg.so.5 + ln -s /path/to/mpich/lib/libmpichcxx.so libmpigc4.so.5 + ln -s /path/to/mpich/lib/libmpichf90.so libmpigf.so.5 + +2. Modify LD_LIBRARY_PATH + + export LD_LIBRARY_PATH=/path/to/symlinks:$LD_LIBRARY_PATH + +3. Run your program + + /path/to/mpich/bin/mpiexec <mpi_program> ----------------------------------------------------------------------- Summary of changes: README.vin | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc4-3-gbc39d1b
by noreply＠mpich.org 19 Feb '14

19 Feb '14

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 bc39d1b02dec4719db957286fb17f3730100da8e (commit) from e7cef017d770711afd152c3899602c9d58a5c392 (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/bc39d1b02dec4719db957286fb17f3730… commit bc39d1b02dec4719db957286fb17f3730100da8e Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Feb 17 09:00:11 2014 -0600 add missing copyright statements Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpi/debugger/allcommdbg.c b/src/mpi/debugger/allcommdbg.c index f723257..a7a2cdd 100644 --- a/src/mpi/debugger/allcommdbg.c +++ b/src/mpi/debugger/allcommdbg.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2012 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "mpi.h" #include <stdio.h> diff --git a/src/mpi/romio/adio/ad_bglockless/ad_bglockless_features.c b/src/mpi/romio/adio/ad_bglockless/ad_bglockless_features.c index 5e78f80..784f726 100644 --- a/src/mpi/romio/adio/ad_bglockless/ad_bglockless_features.c +++ b/src/mpi/romio/adio/ad_bglockless/ad_bglockless_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ /* begin_generated_IBM_copyright_prolog */ /* */ /* This is an automatically generated copyright prolog. */ diff --git a/src/mpi/romio/adio/ad_gridftp/ad_gridftp_features.c b/src/mpi/romio/adio/ad_gridftp/ad_gridftp_features.c index 6eea527..cbdc395 100644 --- a/src/mpi/romio/adio/ad_gridftp/ad_gridftp_features.c +++ b/src/mpi/romio/adio/ad_gridftp/ad_gridftp_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ int ADIOI_GRIDFTP_Feature (ADIO_File fd, int flag) { switch(flag) { diff --git a/src/mpi/romio/adio/ad_nfs/ad_nfs_features.c b/src/mpi/romio/adio/ad_nfs/ad_nfs_features.c index 1491806..5fb42da 100644 --- a/src/mpi/romio/adio/ad_nfs/ad_nfs_features.c +++ b/src/mpi/romio/adio/ad_nfs/ad_nfs_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "adio.h" #include "ad_nfs.h" diff --git a/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c b/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c index 691c224..335b5ae 100644 --- a/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c +++ b/src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "adio.h" int ADIOI_NTFS_Feature(ADIO_File fd, int flag) diff --git a/src/mpi/romio/adio/ad_piofs/ad_piofs_features.c b/src/mpi/romio/adio/ad_piofs/ad_piofs_features.c index 11b17bf..f3b0df6 100644 --- a/src/mpi/romio/adio/ad_piofs/ad_piofs_features.c +++ b/src/mpi/romio/adio/ad_piofs/ad_piofs_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ int ADIOI_PIOFS_Features(int flag) { switch(flag) { diff --git a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_features.c b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_features.c index 71d99e6..3ce72f3 100644 --- a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_features.c +++ b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "adio.h" #include "ad_pvfs2.h" diff --git a/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_features.c b/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_features.c index 892e4ca..a3f5c14 100644 --- a/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_features.c +++ b/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "adio.h" #include "ad_zoidfs.h" diff --git a/src/mpi/romio/adio/common/ad_features.c b/src/mpi/romio/adio/common/ad_features.c index 5be6cb3..571f2a5 100644 --- a/src/mpi/romio/adio/common/ad_features.c +++ b/src/mpi/romio/adio/common/ad_features.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "adio.h" int ADIOI_GEN_Feature(ADIO_File fd, int flag) diff --git a/src/mpi/romio/test-internal/heap_test.c b/src/mpi/romio/test-internal/heap_test.c index c47b538..2f0041d 100644 --- a/src/mpi/romio/test-internal/heap_test.c +++ b/src/mpi/romio/test-internal/heap_test.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #include "../adio/include/heap-sort.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/mpi/romio/test/hindexed.c b/src/mpi/romio/test/hindexed.c index 796c825..ebc0ae8 100644 --- a/src/mpi/romio/test/hindexed.c +++ b/src/mpi/romio/test/hindexed.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2008 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ /* Wei-keng Liao (wkliao(a)ece.northwestern.edu) September 8, 2008 */ #include <stdio.h> #include <stdlib.h> diff --git a/src/pm/hydra/examples/print_cpus_allowed.c b/src/pm/hydra/examples/print_cpus_allowed.c index 9e5b6f2..0534e03 100644 --- a/src/pm/hydra/examples/print_cpus_allowed.c +++ b/src/pm/hydra/examples/print_cpus_allowed.c @@ -1,3 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ #define PATH_MAX 1000 #include "mpi.h" diff --git a/test/mpi/f77/profile/profile1f.f b/test/mpi/f77/profile/profile1f.f index f3e4af8..a055a92 100644 --- a/test/mpi/f77/profile/profile1f.f +++ b/test/mpi/f77/profile/profile1f.f @@ -1,3 +1,8 @@ +C -*- Mode: Fortran; -*- +C +C (C) 2013 by Argonne National Laboratory. +C See COPYRIGHT in top-level directory. +C program main include "mpif.h" integer ierr diff --git a/test/mpi/manual/mpi_t/mpit_test.c b/test/mpi/manual/mpi_t/mpit_test.c index 596f2fa..28db9ca 100644 --- a/test/mpi/manual/mpi_t/mpit_test.c +++ b/test/mpi/manual/mpi_t/mpit_test.c @@ -1,23 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ /* - * Copyright (c) 2011 by Argonne National Laboratory * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. + * (C) 2011 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. */ /* A simple test of the proposed MPI_T_ interface that queries all of diff --git a/test/mpi/manual/mpi_t/mpit_test2.c b/test/mpi/manual/mpi_t/mpit_test2.c index 656cc59..7ff6d1f 100644 --- a/test/mpi/manual/mpi_t/mpit_test2.c +++ b/test/mpi/manual/mpi_t/mpit_test2.c @@ -1,23 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ /* - * Copyright (c) 2011 by Argonne National Laboratory * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. + * (C) 2011 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. */ /* A simple test of the proposed MPI_T_ interface that assumes the ----------------------------------------------------------------------- Summary of changes: src/mpi/debugger/allcommdbg.c | 6 +++++ .../adio/ad_bglockless/ad_bglockless_features.c | 6 +++++ .../romio/adio/ad_gridftp/ad_gridftp_features.c | 6 +++++ src/mpi/romio/adio/ad_nfs/ad_nfs_features.c | 6 +++++ src/mpi/romio/adio/ad_ntfs/ad_ntfs_feature.c | 6 +++++ src/mpi/romio/adio/ad_piofs/ad_piofs_features.c | 6 +++++ src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_features.c | 6 +++++ src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_features.c | 6 +++++ src/mpi/romio/adio/common/ad_features.c | 6 +++++ src/mpi/romio/test-internal/heap_test.c | 6 +++++ src/mpi/romio/test/hindexed.c | 6 +++++ src/pm/hydra/examples/print_cpus_allowed.c | 6 +++++ test/mpi/f77/profile/profile1f.f | 5 ++++ test/mpi/manual/mpi_t/mpit_test.c | 21 ++----------------- test/mpi/manual/mpi_t/mpit_test2.c | 21 ++----------------- 15 files changed, 83 insertions(+), 36 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc4-2-ge7cef01
by noreply＠mpich.org 19 Feb '14

19 Feb '14

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 e7cef017d770711afd152c3899602c9d58a5c392 (commit) via f3f022b4243df40a038835990568125be41a9b29 (commit) from 09b425c7ffd1767db5e5f942fa4294ad5d5a1d17 (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/e7cef017d770711afd152c3899602c9d5… commit e7cef017d770711afd152c3899602c9d58a5c392 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Wed Feb 19 00:34:08 2014 -0600 Better control virtual function ordering. Allow some virtual functions to be placed at the end, so it matches the layout of the Intel MPI header. This should make our output file nearly identical to that of Intel MPI. All virtual functions should be exactly ordered. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/cxx/buildiface b/src/binding/cxx/buildiface index 88ee212..5fa6310 100755 --- a/src/binding/cxx/buildiface +++ b/src/binding/cxx/buildiface @@ -84,7 +84,7 @@ $indent = " "; $print_line_len = 0; $gDebug = 0; $gDebugRoutine = "NONE"; -@mpilevels = ( 'mpi1' , 'mpi2' ); +@mpilevels = ( 'mpi1' , 'mpi2', 'post' ); # feature variables (for the -feature commandline option) $do_subdecls = 1; @@ -457,12 +457,13 @@ $specialReturnType{"intra-Dup"} = "Intracomm"; 'Delete_attr' => '0', # 'Create_keyval' => 'int', 'Free_keyval' => 'static:0:1', - 'Call_errhandler' => '0', 'Set_name' => '0:2', 'Get_name' => '0:3', 'Disconnect' => '0', 'Get_parent' => 'static:0;Intercomm', ); +%class_postcomm = ( 'Call_errhandler' => '0', + ); %class_mpi2cart = (); %class_mpi2dtype = ( 'Set_name' => '0:2', 'Get_name' => '0:3', @@ -585,7 +586,8 @@ if ($build_io) { 'Sync' => '0', 'Get_errhandler' => 'MPI_Errhandler', 'Set_errhandler' => '0', - 'Call_errhandler' => '0', + ); + %class_postfile = ( 'Call_errhandler' => '0', ); # %class_mpi2file = ( # 'File_open' => 'static:MPI_File:2', @@ -649,7 +651,6 @@ if ($build_io) { 'Free' => '0', 'Fence' => '0', 'Get_group' => 'MPI_Group', - 'Call_errhandler' => 0, 'Get_attr' => '0', 'Start' => '0', 'Complete' => '0', @@ -665,6 +666,8 @@ if ($build_io) { 'Delete_attr' => '0', 'Free_keyval' => 'static:0:1', ); +%class_postwin = ( 'Call_errhandler' => 0, + ); %class_mpi2info = ( 'Create' => 'static:1', 'Set' => '0:2:3', 'Delete' => '0:2', @@ -1228,6 +1231,7 @@ print $OUTFD "extern File FILE_NULL;\n"; # Build the routines by class foreach $class (@classes) { + my $printed_extra_fnc = 0; $shortclass = $class; $Class = $fullclassname{$class}; #$mpi_type = $class_type{$class}; @@ -1253,6 +1257,14 @@ typedef int MPI_File;\ } foreach $mpilevel (@mpilevels) { + if ($mpilevel eq "post") { + $printed_extra_fnc = 1; + if (defined($class_extra_fnc{$class})) { + $extrafnc = $class_extra_fnc{$class}; + &$extrafnc( $OUTFD ); + } + } + $mpiclass = "$mpilevel$class"; $class_hash = "class_$mpiclass"; @routines = keys(%$class_hash); @@ -1286,7 +1298,7 @@ typedef int MPI_File;\ close (FD); } } - if (defined($class_extra_fnc{$class})) { + if (defined($class_extra_fnc{$class}) && !$printed_extra_fnc) { $extrafnc = $class_extra_fnc{$class}; &$extrafnc( $OUTFD ); } @@ -5016,8 +5028,14 @@ sub ReadFuncSpec { } # Handle special cases if (/<(\w*)>/) { + my $match = 0; $mpilevel = $1; - if ($mpilevel ne "mpi1" && $mpilevel ne "mpi2") { + foreach $level (@mpilevels) { + if ($mpilevel eq $level) { + $match = 1; + } + } + if (!$match) { print STDERR "Unrecognized MPI level $mpilevel\n"; } next; diff --git a/src/binding/cxx/cxx.vlist b/src/binding/cxx/cxx.vlist index 191c85d..0785455 100644 --- a/src/binding/cxx/cxx.vlist +++ b/src/binding/cxx/cxx.vlist @@ -170,6 +170,8 @@ "Scatterv", "Get_name", "Allgatherv", +); +@routinespostcomm = ( "Call_errhandler", "Reduce_scatter_block", ); @@ -257,6 +259,8 @@ "Write_ordered_end", "Write", "Get_atomicity", +); +@routinespostfile = ( "Call_errhandler", ); @routinesmpi2greq = ( @@ -315,5 +319,7 @@ "Lock", "Get_errhandler", "Get_name", +); +@routinespostwin = ( "Call_errhandler", ); diff --git a/src/binding/cxx/cxxdecl3.dat b/src/binding/cxx/cxxdecl3.dat index 845a6ce..9cbf2f9 100644 --- a/src/binding/cxx/cxxdecl3.dat +++ b/src/binding/cxx/cxxdecl3.dat @@ -2,6 +2,8 @@ # by using the perl script cxxtodecl. However, that script cannot # handle every feature of the bindings, so the final changes # were made by hand. +<post> +comm-Reduce_scatter_block void (in:const , , ,in:constref:Datatype ,in:constref:Op, ) const <mpi2> -Alloc_mem void* ( ,in:constref:Info ,return) dtype-Create_darray Datatype (, , ,in:const ,in:const ,in:const ,in:const , , ,return) const @@ -73,7 +75,6 @@ comm-Gather void (in:const , ,in:constref:Datatype , , ,in:constref:Datatype , ) comm-Gatherv void (in:const , ,in:constref:Datatype , ,in:const ,in:const ,in:constref:Datatype , ) const comm-Reduce void (in:const , , ,in:constref:Datatype ,in:constref:Op , ) const comm-Reduce_scatter void (in:const , , ,in:constref:Datatype ,in:constref:Op, ) const -comm-Reduce_scatter_block void (in:const , , ,in:constref:Datatype ,in:constref:Op, ) const comm-Scatter void (in:const , ,in:constref:Datatype , , ,in:constref:Datatype , ) const comm-Scatterv void (in:const ,in:const ,in:const ,in:constref:Datatype , , ,in:constref:Datatype , ) const # FIXME: this entry confuses buildiface, which groups it with http://git.mpich.org/mpich.git/commitdiff/f3f022b4243df40a038835990568125be… commit f3f022b4243df40a038835990568125be41a9b29 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Tue Feb 18 14:11:27 2014 -0600 Reorder C++ virtual functions to match Intel MPI. This patch breaks ABI compatibility between this and older versions of MPICH, but is needed to get MPICH closer to the ABI compatibility initiative with Intel, IBM and Cray. This patch does not make the resultant mpicxx.h exactly the same as what Intel MPI ships, but most of the publicly exposed virtual functions should be in order. The remaining functions that are out-of-order are Reduce_scatter_block and Call_errhandler for communicators, which are placed after the internal Clone function. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/cxx/cxx.vlist b/src/binding/cxx/cxx.vlist index 1d436d3..191c85d 100644 --- a/src/binding/cxx/cxx.vlist +++ b/src/binding/cxx/cxx.vlist @@ -147,7 +147,6 @@ "Is_thread_main", ); @routinesmpi2comm = ( - "Reduce_scatter_block", "Gatherv", "Disconnect", "Allreduce", @@ -163,7 +162,6 @@ "Alltoallv", "Reduce_scatter", "Scatter", - "Call_errhandler", "Gather", "Free_keyval", "Reduce", @@ -172,6 +170,8 @@ "Scatterv", "Get_name", "Allgatherv", + "Call_errhandler", + "Reduce_scatter_block", ); @routinesmpi2distgraph = ( "Get_dist_neighbors", @@ -226,7 +226,6 @@ "Write_shared", "Iwrite_at", "Get_view", - "Call_errhandler", "Write_all_begin", "Read_all_end", "Get_byte_offset", @@ -258,6 +257,7 @@ "Write_ordered_end", "Write", "Get_atomicity", + "Call_errhandler", ); @routinesmpi2greq = ( "Complete", @@ -308,7 +308,6 @@ "Set_name", "Accumulate", "Create", - "Call_errhandler", "Free_keyval", "Post", "Unlock", @@ -316,4 +315,5 @@ "Lock", "Get_errhandler", "Get_name", + "Call_errhandler", ); ----------------------------------------------------------------------- Summary of changes: src/binding/cxx/buildiface | 30 ++++++++++++++++++++++++------ src/binding/cxx/cxx.vlist | 14 ++++++++++---- src/binding/cxx/cxxdecl3.dat | 3 ++- 3 files changed, 36 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1rc4, created. v3.1rc4
by noreply＠mpich.org 17 Feb '14

17 Feb '14

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 annotated tag, v3.1rc4 has been created at 141924344e90c5be23da79595fbd7d3e6c01b046 (tag) tagging 09b425c7ffd1767db5e5f942fa4294ad5d5a1d17 (commit) replaces v3.1rc3 tagged by Ken Raffenetti on Mon Feb 17 13:29:02 2014 -0600 - Log ----------------------------------------------------------------- tagging 'v3.1rc4' Haizhu Liu (1): PAMId support of MPI 3.0 functions: Ken Raffenetti (3): reduce memory usage for large_type_sendrec test Revert "Message Queue debug support" update version and changes info for rc4 release Pavan Balaji (12): Update the version information for mpich-3.1. Update CHANGES file for the mpich-3.1 release. Add a comment describing what our ABI string covers. Added a new MPL_large_writev function. Use MPL_large_writev instead of plain writev in ch3:nemesis:tcp. Use MPL_large_writev instead of plain writev in ch3:sock. Fix bad casting that creates errors for large messages. Improve localhost detection. Added an MPL large readv call. Use MPL_large_readv in ch3:nemesis:tcp and ch3:sock. Remove overly conservative assertion. Protect assumption of MPI-I/O availability. Su Huang (1): Change the pamid default for advancing the scheduled NBCs ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0