August 2016 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2-418-gc5b844a
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 c5b844ad3397bc654258595dc8bd595b6738296e (commit) from 637da5d8e537d70680fa1394a5fd3f988f2e5b2d (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/c5b844ad3397bc654258595dc8bd595b6… commit c5b844ad3397bc654258595dc8bd595b6738296e Author: Min Si <msi(a)anl.gov> Date: Tue Aug 23 15:57:24 2016 -0500 Added a test to check RMAs issued over overlapping windows. Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index bf84531..7c8bfc7 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -169,6 +169,11 @@ noinst_PROGRAMS = \ win_shared_gacc_flush_load \ win_shared_fop_flush_load \ win_shared_cas_flush_load \ + overlap_wins_put \ + overlap_wins_acc \ + overlap_wins_gacc \ + overlap_wins_fop \ + overlap_wins_cas \ rget-unlock if BUILD_MPIX_TESTS @@ -277,3 +282,15 @@ win_shared_acc_flush_load_CPPFLAGS = -DTEST_ACC $(AM_CPPFLAGS) win_shared_gacc_flush_load_CPPFLAGS = -DTEST_GACC $(AM_CPPFLAGS) win_shared_fop_flush_load_CPPFLAGS = -DTEST_FOP $(AM_CPPFLAGS) win_shared_cas_flush_load_CPPFLAGS = -DTEST_CAS $(AM_CPPFLAGS) + +overlap_wins_put_SOURCES = overlap_wins_rma.c +overlap_wins_acc_SOURCES = overlap_wins_rma.c +overlap_wins_gacc_SOURCES = overlap_wins_rma.c +overlap_wins_fop_SOURCES = overlap_wins_rma.c +overlap_wins_cas_SOURCES = overlap_wins_rma.c + +overlap_wins_put_CPPFLAGS = -DTEST_PUT $(AM_CPPFLAGS) +overlap_wins_acc_CPPFLAGS = -DTEST_ACC $(AM_CPPFLAGS) +overlap_wins_gacc_CPPFLAGS = -DTEST_GACC $(AM_CPPFLAGS) +overlap_wins_fop_CPPFLAGS = -DTEST_FOP $(AM_CPPFLAGS) +overlap_wins_cas_CPPFLAGS = -DTEST_CAS $(AM_CPPFLAGS) diff --git a/test/mpi/rma/overlap_wins_rma.c b/test/mpi/rma/overlap_wins_rma.c new file mode 100644 index 0000000..9ccdeef --- /dev/null +++ b/test/mpi/rma/overlap_wins_rma.c @@ -0,0 +1,304 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2016 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <mpi.h> + +/* This test checks the remote completion of flush with RMA write-like operations + * (PUT, ACC, GET_ACC, FOP, CAS) concurrently issued from different origin processes + * to the same target over overlapping windows (i.e., two windows exposing the same + * memory region) + * 1. The first [nprocs-1] processes perform as origin, and the last process + * performs as target. + * 2. Everyone allocates a buffer and creates [nprocs-1] windows over the same buffer. + * 3. Every origin P[i] issues RMA operations and flush to target through + * wins[i] respectively, to different location winbuf[i] on target. + * 4. Finally, every origin P[i] issues GET and flush to obtain winbuf[i] on + * target and checks the correctness. */ + +#define ITER 10 +#define BUF_CNT 2 + +#if defined(TEST_CAS) +#define MPI_DATATYPE MPI_INT +#define DATATYPE int +#define DATATYPE_FORMAT "%d" +#else +#define MPI_DATATYPE MPI_DOUBLE +#define DATATYPE double +#define DATATYPE_FORMAT "%.1f" +#endif + +DATATYPE local_buf[BUF_CNT], result_buf[BUF_CNT], compare_buf[BUF_CNT]; +DATATYPE exp_target_val = 0.0; + +const int verbose = 0; + +int rank = -1, nprocs = 0; +int norigins, target; +MPI_Win *wins; +int win_size = 0, win_cnt = 0; + +DATATYPE *winbuf = NULL, *my_base = NULL; + +#define verbose_print(str,...) { \ + if (verbose) { \ + fprintf(stdout, str, ## __VA_ARGS__); \ + fflush(stdout); \ + } \ + } +#define error_print(str,...) { \ + fprintf(stderr, str, ## __VA_ARGS__); \ + fflush(stderr); \ + } + +/* Define operation name for error message */ +#ifdef TEST_PUT +const char *rma_name = "Put"; +#elif defined(TEST_ACC) +const char *rma_name = "Accumulate"; +#elif defined(TEST_GACC) +const char *rma_name = "Get_accumulate"; +#elif defined(TEST_FOP) +const char *rma_name = "Fetch_and_op"; +#elif defined(TEST_CAS) +const char *rma_name = "Compare_and_swap"; +#else +const char *rma_name = "None"; +#endif + +/* Issue functions for different RMA operations */ +#ifdef TEST_PUT +static inline void issue_rma_op(DATATYPE * origin_addr, DATATYPE * result_addr /* NULL */ , + DATATYPE * compare_addr /* NULL */ , int dst, MPI_Aint target_disp, + MPI_Win win) +{ + MPI_Put(origin_addr, 1, MPI_DATATYPE, dst, target_disp, 1, MPI_DATATYPE, win); +} +#elif defined(TEST_ACC) +static inline void issue_rma_op(DATATYPE * origin_addr, DATATYPE * result_addr /* NULL */ , + DATATYPE * compare_addr /* NULL */ , int dst, MPI_Aint target_disp, + MPI_Win win) +{ + MPI_Accumulate(origin_addr, 1, MPI_DATATYPE, dst, target_disp, 1, MPI_DATATYPE, MPI_SUM, win); +} +#elif defined(TEST_GACC) +static inline void issue_rma_op(DATATYPE * origin_addr, DATATYPE * result_addr, + DATATYPE * compare_addr /* NULL */ , int dst, MPI_Aint target_disp, + MPI_Win win) +{ + MPI_Get_accumulate(origin_addr, 1, MPI_DATATYPE, result_addr, 1, MPI_DATATYPE, dst, target_disp, + 1, MPI_DATATYPE, MPI_SUM, win); +} +#elif defined(TEST_FOP) +static inline void issue_rma_op(DATATYPE * origin_addr, DATATYPE * result_addr, + DATATYPE * compare_addr /* NULL */ , int dst, MPI_Aint target_disp, + MPI_Win win) +{ + MPI_Fetch_and_op(origin_addr, result_addr, MPI_DATATYPE, dst, target_disp, MPI_SUM, win); +} +#elif defined(TEST_CAS) +static inline void issue_rma_op(DATATYPE * origin_addr, DATATYPE * result_addr, + DATATYPE * compare_addr, int dst, MPI_Aint target_disp, MPI_Win win) +{ + MPI_Compare_and_swap(origin_addr, compare_addr, result_addr, MPI_DATATYPE, dst, target_disp, + win); +} +#else +#define issue_rma_op(loc_addr, result_addr, compare_addr, dst, target_disp, win) +#endif + +static inline void set_iteration_data(int x) +{ + int i; + +#if defined(TEST_CAS) + for (i = 0; i < BUF_CNT; i++) + compare_buf[i] = local_buf[i]; /* always equal, thus swap happens */ +#endif + + for (i = 0; i < BUF_CNT; i++) { + local_buf[i] = rank + i + x; + +#if defined(TEST_CAS) || defined(TEST_PUT) + exp_target_val = local_buf[i]; /* swap */ +#else + exp_target_val += local_buf[i]; /* sum */ +#endif + } +} + +static void print_origin_data(void) +{ + int i; + + printf("[%d] local_buf: ", rank); + for (i = 0; i < BUF_CNT; i++) + printf(DATATYPE_FORMAT " ", local_buf[i]); + printf("\n"); + + printf("[%d] result_buf: ", rank); + for (i = 0; i < BUF_CNT; i++) + printf(DATATYPE_FORMAT " ", result_buf[i]); + printf("\n"); +} + +static void print_target_data(void) +{ + int i; + printf("[%d] winbuf: ", rank); + for (i = 0; i < win_cnt; i++) + printf(DATATYPE_FORMAT " ", winbuf[i]); + printf("\n"); + fflush(stdout); +} + +static int run_test() +{ + int errors = 0; + int i, x; + int dst = 0, target_disp = 0; + MPI_Win win = MPI_WIN_NULL; + DATATYPE target_val = 0.0; + + /* 1. Specify working window and displacement. + * - Target: no RMA issued, always check results on wins[0]. + * - Origins: issue RMA on different window and different memory location */ + if (rank == target) { + win = wins[0]; + } + else { + win = wins[rank]; + target_disp = rank; + } + dst = target; + + /* 2. Every one resets local data */ + memset(local_buf, 0, sizeof(local_buf)); + memset(result_buf, 0, sizeof(result_buf)); + memset(compare_buf, 0, sizeof(compare_buf)); + + MPI_Barrier(MPI_COMM_WORLD); + + if (rank != target) { + + /* 3. Origins issue RMA to target over its working window */ + MPI_Win_lock(MPI_LOCK_SHARED, dst, 0, win); + verbose_print("[%d] RMA start, test %s (dst=%d, target_disp=%d, win 0x%x) - flush\n", + rank, rma_name, dst, target_disp, win); + + for (x = 0; x < ITER; x++) { + /* update local buffers and expected value in every iteration */ + set_iteration_data(x); + + for (i = 0; i < BUF_CNT; i++) + issue_rma_op(&local_buf[i], &result_buf[i], &compare_buf[i], dst, target_disp, win); + MPI_Win_flush(dst, win); + + if (verbose) + print_origin_data(); + } + + /* 4. Check correctness of final target value */ + MPI_Get(&target_val, 1, MPI_DATATYPE, dst, target_disp, 1, MPI_DATATYPE, win); + MPI_Win_flush(dst, win); + if (target_val != exp_target_val) { + error_print("rank %d (iter %d) - check %s, got target_val = " + DATATYPE_FORMAT ", expected " DATATYPE_FORMAT "\n", rank, x, + rma_name, target_val, exp_target_val); + errors++; + } + + MPI_Win_unlock(dst, win); + } + + MPI_Barrier(MPI_COMM_WORLD); + + /* 5. Every one prints window buffer */ + if (verbose && rank == target) { + MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win); + print_target_data(); + MPI_Win_unlock(rank, win); + } + + return errors; +} + +static void init_windows(void) +{ + int i = 0; + + /* Everyone creates norigins overlapping windows. */ + winbuf = malloc(win_size); + memset(winbuf, 0, win_size); + + wins = malloc(norigins * sizeof(MPI_Win)); + for (i = 0; i < norigins; i++) { + wins[i] = MPI_WIN_NULL; + MPI_Win_create(winbuf, win_size, sizeof(DATATYPE), MPI_INFO_NULL, MPI_COMM_WORLD, &wins[i]); + } +} + +static void destroy_windows(void) +{ + int i = 0; + for (i = 0; i < norigins; i++) { + if (wins[i] != MPI_WIN_NULL) + MPI_Win_free(&wins[i]); + } + free(wins); + free(winbuf); +} + +int main(int argc, char *argv[]) +{ + int errors = 0, all_errors = 0; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + + if (nprocs < 3) { + if (rank == 0) { + error_print("Error: must use at least 3 processes\n"); + } + MPI_Barrier(MPI_COMM_WORLD); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + /* The last rank performs as target, all others are origin. + * Every origin accesses to a different memory location on the target. */ + target = nprocs - 1; + norigins = nprocs - 1; + win_cnt = nprocs - 1; + win_size = sizeof(DATATYPE) * win_cnt; + + if (rank == 0) { + verbose_print("[%d] %d origins, target rank = %d\n", rank, norigins, target); + } + + init_windows(); + MPI_Barrier(MPI_COMM_WORLD); + + /* start test */ + errors = run_test(); + + MPI_Barrier(MPI_COMM_WORLD); + MPI_Reduce(&errors, &all_errors, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + if (rank == 0 && all_errors == 0) { + fprintf(stdout, " No Errors\n"); + fflush(stdout); + } + + destroy_windows(); + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index b6ee786..5ba6df1 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -158,6 +158,11 @@ gacc_flush_get 3 mpiversion=3.0 fop_flush_get 3 mpiversion=3.0 cas_flush_get 3 mpiversion=3.0 rget-unlock 2 mpiversion=3.0 +overlap_wins_put 3 +overlap_wins_acc 3 +overlap_wins_gacc 3 +overlap_wins_fop 3 +overlap_wins_cas 3 ## This test is not strictly correct. This was meant to test out the ## case when MPI_Test is not nonblocking. However, we ended up ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 17 +++ test/mpi/rma/overlap_wins_rma.c | 304 +++++++++++++++++++++++++++++++++++++++ test/mpi/rma/testlist.in | 5 + 3 files changed, 326 insertions(+), 0 deletions(-) create mode 100644 test/mpi/rma/overlap_wins_rma.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-417-g637da5d
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 637da5d8e537d70680fa1394a5fd3f988f2e5b2d (commit) from bfefee88130f464b8037b9250a6394d1f7a14dc6 (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/637da5d8e537d70680fa1394a5fd3f988… commit 637da5d8e537d70680fa1394a5fd3f988f2e5b2d Author: Yanfei Guo <yguo(a)anl.gov> Date: Wed Aug 31 16:59:44 2016 -0500 CH4: Fix mlut create for intercomm_merge Old code is incorrectly optimized for intercomm_merge. No reviewer. diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h index 3e9f6a5..d837115 100644 --- a/src/mpid/ch4/src/ch4i_comm.h +++ b/src/mpid/ch4/src/ch4i_comm.h @@ -950,22 +950,11 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap, MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, " check map_size %d, src_comm_size %d", MPIDII_map_size(*mapper), src_comm_size)); - if (src_mode == MPIDII_RANK_MAP_MLUT) { - MPIDII_src_comm_to_mlut(src_rmap, dest_rmap, src_comm_size, - total_mapper_size, mapper_offset); - } - else { /* src_mode != MPIDII_RANK_MAP_MLUT */ - MPIDII_src_comm_to_lut(src_rmap, dest_rmap, src_comm_size, - total_mapper_size, mapper_offset); - } + MPIDII_src_comm_to_mlut(src_rmap, dest_rmap, src_comm_size, + total_mapper_size, mapper_offset); } else { /* mapper->type == MPIR_COMM_MAP_TYPE__IRREGULAR */ - if (src_mode == MPIDII_RANK_MAP_MLUT) { - MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset); - } - else { /* src_mode != MPIDII_RANK_MAP_MLUT */ - MPIDII_src_map_to_lut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset); - } + MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset); } fn_exit: ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/src/ch4i_comm.h | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-416-gbfefee8
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 bfefee88130f464b8037b9250a6394d1f7a14dc6 (commit) from fa897516e38b52e3f91abe2da7197630d7d2c639 (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/bfefee88130f464b8037b9250a6394d1f… commit bfefee88130f464b8037b9250a6394d1f7a14dc6 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Aug 4 12:38:01 2016 -0500 ROMIO: Remove outdated configure check Now that MPL is embedded in ROMIO, there is no need to check for MPICH memory allocation routines. Remove the configure check and use the MPL versions directly. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/confdb/aclocal_romio.m4 b/confdb/aclocal_romio.m4 index 64091ba..94f4e2e 100644 --- a/confdb/aclocal_romio.m4 +++ b/confdb/aclocal_romio.m4 @@ -786,28 +786,6 @@ EOF fi rm -f conftest$EXEEXT mpitest.c ])dnl -define(PAC_TEST_MPIU_FUNCS,[ - AC_MSG_CHECKING(support for MPICH memory macros) - rm -f mpitest.c - cat > mpitest.c <<EOF -#include "mpi.h" -#include "stdio.h" - main(Int argc, char **argv) - { - MPL_free(NULL); - } -EOF - rm -f conftest$EXEEXT - $CC $USER_CFLAGS -I$MPI_INCLUDE_DIR -o conftest$EXEEXT mpitest.c $MPI_LIB > /dev/null 2>&1 - if test -x conftest$EXEEXT ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined]) - else - AC_MSG_RESULT(no) - fi - rm -f conftest$EXEEXT mpitest.c -])dnl -dnl define(PAC_TEST_MPI_GREQUEST,[ AC_MSG_CHECKING(support for generalized requests) rm -f mpitest.c diff --git a/src/mpi/romio/adio/common/malloc.c b/src/mpi/romio/adio/common/malloc.c index f0838e1..b10d75f 100644 --- a/src/mpi/romio/adio/common/malloc.c +++ b/src/mpi/romio/adio/common/malloc.c @@ -37,12 +37,6 @@ void *ADIOI_Calloc_fn(size_t nelem, size_t elsize, int lineno, const char *fname void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname); void ADIOI_Free_fn(void *ptr, int lineno, const char *fname); -/* we used to call MPIU_Malloc, MPIU_Calloc, etc. these macros either call - * malloc/calloc directly or they add instrumentation/tracing. When we re-did - * the build system in 2011 we hacked ROMIO to call MPIU_trmalloc directly -- - * once again ROMIO's sort-of standalone status bites us. We dont' test for - * MPIU_FUNCS: these are set in configure with an AC_DEFINE when we figure out - * we are built as part of MPICH */ void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname) { void *new; @@ -50,11 +44,7 @@ void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname) #ifdef ROMIO_XFS new = (void *) memalign(XFS_MEMALIGN, size); #else -#ifdef HAVE_MPIU_FUNCS new = (void *) MPL_malloc(size); -#else - new = (void *) malloc(size); -#endif #endif if (!new && size) { FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno); @@ -70,11 +60,7 @@ void *ADIOI_Calloc_fn(size_t nelem, size_t elsize, int lineno, const char *fname { void *new; -#ifdef HAVE_MPIU_FUNCS new = (void *) MPL_calloc(nelem, elsize); -#else - new = (void *) calloc(nelem, elsize); -#endif if (!new && nelem) { FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno); MPI_Abort(MPI_COMM_WORLD, 1); @@ -88,11 +74,7 @@ void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname) { void *new; -#ifdef HAVE_MPIU_FUNCS new = (void *) MPL_realloc(ptr, size); -#else - new = (void *) realloc(ptr, size); -#endif if (!new && size) { FPRINTF(stderr, "realloc failed in file %s, line %d\n", fname, lineno); MPI_Abort(MPI_COMM_WORLD, 1); @@ -110,11 +92,7 @@ void ADIOI_Free_fn(void *ptr, int lineno, const char *fname) MPI_Abort(MPI_COMM_WORLD, 1); } -#ifdef HAVE_MPIU_FUNCS MPL_free(ptr); -#else - free(ptr); -#endif } diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 67732c4..eaec4f2 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1516,7 +1516,6 @@ elif test $FROM_MPICH = yes ; then AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if status_set_bytes available]) DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1" DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1" - AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined]) AC_DEFINE(HAVE_MPIX_H, 1, []) AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier) AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X]) @@ -1531,7 +1530,6 @@ fi if test $WITHIN_KNOWN_MPI_IMPL = no ; then PAC_TEST_MPIR_STATUS_SET_BYTES PAC_TEST_MPI_GREQUEST - PAC_TEST_MPIU_FUNCS AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages]) AC_CHECK_TYPE([MPI_Count],[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ], [[#include <mpi.h>]]) PAC_TEST_NEEDS_CONST ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_romio.m4 | 22 ---------------------- src/mpi/romio/adio/common/malloc.c | 22 ---------------------- src/mpi/romio/configure.ac | 2 -- 3 files changed, 0 insertions(+), 46 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-415-gfa89751
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 fa897516e38b52e3f91abe2da7197630d7d2c639 (commit) via 3d1e1a3943bd33184a48517ed87c4dd1883edce4 (commit) from 8d4de3bd8d64fb545e9046e6b78ef766a90aaee9 (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/fa897516e38b52e3f91abe2da7197630d… commit fa897516e38b52e3f91abe2da7197630d7d2c639 Author: Yanfei Guo <yguo(a)anl.gov> Date: Thu Aug 25 14:11:14 2016 -0500 CH4: fix getting pid from local_map No reviewer. diff --git a/src/mpid/ch4/src/ch4r_proc.h b/src/mpid/ch4/src/ch4r_proc.h index 65c75bf..91ccfbe 100644 --- a/src/mpid/ch4/src/ch4r_proc.h +++ b/src/mpid/ch4/src/ch4r_proc.h @@ -149,8 +149,8 @@ static inline int MPIDIU_comm_rank_to_pid_local(MPIR_Comm * comm, int rank, int break; case MPIDII_RANK_MAP_STRIDE: case MPIDII_RANK_MAP_STRIDE_INTRA: - *index = MPIDII_CALC_STRIDE_SIMPLE(rank, MPIDII_COMM(comm, map).reg.stride.stride, - MPIDII_COMM(comm, map).reg.stride.offset); + *index = MPIDII_CALC_STRIDE_SIMPLE(rank, MPIDII_COMM(comm, local_map).reg.stride.stride, + MPIDII_COMM(comm, local_map).reg.stride.offset); break; case MPIDII_RANK_MAP_STRIDE_BLOCK: case MPIDII_RANK_MAP_STRIDE_BLOCK_INTRA: http://git.mpich.org/mpich.git/commitdiff/3d1e1a3943bd33184a48517ed87c4dd18… commit 3d1e1a3943bd33184a48517ed87c4dd1883edce4 Author: Yanfei Guo <yguo(a)anl.gov> Date: Thu Aug 25 14:07:06 2016 -0500 CH4: fix debug print out in rank map No reviewer. diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h index a5575d7..3e9f6a5 100644 --- a/src/mpid/ch4/src/ch4i_comm.h +++ b/src/mpid/ch4/src/ch4i_comm.h @@ -177,7 +177,7 @@ static inline int MPIDII_detect_regular_model(int *lpid, int size, if (st < 0 || st <= bs) { return MPIDII_SRC_MAPPER_IRREGULAR; } - MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, "\tdetect model: stride %d", bs)); + MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, "\tdetect model: stride %d", st)); for (i = bs; i < size; i++) { if (lpid[i] != MPIDII_CALC_STRIDE(i, st, bs, off)) { return MPIDII_SRC_MAPPER_IRREGULAR; @@ -873,9 +873,9 @@ static inline int MPIDII_check_convert_lut_to_regular(MPIDII_rank_map_t * src) MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.offset)); MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, - (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.blocksize)); + (MPL_DBG_FDEST, "\tblocksize: %d", src->reg.stride.blocksize)); MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, - (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.stride)); + (MPL_DBG_FDEST, "\tstride: %d", src->reg.stride.stride)); break; } fn_exit: ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/src/ch4i_comm.h | 6 +++--- src/mpid/ch4/src/ch4r_proc.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-413-g8d4de3b
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 8d4de3bd8d64fb545e9046e6b78ef766a90aaee9 (commit) from ac947d5c4576ff9683eb945c823c0974173a7b4b (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/8d4de3bd8d64fb545e9046e6b78ef766a… commit 8d4de3bd8d64fb545e9046e6b78ef766a90aaee9 Author: Eric Chamberland <ericc(a)giref.ulaval.ca> Date: Mon Aug 29 09:53:13 2016 -0500 binding/cxx: Fix extra semicolon warning Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/cxx/buildiface b/src/binding/cxx/buildiface index ab0b1a4..2491f4d 100755 --- a/src/binding/cxx/buildiface +++ b/src/binding/cxx/buildiface @@ -3573,14 +3573,14 @@ sub Clone_method { MPI_Comm_dup( (MPI_Comm)the_real_comm, &ncomm); Comm *clone = new $classname(ncomm); return *clone; - }; + } #else virtual $classname & Clone(void) const { MPI_Comm ncomm; MPI_Comm_dup( (MPI_Comm)the_real_comm, &ncomm); $classname *clone = new $classname(ncomm); return *clone; - }; + } #endif\n"; } sub Comm_methods { @@ -3673,12 +3673,12 @@ sub Nullcomm_methods { virtual Comm & Clone(void) const { Comm *clone = new Nullcomm(MPI_COMM_NULL); return *clone; - }; + } #else virtual Nullcomm & Clone(void) const { Nullcomm *clone = new Nullcomm(); return *clone; - }; + } #endif\n"; } ----------------------------------------------------------------------- Summary of changes: src/binding/cxx/buildiface | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-412-gac947d5
by noreply＠mpich.org 31 Aug '16

31 Aug '16

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 ac947d5c4576ff9683eb945c823c0974173a7b4b (commit) from 1e51b91103ffb101586135c3ac49d4c0b53b6c2d (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/ac947d5c4576ff9683eb945c823c09741… commit ac947d5c4576ff9683eb945c823c0974173a7b4b Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Jul 26 09:08:23 2016 -0500 CH4/OFI: Fix AV_TABLE mode Fixes csr/mpich-opa#387 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/ofi/ofi_impl.h b/src/mpid/ch4/netmod/ofi/ofi_impl.h index cd80910..79aec52 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch4/netmod/ofi/ofi_impl.h @@ -22,16 +22,10 @@ #define MPIDI_OFI_COMM(comm) ((comm)->dev.ch4.netmod.ofi) #define MPIDI_OFI_COMM_TO_INDEX(comm,rank) \ MPIDIU_comm_rank_to_pid(comm, rank, NULL, NULL) -#ifdef MPIDI_OFI_CONFIG_USE_AV_TABLE -#define MPIDI_OFI_COMM_TO_PHYS(comm,rank) \ - ((fi_addr_t)MPIDI_OFI_COMM_TO_INDEX(comm,rank)) -#define MPIDI_OFI_TO_PHYS(avtid, rank) ((fi_addr_t)rank) -#else #define MPIDI_OFI_COMM_TO_PHYS(comm,rank) \ MPIDI_OFI_AV(MPIDIU_comm_rank_to_av((comm), (rank))).dest #define MPIDI_OFI_TO_PHYS(avtid, lpid) \ MPIDI_OFI_AV(&MPIDIU_get_av((avtid), (lpid))).dest -#endif #define MPIDI_OFI_WIN(win) ((win)->dev.netmod.ofi) /* diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h index d8a9579..31eceeb 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_init.h +++ b/src/mpid/ch4/netmod/ofi/ofi_init.h @@ -285,12 +285,11 @@ static inline int MPIDI_OFI_init_generic(int rank, if (do_av_table) { av_attr.type = FI_AV_TABLE; - mapped_table = NULL; } else { av_attr.type = FI_AV_MAP; - mapped_table = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t)); } + mapped_table = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t)); av_attr.rx_ctx_bits = MPIDI_OFI_MAX_ENDPOINTS_BITS; @@ -373,12 +372,10 @@ static inline int MPIDI_OFI_init_generic(int rank, /* Table is constructed. Map it */ /* -------------------------------- */ MPIDI_OFI_CALL(fi_av_insert(MPIDI_Global.av, table, size, mapped_table, 0ULL, NULL), avmap); - if (!do_av_table) { /* AV_MAP */ - for (i = 0; i < size; i++) { - MPIDI_OFI_AV(&MPIDIU_get_av(0, i)).dest = mapped_table[i]; - } - MPL_free(mapped_table); + for (i = 0; i < size; i++) { + MPIDI_OFI_AV(&MPIDIU_get_av(0, i)).dest = mapped_table[i]; } + MPL_free(mapped_table); /* -------------------------------- */ /* Create the id to object maps */ diff --git a/src/mpid/ch4/netmod/ofi/ofi_pre.h b/src/mpid/ch4/netmod/ofi/ofi_pre.h index 5e2e966..8d3d690 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_pre.h +++ b/src/mpid/ch4/netmod/ofi/ofi_pre.h @@ -179,9 +179,7 @@ typedef struct { } MPIDI_OFI_gpid_t; typedef struct { -#ifndef MPIDI_OFI_CONFIG_USE_AV_TABLE fi_addr_t dest; -#endif #ifdef MPIDI_OFI_CONFIG_USE_SCALABLE_ENDPOINTS unsigned ep_idx:MPIDI_OFI_MAX_ENDPOINTS_BITS; #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/ofi_impl.h | 6 ------ src/mpid/ch4/netmod/ofi/ofi_init.h | 11 ++++------- src/mpid/ch4/netmod/ofi/ofi_pre.h | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-411-g1e51b91
by noreply＠mpich.org 30 Aug '16

30 Aug '16

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 1e51b91103ffb101586135c3ac49d4c0b53b6c2d (commit) from ee2f29508c93d5b37a979c0b0820a5401b6b69f8 (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/1e51b91103ffb101586135c3ac49d4c0b… commit 1e51b91103ffb101586135c3ac49d4c0b53b6c2d Author: Hajime Fujita <hajime.fujita(a)intel.com> Date: Fri Aug 5 16:04:10 2016 -0500 CH4/OFI: Use regular EP for RMA instead of alias It turns out that using an endpoint from fi_ep_alias would incur additional redirection. This patch eliminates the use of fi_ep_alias in RMA window creation to avoid this potential cost. Fixes csr/mpich-opa#394 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/ofi/ofi_win.h b/src/mpid/ch4/netmod/ofi/ofi_win.h index 2975845..2bb045d 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_win.h +++ b/src/mpid/ch4/netmod/ofi/ofi_win.h @@ -154,12 +154,14 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, MPIR_Assert(finfo); finfo->ep_attr->tx_ctx_cnt = FI_SHARED_CONTEXT; /* Request a shared context */ MPIDI_OFI_CALL_RETURN(fi_endpoint(MPIDI_Global.domain, - finfo, &MPIDI_OFI_WIN(win).ep, NULL), ret); - fi_freeinfo(finfo); + finfo, + &MPIDI_OFI_WIN(win).ep, + NULL), ret); if (ret < 0) { MPL_DBG_MSG(MPIDI_CH4_DBG_GENERAL, VERBOSE, "Failed to create per-window EP (with completion), " "falling back to global EP/counter scheme"); + fi_freeinfo(finfo); goto fallback_global; } @@ -180,8 +182,11 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, FI_READ | FI_WRITE), bind); MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep, &MPIDI_Global.av->fid, 0), bind); - MPIDI_OFI_CALL_RETURN(fi_ep_alias(MPIDI_OFI_WIN(win).ep, &MPIDI_OFI_WIN(win).ep_nocmpl, - FI_TRANSMIT), ret); + MPIDI_OFI_CALL_RETURN(fi_endpoint(MPIDI_Global.domain, + finfo, + &MPIDI_OFI_WIN(win).ep_nocmpl, + NULL), ret); + fi_freeinfo(finfo); if (ret < 0) { MPL_DBG_MSG(MPIDI_CH4_DBG_GENERAL, VERBOSE, "Failed to create an EP alias, " @@ -191,6 +196,14 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, goto fallback_global; } + MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, + &MPIDI_Global.stx_ctx->fid, 0), bind); + MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, + &MPIDI_OFI_WIN(win).cmpl_cntr->fid, + FI_READ | FI_WRITE), bind); + MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, + &MPIDI_Global.av->fid, 0), bind); + MPIDI_OFI_CALL(fi_enable(MPIDI_OFI_WIN(win).ep), ep_enable); MPIDI_OFI_CALL(fi_enable(MPIDI_OFI_WIN(win).ep_nocmpl), ep_enable); } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/ofi_win.h | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository tag, v3.3a1, created. v3.2-410-gee2f295
by noreply＠mpich.org 30 Aug '16

30 Aug '16

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 tag, v3.3a1 has been created at ee2f29508c93d5b37a979c0b0820a5401b6b69f8 (commit) - Log ----------------------------------------------------------------- commit ee2f29508c93d5b37a979c0b0820a5401b6b69f8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Aug 30 12:52:42 2016 -0500 Add CH4 info to README and RELEASE_NOTES Signed-off-by: Pavan Balaji <balaji(a)anl.gov> ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-410-gee2f295
by noreply＠mpich.org 30 Aug '16

30 Aug '16

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 ee2f29508c93d5b37a979c0b0820a5401b6b69f8 (commit) from b8df3c9da9169577b880eac2e385d2eea0e1fe8d (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/ee2f29508c93d5b37a979c0b0820a5401… commit ee2f29508c93d5b37a979c0b0820a5401b6b69f8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Aug 30 12:52:42 2016 -0500 Add CH4 info to README and RELEASE_NOTES Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/README.vin b/README.vin index c845b17..5b0a2bf 100644 --- a/README.vin +++ b/README.vin @@ -397,8 +397,9 @@ relevant Makefiles. ================================= The communication mechanisms in MPICH are called "devices". MPICH -supports ch3 (default), as well as many third-party devices that are -released and maintained by other institutes. +supports ch3 (default) and ch4 (experimental), as well as many +third-party devices that are released and maintained by other +institutes. ************************************* @@ -577,6 +578,57 @@ channel can be configured using the following option: --with-device=ch3:sock + +ch4 device +********** +The ch4 device contains different network and shared memory modules +for communication. We currently support the ofi and ucx network +modules, and posix shared memory module. + +ofi network module +``````````````````` +The ofi netmod provides support for the OFI network programming interface. +To enable, configure with the following option: + + --with-device=ch4:ofi + +If the OFI include files and libraries are not in the normal search paths, +you can specify them with the following options: + + --with-libfabric-include= and --with-libfabric-lib= + +... or the if lib/ and include/ are in the same directory, you can use +the following option: + + --with-libfabric= + +ucx network module +`````````````````` +The ucx netmod provides support for the Unified Communication X +library. It can be built with the following configure option: + + --with-device=ch4:ucx + +If the UCX include files and libraries are not in the normal search paths, +you can specify them with the following options: + + --with-ucx-include= and --with-ucx-lib= + +... or the if lib/ and include/ are in the same directory, you can use +the following option: + + --with-ucx= + +By default, the UCX library throws warnings when the system does not +enable certain features that might hurt performance. These are +important warnings that might cause performance degradation on your +system. But you might need root privileges to fix some of them. If +you would like to disable such warnings, you can set the UCX log level +to "error" instead of the default "warn" by using: + + UCX_LOG_LEVEL=error + export UCX_LOG_LEVEL + ------------------------------------------------------------------------- 5. Alternate Process Managers diff --git a/RELEASE_NOTES b/RELEASE_NOTES index b3d7b1e..be423d0 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -2,6 +2,17 @@ KNOWN ISSUES ---------------------------------------------------------------------- +### CH4 preview + + * Build Issues + - CH4 will not build with "--enable-strict". + - CH4 will not build with Solaris compilers. + + * Test failures + - CH4 will not currently pass 100% of the testsuite. + - Test failures differ based on experimental setup and network + support built in. + ### Solaris compilers * Compilation on solaris will freeze when MPICH is configured with ----------------------------------------------------------------------- Summary of changes: README.vin | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- RELEASE_NOTES | 11 +++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-409-gb8df3c9
by noreply＠mpich.org 29 Aug '16

29 Aug '16

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 b8df3c9da9169577b880eac2e385d2eea0e1fe8d (commit) from 1b68d685084037ff3b9061f9eaab38ca7459f9d7 (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/b8df3c9da9169577b880eac2e385d2eea… commit b8df3c9da9169577b880eac2e385d2eea0e1fe8d Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Aug 29 20:34:30 2016 -0500 CH4/OFI: Remove unneeded library flags Fixes ch4:ofi build on FreeBSD. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/ofi/Makefile.mk b/src/mpid/ch4/netmod/ofi/Makefile.mk index df2a564..b4d479c 100644 --- a/src/mpid/ch4/netmod/ofi/Makefile.mk +++ b/src/mpid/ch4/netmod/ofi/Makefile.mk @@ -16,7 +16,6 @@ mpi_core_sources += src/mpid/ch4/netmod/ofi/func_table.c \ src/mpid/ch4/netmod/ofi/globals.c \ src/mpid/ch4/netmod/ofi/util.c errnames_txt_files += src/mpid/ch4/netmod/ofi/errnames.txt -external_ldflags += -ldl -lpthread external_subdirs += @ofisrcdir@ pmpi_convenience_libs += @ofilib@ diff --git a/src/mpid/ch4/netmod/ofi/subconfigure.m4 b/src/mpid/ch4/netmod/ofi/subconfigure.m4 index 35e4a03..0c07763 100644 --- a/src/mpid/ch4/netmod/ofi/subconfigure.m4 +++ b/src/mpid/ch4/netmod/ofi/subconfigure.m4 @@ -138,15 +138,6 @@ AM_COND_IF([BUILD_CH4_NETMOD_OFI],[ ofilib="src/mpid/ch4/netmod/ofi/libfabric/src/libfabric.la" fi - case $host_os in - darwin* ) - PAC_APPEND_FLAG([-lstdc++ -ldl],[WRAPPER_LIBS]) - ;; - *) - PAC_APPEND_FLAG([-lstdc++ -ldl -lrt],[WRAPPER_LIBS]) - ;; - esac - ])dnl end AM_COND_IF(BUILD_CH4_NETMOD_OFI,...) ])dnl end _BODY ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/Makefile.mk | 1 - src/mpid/ch4/netmod/ofi/subconfigure.m4 | 9 --------- 2 files changed, 0 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0