July 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-353-g1ffd39b
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 1ffd39ba42b3ef1c6ae7e09484d7257b756bfab1 (commit) from 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 (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/1ffd39ba42b3ef1c6ae7e09484d7257b7… commit 1ffd39ba42b3ef1c6ae7e09484d7257b756bfab1 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Jul 19 11:52:30 2013 -0500 Added a new test for checking for zero-byte window creations. MPICH currently has a bug that causes it to abort when all processes provide zero bytes to the window allocation routine. While it can be considered a user error, the MPI-3 standard does not explicitly disallow this case. diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 3950aa2..1c33a1b 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -83,6 +83,7 @@ noinst_PROGRAMS = \ win_shared \ win_shared_noncontig \ win_shared_noncontig_put \ + win_zero \ win_dynamic_acc \ get_acc_local \ compare_and_swap \ diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index 006c4f5..4da3c0f 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -68,6 +68,7 @@ manyrma2 2 timeLimit=500 win_shared 4 mpiversion=3.0 win_shared_noncontig 4 mpiversion=3.0 win_shared_noncontig_put 4 mpiversion=3.0 +win_zero 4 mpiversion=3.0 win_dynamic_acc 4 mpiversion=3.0 get_acc_local 1 mpiversion=3.0 linked_list 4 mpiversion=3.0 diff --git a/test/mpi/rma/win_zero.c b/test/mpi/rma/win_zero.c new file mode 100644 index 0000000..24bac4e --- /dev/null +++ b/test/mpi/rma/win_zero.c @@ -0,0 +1,68 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +/* test MPI_WIN_ALLOCATE_SHARED when size of total shared memory region is 0. */ + +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> + +int main(int argc, char **argv) +{ + MPI_Win win; + void *win_buf = NULL; + int world_rank, shm_rank; + MPI_Comm shm_comm; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &world_rank); + + MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, world_rank, MPI_INFO_NULL, &shm_comm); + + MPI_Comm_rank(shm_comm, &shm_rank); + + /* Some ranks allocate zero bytes */ + if (shm_rank % 2 == 0) + MPI_Win_allocate_shared(0, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + else + MPI_Win_allocate_shared(1, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + MPI_Win_free(&win); + + if (world_rank % 2 == 0) + MPI_Win_allocate(0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + else + MPI_Win_allocate(1, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + MPI_Win_free(&win); + + win_buf = NULL; + if (world_rank % 2 == 0) + MPI_Win_create(NULL, 0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + else { + win_buf = (void *) malloc(sizeof(char)); + MPI_Win_create(win_buf, 1, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + } + MPI_Win_free(&win); + if (win_buf) + free(win_buf); + + /* All ranks allocate zero bytes */ + MPI_Win_allocate_shared(0, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + MPI_Win_free(&win); + MPI_Win_allocate(0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + MPI_Win_free(&win); + MPI_Win_create(NULL, 0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + MPI_Win_free(&win); + + MPI_Comm_free(&shm_comm); + + if (world_rank == 0) + printf(" No Errors\n"); + + MPI_Finalize(); + + return 0; + +} ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 1 + test/mpi/rma/testlist | 1 + test/mpi/rma/win_zero.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 test/mpi/rma/win_zero.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-352-g057bb8b
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 (commit) via 4e6333e1555e79ac3b07632eabe5918f490ff55a (commit) from 91ca5a73a767eb90c7307e512e8d0449bf324e70 (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/057bb8be6bc9e1ced3ef42eb7335dbe83… commit 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 Author: Jeff Hammond <jhammond(a)alcf.anl.gov> Date: Wed May 29 16:17:25 2013 -0500 fix ticket 1863 - improper+missing RMA error checks for addr=NULL MPIR_ERRTEST_ARGNULL is used in MPI_Get_accumulate and MPI_Rget_accumulate to verify that the address of a buffer is not NULL. However, a NULL buffer is valid when the count is zero or when a derived datatype of size 0 is used. Signed-off-by: Jeff Hammond <jhammond(a)alcf.anl.gov> diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c index 8610e92..5ca38d8 100644 --- a/src/mpi/rma/accumulate.c +++ b/src/mpi/rma/accumulate.c @@ -102,6 +102,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c index 0e0ca28..ae3d568 100644 --- a/src/mpi/rma/get.c +++ b/src/mpi/rma/get.c @@ -98,6 +98,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c index fa42354..4660212 100644 --- a/src/mpi/rma/get_accumulate.c +++ b/src/mpi/rma/get_accumulate.c @@ -133,11 +133,11 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP) { MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(origin_addr, "origin_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); } MPIR_ERRTEST_COUNT(result_count, mpi_errno); MPIR_ERRTEST_DATATYPE(result_datatype, "result_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(result_addr, "result_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(result_addr, result_count, result_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c index 8bb1bd9..9444011 100644 --- a/src/mpi/rma/put.c +++ b/src/mpi/rma/put.c @@ -98,6 +98,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index ef7168f..4906991 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -115,6 +115,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index 738ec70..33edc79 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -110,6 +110,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index 0b8eb1b..b3a47be 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -125,11 +125,11 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP) { MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(origin_addr, "origin_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); } MPIR_ERRTEST_COUNT(result_count, mpi_errno); MPIR_ERRTEST_DATATYPE(result_datatype, "result_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(result_addr, "result_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(result_addr, result_count, result_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index 510ab4e..48c3052 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -112,6 +112,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) http://git.mpich.org/mpich.git/commitdiff/4e6333e1555e79ac3b07632eabe5918f4… commit 4e6333e1555e79ac3b07632eabe5918f490ff55a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Jul 18 20:07:01 2013 -0500 Remove GCC specific pragmas. strict builds no longer do gcc-specific things. We test each option to see if the compiler accepts them before using it. diff --git a/src/mpi/coll/opland.c b/src/mpi/coll/opland.c index a76aa84..8144fc7 100644 --- a/src/mpi/coll/opland.c +++ b/src/mpi/coll/opland.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) diff --git a/src/mpi/coll/oplor.c b/src/mpi/coll/oplor.c index d31a95b..51b33be 100644 --- a/src/mpi/coll/oplor.c +++ b/src/mpi/coll/oplor.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) diff --git a/src/mpi/coll/oplxor.c b/src/mpi/coll/oplxor.c index cac6d24..89431f9 100644 --- a/src/mpi/coll/oplxor.c +++ b/src/mpi/coll/oplxor.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/opland.c | 6 ------ src/mpi/coll/oplor.c | 6 ------ src/mpi/coll/oplxor.c | 6 ------ src/mpi/rma/accumulate.c | 1 + src/mpi/rma/get.c | 1 + src/mpi/rma/get_accumulate.c | 4 ++-- src/mpi/rma/put.c | 1 + src/mpi/rma/raccumulate.c | 1 + src/mpi/rma/rget.c | 1 + src/mpi/rma/rget_accumulate.c | 4 ++-- src/mpi/rma/rput.c | 1 + 11 files changed, 10 insertions(+), 22 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-350-g91ca5a7
by noreply＠mpich.org 18 Jul '13

18 Jul '13

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 91ca5a73a767eb90c7307e512e8d0449bf324e70 (commit) from 61d01c53d9721051dc7bdd5647251257b95eca1c (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/91ca5a73a767eb90c7307e512e8d0449b… commit 91ca5a73a767eb90c7307e512e8d0449bf324e70 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Jul 18 13:13:10 2013 -0500 Added a badrma test program. This program tests to make sure we can do zero-count or zero-size datatype RMA tests without the MPI library throwing errors. diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 00665fe..3950aa2 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -114,7 +114,8 @@ noinst_PROGRAMS = \ pscw_ordering \ mutex_bench \ mutex_bench_shared \ - rma-contig + rma-contig \ + badrma strided_acc_indexed_LDADD = $(LDADD) -lm strided_acc_onelock_LDADD = $(LDADD) -lm diff --git a/test/mpi/rma/badrma.c b/test/mpi/rma/badrma.c new file mode 100644 index 0000000..8e0dfb1 --- /dev/null +++ b/test/mpi/rma/badrma.c @@ -0,0 +1,153 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpi.h" +#include "stdio.h" + +#define SIZE 100 + +MPI_Win win; +int win_buf[SIZE], origin_buf[SIZE], result_buf[SIZE]; + +int do_test(int origin_count, MPI_Datatype origin_type, int result_count, + MPI_Datatype result_type, int target_count, MPI_Datatype target_type) +{ + int errs = 0, ret, origin_type_size, result_type_size; + + ret = MPI_Put(origin_buf, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Get(origin_buf, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Accumulate(origin_buf, origin_count, origin_type, 1, 0, target_count, + target_type, MPI_SUM, win); + if (ret) + errs++; + + ret = MPI_Get_accumulate(origin_buf, origin_count, origin_type, result_buf, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + + MPI_Type_size(origin_type, &origin_type_size); + MPI_Type_size(result_type, &result_type_size); + + if (origin_count == 0 || origin_type_size == 0) { + ret = MPI_Put(NULL, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Get(NULL, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Accumulate(NULL, origin_count, origin_type, 1, 0, target_count, target_type, + MPI_SUM, win); + if (ret) + errs++; + + ret = MPI_Get_accumulate(NULL, origin_count, origin_type, result_buf, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + + if (result_count == 0 || result_type_size == 0) { + ret = MPI_Get_accumulate(NULL, origin_count, origin_type, NULL, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + } + } + + return errs; +} + +int main(int argc, char *argv[]) +{ + int rank, nprocs, i, j, k; + int errs = 0; + MPI_Datatype types[4]; + + MPI_Init(&argc, &argv); + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if (nprocs < 2) { + printf("Run this program with 2 or more processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + /* types[0] is of zero size. Everything else is non-zero size */ + MPI_Type_contiguous(0, MPI_INT, &types[0]); + MPI_Type_commit(&types[0]); + + MPI_Type_contiguous(1, MPI_INT, &types[1]); + MPI_Type_commit(&types[1]); + + types[2] = MPI_INT; + types[3] = MPI_DOUBLE; + + MPI_Win_create(win_buf, SIZE * sizeof(int), sizeof(int), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + + MPI_Win_fence(0, win); + + if (rank == 0) { + /* zero-count */ + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + for (k = 0; k < 4; k++) + do_test(0, types[i], 0, types[j], 0, types[k]); + + /* single zero-size datatype, but non-zero count */ + for (i = 1; i < 4; i++) { + for (j = 1; j < 4; j++) { + do_test(1, types[0], 0, types[i], 0, types[j]); + do_test(0, types[i], 1, types[0], 0, types[j]); + do_test(0, types[i], 0, types[j], 1, types[0]); + } + } + + /* two zero-size datatypes, but non-zero count */ + for (i = 1; i < 4; i++) { + do_test(1, types[0], 1, types[0], 0, types[i]); + do_test(1, types[0], 0, types[i], 1, types[0]); + do_test(0, types[i], 1, types[0], 1, types[0]); + + do_test(1, types[0], 2, types[0], 0, types[i]); + do_test(2, types[0], 1, types[0], 0, types[i]); + + do_test(1, types[0], 0, types[i], 2, types[0]); + do_test(2, types[0], 0, types[i], 1, types[0]); + + do_test(0, types[i], 1, types[0], 2, types[0]); + do_test(0, types[i], 2, types[0], 1, types[0]); + } + + /* three zero-size datatypes, but non-zero count */ + do_test(1, types[0], 1, types[0], 1, types[0]); + do_test(1, types[0], 1, types[0], 2, types[0]); + do_test(1, types[0], 2, types[0], 1, types[0]); + do_test(1, types[0], 2, types[0], 2, types[0]); + do_test(2, types[0], 1, types[0], 1, types[0]); + do_test(2, types[0], 1, types[0], 2, types[0]); + do_test(2, types[0], 2, types[0], 1, types[0]); + } + MPI_Win_fence(0, win); + + MPI_Win_free(&win); + MPI_Type_free(&types[0]); + MPI_Type_free(&types[1]); + + if (!errs && !rank) + printf(" No Errors\n"); + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index 0168a34..006c4f5 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -99,4 +99,5 @@ linked_list_bench_lock_shr 4 mpiversion=3.0 linked_list_bench_lock_shr_nocheck 4 mpiversion=3.0 mutex_bench 4 mpiversion=3.0 mutex_bench_shared 4 mpiversion=3.0 -rma-contig 4 mpiversion=3.0 timeLimit=600 \ No newline at end of file +rma-contig 4 mpiversion=3.0 timeLimit=600 +badrma 2 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 3 +- test/mpi/rma/badrma.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++ test/mpi/rma/testlist | 3 +- 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 test/mpi/rma/badrma.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-349-g61d01c5
by noreply＠mpich.org 18 Jul '13

18 Jul '13

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 61d01c53d9721051dc7bdd5647251257b95eca1c (commit) via f18b91f0d3a6f507f70752e93bf8e5ee325c6e92 (commit) via 1a8ff2bfff7b3cef49d06cd16167926ede418914 (commit) from 8cf54f1978db324e5ed6de79eaf74b46a70b70dd (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/61d01c53d9721051dc7bdd5647251257b… commit 61d01c53d9721051dc7bdd5647251257b95eca1c Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 11:27:17 2013 -0500 fix bug:check info value of "alloc_shared_noncontig". Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index d5e6b1e..138b473 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -60,8 +60,13 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf /* Check if we are allowed to allocate space non-contiguously */ if (info != NULL) { - MPIR_Info_get_impl(info, "alloc_shared_noncontig", 0, NULL, - &(*win_ptr)->info_args.alloc_shared_noncontig); + int alloc_shared_nctg_flag = 0; + char alloc_shared_nctg_value[MPI_MAX_INFO_VAL+1]; + MPIR_Info_get_impl(info, "alloc_shared_noncontig", MPI_MAX_INFO_VAL, + alloc_shared_nctg_value, &alloc_shared_nctg_flag); + if ((alloc_shared_nctg_flag == 1) && (!strncmp(alloc_shared_nctg_value, "true", + strlen("true")))) + (*win_ptr)->info_args.alloc_shared_noncontig = 1; } /* see if we can allocate all windows contiguously */ http://git.mpich.org/mpich.git/commitdiff/f18b91f0d3a6f507f70752e93bf8e5ee3… commit f18b91f0d3a6f507f70752e93bf8e5ee325c6e92 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 10:30:04 2013 -0500 bug of deleting redundant call to get win_ptr. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index b2c6989..f05a5bb 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -3913,8 +3913,6 @@ int MPIDI_CH3_PktHandler_CAS( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* There are additional steps to take if this is a passive target RMA or the last operation from the source */ - MPID_Win_get_ptr(cas_pkt->target_win_handle, win_ptr); - mpi_errno = MPIDI_CH3_Finish_rma_op_target(NULL, win_ptr, TRUE, cas_pkt->flags, MPI_WIN_NULL); http://git.mpich.org/mpich.git/commitdiff/1a8ff2bfff7b3cef49d06cd16167926ed… commit 1a8ff2bfff7b3cef49d06cd16167926ede418914 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 10:26:35 2013 -0500 bug on MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op). Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 3c73497..b2c6989 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -3829,8 +3829,8 @@ int MPIDI_CH3_PktHandler_Accumulate_Immed( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OP, "**opnotpredefined", "**opnotpredefined %d", accum_pkt->op ); } - MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); } + MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); /* There are additional steps to take if this is a passive ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 9 +++++++-- src/mpid/ch3/src/ch3u_rma_sync.c | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-346-g8cf54f1
by noreply＠mpich.org 18 Jul '13

18 Jul '13

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 8cf54f1978db324e5ed6de79eaf74b46a70b70dd (commit) from 7a662589e5c0f219468fcc1e2e6f8a5af114336f (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/8cf54f1978db324e5ed6de79eaf74b46a… commit 8cf54f1978db324e5ed6de79eaf74b46a70b70dd Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Jul 16 17:46:28 2013 -0500 Fixes ticket #1870. Patching libtool.m4 from autogen.sh to add compatibility with the NAG Fortran compiler plus shared libraries. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/autogen.sh b/autogen.sh index f0a560a..29b0372 100755 --- a/autogen.sh +++ b/autogen.sh @@ -906,3 +906,24 @@ if [ "$do_build_configure" = "yes" ] ; then fi done fi + +######################################################################## +## Patching libtool.m4 +######################################################################## + +# This works with libtool versions 2.4 - 2.4.2. +# Older versions are not supported to build mpich. +# Newer versions should have this patch already included. +# There is no need to patch if we're not going to use Fortran. +if [ $do_bindings = "yes" ] ; then + echo "------------------------------------------------------------------------" + echo + echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... " + patch --forward -p0 < maint/libtool.m4.patch >/dev/null + if [ $? -eq 0 ] ; then + echo "done" + else + echo "failed" + exit 1 + fi +fi diff --git a/maint/libtool.m4.patch b/maint/libtool.m4.patch new file mode 100644 index 0000000..8316416 --- /dev/null +++ b/maint/libtool.m4.patch @@ -0,0 +1,11 @@ +--- confdb/libtool.m4 2013-03-29 16:26:23.162062517 -0500 ++++ confdb/libtool.m4 2013-06-21 14:22:05.138914413 -0500 +@@ -4817,6 +4817,8 @@ + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; ++ nagfor*) # NAGFOR 5.3 ++ tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; ----------------------------------------------------------------------- Summary of changes: autogen.sh | 21 +++++++++++++++++++++ maint/libtool.m4.patch | 11 +++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 maint/libtool.m4.patch hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-345-g7a66258
by noreply＠mpich.org 17 Jul '13

17 Jul '13

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 7a662589e5c0f219468fcc1e2e6f8a5af114336f (commit) from d2cb66671016753efd22f3293ed8984c97b91441 (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/7a662589e5c0f219468fcc1e2e6f8a5af… commit 7a662589e5c0f219468fcc1e2e6f8a5af114336f Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Wed Jul 17 12:17:32 2013 -0500 Better likely/unlikely hints to MPI. This covers a small part of ticket #1835. diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index 905deec..1847031 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -329,7 +329,7 @@ typedef OPA_int_t MPIU_Handle_ref_count; #define MPIU_Object_add_ref(objptr_) \ do { \ int handle_kind_ = HANDLE_GET_KIND((objptr_)->handle); \ - if (handle_kind_ != HANDLE_KIND_BUILTIN) { \ + if (unlikely(handle_kind_ != HANDLE_KIND_BUILTIN)) { \ MPIU_Object_add_ref_always((objptr_)); \ } \ else { \ @@ -344,7 +344,7 @@ typedef OPA_int_t MPIU_Handle_ref_count; #define MPIU_Object_release_ref(objptr_,inuse_ptr_) \ do { \ int handle_kind_ = HANDLE_GET_KIND((objptr_)->handle); \ - if (handle_kind_ != HANDLE_KIND_BUILTIN) { \ + if (unlikely(handle_kind_ != HANDLE_KIND_BUILTIN)) { \ MPIU_Object_release_ref_always((objptr_), (inuse_ptr_)); \ } \ else { \ ----------------------------------------------------------------------- Summary of changes: src/include/mpihandlemem.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-344-gd2cb666
by noreply＠mpich.org 16 Jul '13

16 Jul '13

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 d2cb66671016753efd22f3293ed8984c97b91441 (commit) via 036d7ea8817f8ffdd2846074ae724c0a102f356d (commit) from 90522a130cef97ffe5c0870b4a9ab6b40f17fa58 (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/d2cb66671016753efd22f3293ed8984c9… commit d2cb66671016753efd22f3293ed8984c97b91441 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Jul 16 16:59:19 2013 -0500 big redo to generalize file_info test Since different file systems have different default hints, make a start at being a bit more sophisticated with respect to what we should compare against. If no arguments given, file_info will simply test that hints set can be retrieved. If given the -b (bluegene) or -u (unix file system) flag, file_info will check those default values. todo: add pvfs, lustre, and other file systems of interest. fixes tt #1810 diff --git a/src/mpi/romio/test/file_info.c b/src/mpi/romio/test/file_info.c index 25ad88c..7f2a779 100644 --- a/src/mpi/romio/test/file_info.c +++ b/src/mpi/romio/test/file_info.c @@ -13,25 +13,37 @@ #include <stdlib.h> /* this test wants to compare the hints it gets from a file with a set of - * default hints. These hints are specific to the MPI-IO implementation, so - * pick one of the following profiles to use */ + * default hints. These hints are specific to the MPI-IO implementation, so if + * you want to test something besides the default you'll have to use a command + * line argument */ + +typedef struct hint_defaults { + int cb_buffer_size; + int ind_rd_buffer_size; + int ind_wr_buffer_size; + const char *romio_cb_read; + const char *romio_cb_write; + const char *cb_config_list; +} hint_defaults; + +hint_defaults UFS_DEFAULTS = { + .cb_buffer_size = 16777216, + .ind_rd_buffer_size = 4194304, + .ind_wr_buffer_size = 524288, + .romio_cb_read = "automatic", + .romio_cb_write = "automatic", + .cb_config_list = "*:1" +}; + +hint_defaults BLUEGENE_DEFAULTS = { + .cb_buffer_size = 16777216, + .ind_rd_buffer_size = 4194304, + .ind_wr_buffer_size = 4194304, + .romio_cb_read = "enable", + .romio_cb_write = "enable", + .cb_config_list = NULL}; -#if 1 /* hints are for BlueGene */ -# define DFLT_CB_BUFFER_SIZE 16777216 -# define DFLT_IND_RD_BUFFER_SIZE 4194304 -# define DFLT_IND_WR_BUFFER_SIZE 4194304 -# define DFLT_ROMIO_CB_READ "enable" -# define DFLT_ROMIO_CB_WRITE "enable" -# define SKIP_CB_CONFIG_LIST_TEST 1 -#endif -#if 0 /* hints for MPICH2 */ -# define DFLT_CB_BUFFER_SIZE 16777216 -# define DFLT_IND_RD_BUFFER_SIZE 4194304 -# define DFLT_IND_WR_BUFFER_SIZE 524288 -# define DFLT_ROMIO_CB_READ "automatic" -# define DFLT_ROMIO_CB_WRITE "automatic" -#endif /* #undef INFO_DEBUG */ /* Test will print out information about unexpected hint keys or values that @@ -40,6 +52,8 @@ * but not print out these "interesting" non-error cases. */ static int verbose = 0; +static int test_ufs = 0; +static int test_bluegene = 0; int main(int argc, char **argv) { @@ -47,6 +61,7 @@ int main(int argc, char **argv) MPI_File fh; MPI_Info info, info_used; char *filename, key[MPI_MAX_INFO_KEY], value[MPI_MAX_INFO_VAL]; + hint_defaults *defaults; MPI_Init(&argc,&argv); @@ -59,6 +74,8 @@ int main(int argc, char **argv) i = 1; while ((i < argc) && strcmp("-fname", *argv)) { if (!strcmp("-v", *argv)) verbose = 1; + else if (!strcmp("-u", *argv)) test_ufs = 1; + else if (!strcmp("-b", *argv)) test_bluegene = 1; i++; argv++; } @@ -73,14 +90,26 @@ int main(int argc, char **argv) MPI_Bcast(&len, 1, MPI_INT, 0, MPI_COMM_WORLD); MPI_Bcast(filename, len+1, MPI_CHAR, 0, MPI_COMM_WORLD); MPI_Bcast(&verbose, 1, MPI_INT, 0, MPI_COMM_WORLD); + MPI_Bcast(&test_ufs, 1, MPI_INT, 0, MPI_COMM_WORLD); + MPI_Bcast(&test_bluegene, 1, MPI_INT, 0, MPI_COMM_WORLD); } else { MPI_Bcast(&len, 1, MPI_INT, 0, MPI_COMM_WORLD); filename = (char *) malloc(len+1); MPI_Bcast(filename, len+1, MPI_CHAR, 0, MPI_COMM_WORLD); MPI_Bcast(&verbose, 1, MPI_INT, 0, MPI_COMM_WORLD); + MPI_Bcast(&test_ufs, 1, MPI_INT, 0, MPI_COMM_WORLD); + MPI_Bcast(&test_bluegene, 1, MPI_INT, 0, MPI_COMM_WORLD); + } + if (test_ufs) { + defaults = &UFS_DEFAULTS; + } else if (test_bluegene) { + defaults = &BLUEGENE_DEFAULTS; + } else { + defaults = NULL; } + /* open the file with MPI_INFO_NULL */ MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE | MPI_MODE_RDWR, MPI_INFO_NULL, &fh); @@ -89,102 +118,104 @@ int main(int argc, char **argv) MPI_File_get_info(fh, &info_used); MPI_Info_get_nkeys(info_used, &nkeys); - for (i=0; i<nkeys; i++) { - MPI_Info_get_nthkey(info_used, i, key); - MPI_Info_get(info_used, key, MPI_MAX_INFO_VAL-1, value, &flag); + if (defaults != NULL) { + for (i=0; i<nkeys; i++) { + MPI_Info_get_nthkey(info_used, i, key); + MPI_Info_get(info_used, key, MPI_MAX_INFO_VAL-1, value, &flag); #ifdef INFO_DEBUG - if (!mynod) - fprintf(stderr, "Process %d, Default: key = %s, value = %s\n", mynod, - key, value); + if (!mynod) + fprintf(stderr, "Process %d, Default: key = %s, value = %s\n", mynod, + key, value); #endif - if (!strcmp("striping_factor", key)) { - default_striping_factor = atoi(value); - /* no check */ - } - else if (!strcmp("cb_buffer_size", key)) { - if (atoi(value) != DFLT_CB_BUFFER_SIZE) { - errs++; - if (verbose) fprintf(stderr, "cb_buffer_size is %d; should be %d\n", - atoi(value), DFLT_CB_BUFFER_SIZE); + if (!strcmp("striping_factor", key)) { + default_striping_factor = atoi(value); + /* no check */ } - } - else if (!strcmp("romio_cb_read", key)) { - if (strcmp(DFLT_ROMIO_CB_READ, value)) { - errs++; - if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n", - value, DFLT_ROMIO_CB_READ); + else if (!strcmp("cb_buffer_size", key)) { + if (atoi(value) != defaults->cb_buffer_size) { + errs++; + if (verbose) fprintf(stderr, "cb_buffer_size is %d; should be %d\n", + atoi(value), defaults->cb_buffer_size); + } } - } - else if (!strcmp("romio_cb_write", key)) { - if (strcmp(DFLT_ROMIO_CB_WRITE, value)) { - errs++; - if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n", - value, DFLT_ROMIO_CB_WRITE); + else if (!strcmp("romio_cb_read", key)) { + if (strcmp(defaults->romio_cb_read, value)) { + errs++; + if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n", + value, defaults->romio_cb_read); + } } - } - else if (!strcmp("cb_nodes", key)) { - /* unreliable test -- just ignore value */ - } - else if (!strcmp("romio_no_indep_rw", key)) { - if (strcmp("false", value)) { - errs++; - if (verbose) fprintf(stderr, "romio_no_indep_rw is set to %s; should be %s\n", - value, "false"); + else if (!strcmp("romio_cb_write", key)) { + if (strcmp(defaults->romio_cb_write, value)) { + errs++; + if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n", + value, defaults->romio_cb_write); + } } - } - else if (!strcmp("ind_rd_buffer_size", key)) { - if (atoi(value) != DFLT_IND_RD_BUFFER_SIZE) { - errs++; - if (verbose) fprintf(stderr, "ind_rd_buffer_size is %d; should be %d\n", - atoi(value), DFLT_IND_RD_BUFFER_SIZE); + else if (!strcmp("cb_nodes", key)) { + /* unreliable test -- just ignore value */ } - } - else if (!strcmp("ind_wr_buffer_size", key)) { - if (atoi(value) != DFLT_IND_WR_BUFFER_SIZE) { - errs++; - if (verbose) fprintf(stderr, "ind_wr_buffer_size is %d; should be %d\n", - atoi(value), DFLT_IND_WR_BUFFER_SIZE); + else if (!strcmp("romio_no_indep_rw", key)) { + if (strcmp("false", value)) { + errs++; + if (verbose) fprintf(stderr, "romio_no_indep_rw is set to %s; should be %s\n", + value, "false"); + } } - } - else if (!strcmp("romio_ds_read", key)) { - if (strcmp("automatic", value)) { - errs++; - if (verbose) fprintf(stderr, "romio_ds_read is set to %s; should be %s\n", - value, "automatic"); + else if (!strcmp("ind_rd_buffer_size", key)) { + if (atoi(value) != defaults->ind_rd_buffer_size) { + errs++; + if (verbose) fprintf(stderr, "ind_rd_buffer_size is %d; should be %d\n", + atoi(value), defaults->ind_rd_buffer_size); + } } - } - else if (!strcmp("romio_ds_write", key)) { - /* Unreliable test -- value is file system dependent. Ignore. */ - } - else if (!strcmp("cb_config_list", key)) { -#ifndef SKIP_CB_CONFIG_LIST_TEST - if (strcmp("*:1", value)) { - errs++; - if (verbose) fprintf(stderr, "cb_config_list is set to %s; should be %s\n", - value, "*:1"); + else if (!strcmp("ind_wr_buffer_size", key)) { + if (atoi(value) != defaults->ind_wr_buffer_size) { + errs++; + if (verbose) fprintf(stderr, "ind_wr_buffer_size is %d; should be %d\n", + atoi(value), defaults->ind_wr_buffer_size); + } + } + else if (!strcmp("romio_ds_read", key)) { + if (strcmp("automatic", value)) { + errs++; + if (verbose) fprintf(stderr, "romio_ds_read is set to %s; should be %s\n", + value, "automatic"); + } } + else if (!strcmp("romio_ds_write", key)) { + /* Unreliable test -- value is file system dependent. Ignore. */ + } + else if (!strcmp("cb_config_list", key)) { +#ifndef SKIP_CB_CONFIG_LIST_TEST + if (strcmp(defaults->cb_config_list, value)) { + errs++; + if (verbose) fprintf(stderr, "cb_config_list is set to %s; should be %s\n", + value, defaults->cb_config_list); + } #endif - } - /* don't care about the defaults for these keys */ - else if (!strcmp("romio_cb_pfr", key)) { - } - else if (!strcmp("romio_cb_fr_types", key)) { - } - else if (!strcmp("romio_cb_fr_alignment", key)) { - } - else if (!strcmp("romio_cb_ds_threshold", key)) { - } - else if (!strcmp("romio_cb_alltoall", key)) { - } - else { - if (verbose) fprintf(stderr, "unexpected key %s (not counted as an error)\n", key); + } + /* don't care about the defaults for these keys */ + else if (!strcmp("romio_cb_pfr", key)) { + } + else if (!strcmp("romio_cb_fr_types", key)) { + } + else if (!strcmp("romio_cb_fr_alignment", key)) { + } + else if (!strcmp("romio_cb_ds_threshold", key)) { + } + else if (!strcmp("romio_cb_alltoall", key)) { + } + else { + if (verbose) fprintf(stderr, "unexpected key %s (not counted as an error)\n", key); + } } } MPI_Info_free(&info_used); MPI_File_close(&fh); - -/* delete the file */ + + /* delete the file */ if (!mynod) MPI_File_delete(filename, MPI_INFO_NULL); MPI_Barrier(MPI_COMM_WORLD); @@ -279,26 +310,9 @@ int main(int argc, char **argv) atoi(value), 8388608); } } - else if (!strcmp("romio_cb_read", key)) { - if (strcmp(DFLT_ROMIO_CB_READ, value)) { - errs++; - if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n", - value, DFLT_ROMIO_CB_READ); - } - } - else if (!strcmp("romio_cb_write", key)) { - if (strcmp(DFLT_ROMIO_CB_WRITE, value)) { - errs++; - if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n", - value, DFLT_ROMIO_CB_WRITE); - } - } + /* only check the hints we set */ else if (!strcmp("cb_nodes", key)) { - if (atoi(value) != (nprocs/2)) { - errs++; - if (verbose) fprintf(stderr, "cb_nodes is %d; should be %d\n", atoi(value), - nprocs/2); - } + /* unreliable test: just skip */ } else if (!strcmp("romio_no_indep_rw", key)) { if (strcmp("false", value)) { http://git.mpich.org/mpich.git/commitdiff/036d7ea8817f8ffdd2846074ae724c0a1… commit 036d7ea8817f8ffdd2846074ae724c0a102f356d Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Apr 3 13:15:10 2013 -0500 another bg romio fix from after merge diff --git a/src/mpi/romio/test/file_info.c b/src/mpi/romio/test/file_info.c index 07bf8c9..25ad88c 100644 --- a/src/mpi/romio/test/file_info.c +++ b/src/mpi/romio/test/file_info.c @@ -16,11 +16,22 @@ * default hints. These hints are specific to the MPI-IO implementation, so * pick one of the following profiles to use */ +#if 1 /* hints are for BlueGene */ +# define DFLT_CB_BUFFER_SIZE 16777216 +# define DFLT_IND_RD_BUFFER_SIZE 4194304 +# define DFLT_IND_WR_BUFFER_SIZE 4194304 +# define DFLT_ROMIO_CB_READ "enable" +# define DFLT_ROMIO_CB_WRITE "enable" + +# define SKIP_CB_CONFIG_LIST_TEST 1 +#endif +#if 0 /* hints for MPICH2 */ # define DFLT_CB_BUFFER_SIZE 16777216 # define DFLT_IND_RD_BUFFER_SIZE 4194304 # define DFLT_IND_WR_BUFFER_SIZE 524288 # define DFLT_ROMIO_CB_READ "automatic" # define DFLT_ROMIO_CB_WRITE "automatic" +#endif /* #undef INFO_DEBUG */ /* Test will print out information about unexpected hint keys or values that ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/test/file_info.c | 239 ++++++++++++++++++++++------------------ 1 files changed, 132 insertions(+), 107 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-342-g90522a1
by noreply＠mpich.org 16 Jul '13

16 Jul '13

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 90522a130cef97ffe5c0870b4a9ab6b40f17fa58 (commit) from 60a2d9fe221f4b98a611a360cf0a2ba822be6677 (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/90522a130cef97ffe5c0870b4a9ab6b40… commit 90522a130cef97ffe5c0870b4a9ab6b40f17fa58 Author: Su Huang <suhuang(a)us.ibm.com> Date: Tue Jul 9 10:09:46 2013 -0400 Fix uninitialized parameters for one sided communication in pamid (ibm) D191388 : MPICOM case with mpich2 hit Assertion failed issue (ibm) AIX71J Signed-off-by: Charles Archer <archerc(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index d9eaf93..79a1c0b 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -65,28 +65,19 @@ MPIDI_Get_use_pami_rget(pami_context_t context, MPIDI_Win_request * req, int *fr { pami_result_t rc; void *map=NULL; + pami_rget_simple_t params; - pami_rget_simple_t params = { - .rma = { - .dest = req->dest, - .hints = { - .buffer_registered = PAMI_HINT_ENABLE, - .use_rdma = PAMI_HINT_ENABLE, - }, - .bytes = 0, - .cookie = req, - .done_fn = MPIDI_Win_DoneCB, - }, - .rdma = { - .local = { - .mr = &req->origin.memregion, - }, - .remote = { - .mr = &req->win->mpid.info[req->target.rank].memregion, - .offset = req->offset, - }, - }, - }; + params=zero_rget_parms; + + params.rma.dest=req->dest; + params.rma.hints.buffer_registered = PAMI_HINT_ENABLE; + params.rma.hints.use_rdma = PAMI_HINT_ENABLE; + params.rma.bytes = 0; + params.rma.cookie = req; + params.rma.done_fn = MPIDI_Win_DoneCB; + params.rdma.local.mr=&req->origin.memregion; + params.rdma.remote.mr=&req->win->mpid.info[req->target.rank].memregion; + params.rdma.remote.offset= req->offset; struct MPIDI_Win_sync* sync = &req->win->mpid.sync; TRACE_ERR("Start index=%u/%d l-addr=%p r-base=%p r-offset=%zu (sync->started=%u sync->complete=%u)\n", @@ -136,25 +127,20 @@ MPIDI_Get_use_pami_get(pami_context_t context, MPIDI_Win_request * req, int *fre { pami_result_t rc; void *map=NULL; + pami_get_simple_t params; + + params=zero_get_parms; - pami_get_simple_t params = { - .rma = { - .dest = req->dest, - .hints = { - .use_rdma = PAMI_HINT_DEFAULT, + params.rma.dest=req->dest; + params.rma.hints.use_rdma = PAMI_HINT_DEFAULT; #ifndef OUT_OF_ORDER_HANDLING - .no_long_header= 1, + params.rma.hints.no_long_header= 1, #endif - }, - .bytes = 0, - .cookie = req, - .done_fn = MPIDI_Win_DoneCB, - }, - .addr = { - .local = req->buffer, - .remote = req->win->mpid.info[req->target.rank].base_addr, - }, - }; + params.rma.bytes = 0; + params.rma.cookie = req; + params.rma.done_fn = MPIDI_Win_DoneCB; + params.addr.local=req->buffer; + params.addr.remote= req->win->mpid.info[req->target.rank].base_addr; struct MPIDI_Win_sync* sync = &req->win->mpid.sync; TRACE_ERR("Start index=%u/%d l-addr=%p r-base=%p r-offset=%zu (sync->started=%u sync->complete=%u)\n", diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 92fb477..ecfd444 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -67,7 +67,7 @@ MPIDI_Put_use_pami_rput(pami_context_t context, MPIDI_Win_request * req,int *fre void *map; pami_rput_simple_t params; /* params need to zero out to avoid passing garbage to PAMI */ - memset((void *) &params,0,sizeof(pami_rput_simple_t)); + params=zero_rput_parms; params.rma.dest=req->dest; params.rma.hints.buffer_registered = PAMI_HINT_ENABLE; @@ -129,28 +129,22 @@ MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *fr { pami_result_t rc; void *map; + pami_put_simple_t params; - pami_put_simple_t params = { - .rma = { - .dest = req->dest, - .hints = { - .use_rdma= PAMI_HINT_DEFAULT, + params = zero_put_parms; + + params.rma.dest=req->dest; + params.rma.hints.use_rdma = PAMI_HINT_DEFAULT; #ifndef OUT_OF_ORDER_HANDLING - .no_long_header= 1, + params.rma.hints.no_long_header= 1, #endif - }, - .bytes = 0, - .cookie = req, - .done_fn = NULL, - }, - .addr = { - .local = req->buffer, - .remote = req->win->mpid.info[req->target.rank].base_addr, - }, - .put = { - .rdone_fn = MPIDI_Win_DoneCB, - }, - }; + params.rma.bytes = 0; + params.rma.cookie = req; + params.rma.done_fn = NULL; + params.addr.local=req->buffer; + params.addr.remote=req->win->mpid.info[req->target.rank].base_addr; + params.put.rdone_fn= MPIDI_Win_DoneCB; + struct MPIDI_Win_sync* sync = &req->win->mpid.sync; TRACE_ERR("Start index=%u/%d l-addr=%p r-base=%p r-offset=%zu (sync->started=%u sync->complete=%u)\n", req->state.index, req->target.dt.num_contig, req->buffer, req->win->mpid.info[req->target.rank].base_addr, req->offset, sync->started, sync->complete); diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index d2f7024..af888bd 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -24,6 +24,10 @@ #ifndef __src_onesided_mpidi_onesided_h__ #define __src_onesided_mpidi_onesided_h__ +pami_rget_simple_t zero_rget_parms; +pami_get_simple_t zero_get_parms; +pami_rput_simple_t zero_rput_parms; +pami_put_simple_t zero_put_parms; /** * \brief One-sided Message Types ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/onesided/mpid_win_get.c | 60 ++++++++++---------------- src/mpid/pamid/src/onesided/mpid_win_put.c | 34 ++++++--------- src/mpid/pamid/src/onesided/mpidi_onesided.h | 4 ++ 3 files changed, 41 insertions(+), 57 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-341-g60a2d9f
by noreply＠mpich.org 16 Jul '13

16 Jul '13

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 60a2d9fe221f4b98a611a360cf0a2ba822be6677 (commit) via 43c78f1f667ecad622dc76c29de3e8ae837d727d (commit) from 05e5bb0513638325eb4545eb82bd57313a771635 (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/60a2d9fe221f4b98a611a360cf0a2ba82… commit 60a2d9fe221f4b98a611a360cf0a2ba822be6677 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Mon Jul 15 15:12:22 2013 -0500 add support for alternative default pami library names. Signed-off-by: Haizhu Liu <haizhu(a)us.ibm.com> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index cab705e..25b0f67 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -27,6 +27,7 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ AM_CONDITIONAL([BUILD_PAMID],[test "$device_name" = "pamid"]) AC_ARG_VAR([PAMILIBNAME],[can be used to override the name of the PAMI library (default: "pami")]) +original_PAMILIBNAME=${PAMILIBNAME} PAMILIBNAME=${PAMILIBNAME:-"pami"} AC_SUBST(PAMILIBNAME) export PAMILIBNAME @@ -158,6 +159,9 @@ if test "${pamid_platform}" = "BGQ" ; then PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS]) if test -d ${bgq_driver}/comm/lib ; then PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS]) + if test x${original_PAMILIBNAME} = x ; then + PAMILIBNAME=pami-gcc + fi else PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) fi http://git.mpich.org/mpich.git/commitdiff/43c78f1f667ecad622dc76c29de3e8ae8… commit 43c78f1f667ecad622dc76c29de3e8ae837d727d Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Mon Jul 15 15:01:51 2013 -0500 update bgq pami library search process. Signed-off-by: Haizhu Liu <haizhu(a)us.ibm.com> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index 880040e..cab705e 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -156,10 +156,10 @@ if test "${pamid_platform}" = "BGQ" ; then PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [LDFLAGS]) PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS]) - if test -d ${bgq_driver}/comm/sys/lib ; then - PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) - else + if test -d ${bgq_driver}/comm/lib ; then PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS]) + else + PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) fi break ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/subconfigure.m4 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-339-g05e5bb0
by noreply＠mpich.org 16 Jul '13

16 Jul '13

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 05e5bb0513638325eb4545eb82bd57313a771635 (commit) from 828b0b4d46f0a499560123f2f3797b197c07abea (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/05e5bb0513638325eb4545eb82bd57313… commit 05e5bb0513638325eb4545eb82bd57313a771635 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Jul 16 12:53:03 2013 -0500 Add configure test for __builtin_expect Fixes #1695 Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 index 41fba79..3c4f052 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 @@ -1651,3 +1651,21 @@ AC_DEFUN([PAC_C_MACRO_VA_ARGS],[ fi rm -f pac_test.log ])dnl + +# Will AC_DEFINE([HAVE_BUILTIN_EXPECT]) if the compiler supports __builtin_expect. +AC_DEFUN([PAC_C_BUILTIN_EXPECT],[ +AC_MSG_CHECKING([if C compiler supports __builtin_expect]) + +AC_TRY_LINK(, [ + return __builtin_expect(1, 1) ? 1 : 0 +], [ + have_builtin_expect=yes + AC_MSG_RESULT([yes]) +], [ + have_builtin_expect=no + AC_MSG_RESULT([no]) +]) +if test x$have_builtin_expect = xyes ; then + AC_DEFINE([HAVE_BUILTIN_EXPECT], [1], [Define to 1 if the compiler supports __builtin_expect.]) +fi +]) diff --git a/configure.ac b/configure.ac index fe8194e..803184b 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,6 +2738,7 @@ AC_C_RESTRICT AC_C_INLINE PAC_C_GNU_ATTRIBUTE +PAC_C_BUILTIN_EXPECT # We need to check for the endianess in order to implement the # "external32" representations. This defines "WORDS_BIGENDIAN when # the system is bigendian. diff --git a/src/include/mpiutil.h b/src/include/mpiutil.h index 221f990..6b6559a 100644 --- a/src/include/mpiutil.h +++ b/src/include/mpiutil.h @@ -338,8 +338,7 @@ int MPIR_Assert_fail_fmt(const char *cond, const char *file_name, int line_num, * * These macros are not namespaced because the namespacing is cumbersome. */ -/* safety guard for now, add a configure check in the future */ -#if ( defined(__GNUC__) && (__GNUC__ >= 3) ) || defined(__xlc__) +#ifdef HAVE_BUILTIN_EXPECT # define unlikely(x_) __builtin_expect(!!(x_),0) # define likely(x_) __builtin_expect(!!(x_),1) #else ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_cc.m4 | 18 ++++++++++++++++++ configure.ac | 1 + src/include/mpiutil.h | 3 +-- 3 files changed, 20 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0