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

[mpich] MPICH primary repository branch, master, updated. v3.2a2-185-g071fd93
by noreply＠mpich.org 27 Feb '15

27 Feb '15

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 071fd93c51ab7edcc02426967a495ab2bb1cc276 (commit) via 78b06634cac587833253fbaacd5a498c46ccee3d (commit) via 8ba706d7b5b7bf4699236ceecdefcb96b03541f1 (commit) via e56d9b8f0581770acb05a8aad92e34d25a12c891 (commit) via cc25a421468645c99f0cc5ca8b36b8fa50295875 (commit) from c1df83ef4c7a47cfe4738a48044b00c56deb9761 (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/071fd93c51ab7edcc02426967a495ab2b… commit 071fd93c51ab7edcc02426967a495ab2bb1cc276 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Feb 27 13:55:46 2015 -0600 Add a generic error code MPI_T_ERR_INVALID of MPI-3.1 The error code will be introduced in MPI-3.1. The code is used in MPI_T_pvar_read, which has motivated for adding the error code. See also https://svn.mpi-forum.org/trac/mpi-forum-web/ticket/400 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 230c60c..c78ae17 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -866,12 +866,13 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_T_ERR_PVAR_NO_WRITE 71 /* Pvar can't be written or reset */ #define MPI_T_ERR_PVAR_NO_ATOMIC 72 /* Pvar can't be R/W atomically */ #define MPI_T_ERR_INVALID_NAME 73 /* Name doesn't match */ +#define MPI_T_ERR_INVALID 74 /* Generic error code for MPI_T added in MPI-3.1 */ #define MPI_ERR_LASTCODE 0x3fffffff /* Last valid error code for a predefined error class */ /* WARNING: this is also defined in mpishared.h. Update both locations */ -#define MPICH_ERR_LAST_CLASS 73 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the last valid class */ #define MPICH_ERR_FIRST_MPIX 100 /* Define a gap here because sock is diff --git a/src/include/mpishared.h b/src/include/mpishared.h index 8c73b89..16cf8ed 100644 --- a/src/include/mpishared.h +++ b/src/include/mpishared.h @@ -62,7 +62,7 @@ #include "mpierrs.h" /* FIXME: This is extracted from mpi.h.in, where it may not be appropriate */ -#define MPICH_ERR_LAST_CLASS 73 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the last valid class */ #include "mpifunc.h" diff --git a/src/mpi_t/pvar_read.c b/src/mpi_t/pvar_read.c index 54956ab..de4c718 100644 --- a/src/mpi_t/pvar_read.c +++ b/src/mpi_t/pvar_read.c @@ -35,11 +35,11 @@ int MPIR_T_pvar_read_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, int i, mpi_errno = MPI_SUCCESS; /* Reading a never started pvar, or a stopped and then reset wartermark, - * will run into this nasty situation. Wait for an error code to be defined - * by the Standard. Currently, use MPI_ERR_OTHER. + * will run into this nasty situation. Return a generic MPI_T error code, + * which is defined in MPI-3.1. */ if (!MPIR_T_pvar_is_oncestarted(handle)) { - mpi_errno = MPI_ERR_OTHER; + mpi_errno = MPI_T_ERR_INVALID; goto fn_fail; } http://git.mpich.org/mpich.git/commitdiff/78b06634cac587833253fbaacd5a498c4… commit 78b06634cac587833253fbaacd5a498c46ccee3d Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Feb 27 16:34:07 2015 -0600 Add a test for the new MPI_T_xxx_get_index() routines See https://svn.mpi-forum.org/trac/mpi-forum-web/ticket/377 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index bed964d..913d84a 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -911,6 +911,7 @@ /mpi_t/mpi_t_str /mpi_t/mpit_vars /mpi_t/cvarwrite +/mpi_t/getindex /perf/allredtrace /perf/commcreatep /perf/dtpack diff --git a/test/mpi/mpi_t/Makefile.am b/test/mpi/mpi_t/Makefile.am index 95088d7..7f6bc88 100644 --- a/test/mpi/mpi_t/Makefile.am +++ b/test/mpi/mpi_t/Makefile.am @@ -15,4 +15,5 @@ EXTRA_DIST = testlist noinst_PROGRAMS = \ mpi_t_str \ mpit_vars \ - cvarwrite + cvarwrite \ + getindex diff --git a/test/mpi/mpi_t/getindex.c b/test/mpi/mpi_t/getindex.c new file mode 100644 index 0000000..ede43a6 --- /dev/null +++ b/test/mpi/mpi_t/getindex.c @@ -0,0 +1,81 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +/* Test MPI_T_xxx_get_index() for cvars, pvars and categories. + */ +#include <stdio.h> +#include "mpi.h" + +static int verbose = 0; + +int main(int argc, char *argv[]) +{ + int i; + int required, provided, namelen; + int num_cvar, num_pvar, num_cat; + int cvar_index, pvar_index, cat_index; + int pvar_class; + char name[128]; + int errno, errs = 0; + + required = MPI_THREAD_SINGLE; + MPI_T_init_thread(required, &provided); + MPI_Init(&argc, &argv); + + /* Test MPI_T_cvar_get_index with both valid and bogus names */ + MPI_T_cvar_get_num(&num_cvar); + if (verbose) fprintf(stdout, "%d MPI Control Variables\n", num_cvar); + for (i = 0; i < num_cvar; i++) { + namelen = sizeof(name); + MPI_T_cvar_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (namelen <= 128) { + errno = MPI_T_cvar_get_index(name, &cvar_index); + if (errno != MPI_SUCCESS || cvar_index != i) errs++; + } + } + errno = MPI_T_cvar_get_index("AN INVALID CVAR NAME FOR TEST", &cvar_index); + if (errno != MPI_T_ERR_INVALID_NAME) errs++; + + if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + + /* Test MPI_T_pvar_get_index with both valid and bogus names */ + MPI_T_pvar_get_num(&num_pvar); + if (verbose) fprintf(stdout, "%d MPI Performance Variables\n", num_pvar); + + for (i = 0; i < num_pvar; i++) { + namelen = sizeof(name); + MPI_T_pvar_get_info(i, name, &namelen, NULL, &pvar_class, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if (namelen <= 128) { + errno = MPI_T_pvar_get_index(name, pvar_class, &pvar_index); + if (errno != MPI_SUCCESS || pvar_index != i) errs++; + } + } + errno = MPI_T_pvar_get_index("AN INVALID PVAR NAME FOR TEST", MPI_T_PVAR_CLASS_COUNTER, &cvar_index); + if (errno != MPI_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + + /* Test MPI_T_category_get_index with both valid and bogus names */ + MPI_T_category_get_num(&num_cat); + if (verbose) fprintf(stdout, "%d MPI_T categories\n", num_cat); + for (i = 0; i < num_cat; i++) { + namelen = sizeof(name); + MPI_T_category_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL); + if (namelen <= 128) { + errno = MPI_T_category_get_index(name, &cat_index); + if (errno != MPI_SUCCESS || cat_index != i) errs++; + } + } + errno = MPI_T_category_get_index("AN INVALID CATEGORY NAME FOR TEST", &cat_index); + if (errno != MPI_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + + MPI_T_finalize(); + MPI_Finalize(); + + if (errs == 0) fprintf(stdout, " No Errors\n"); + return 0; +} diff --git a/test/mpi/mpi_t/testlist b/test/mpi/mpi_t/testlist index f6e3e6a..752709a 100644 --- a/test/mpi/mpi_t/testlist +++ b/test/mpi/mpi_t/testlist @@ -1,3 +1,4 @@ mpi_t_str 1 mpiversion=3.0 mpit_vars 1 mpiversion=3.0 cvarwrite 1 mpiversion=3.0 +getindex 1 mpiversion=3.1 http://git.mpich.org/mpich.git/commitdiff/8ba706d7b5b7bf4699236ceecdefcb96b… commit 8ba706d7b5b7bf4699236ceecdefcb96b03541f1 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Feb 27 15:01:50 2015 -0600 Add error names for newly added MPI_T routines See https://svn.mpi-forum.org/trac/mpi-forum-web/ticket/377 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpi_t/errnames.txt b/src/mpi_t/errnames.txt index 1d4ba7f..37c7f3c 100644 --- a/src/mpi_t/errnames.txt +++ b/src/mpi_t/errnames.txt @@ -66,3 +66,9 @@ **mpi_t_category_get_categories %d %d %p: MPI_T_category_get_categories(cat_index=%d, len=%d, indices=%p) **mpi_t_category_changed: MPI_T_category_changed failed **mpi_t_category_changed %p: MPI_T_category_changed(stamp=%p) +**mpi_t_cvar_get_index: mpi_t_cvar_get_index failed +**mpi_t_cvar_get_index %p %p: mpi_t_cvar_get_index(name=%p, cvar_index=%p) +**mpi_t_pvar_get_index: mpi_t_pvar_get_index failed +**mpi_t_pvar_get_index %p %d %p: mpi_t_pvar_get_index(name=%p, var_class=%d, pvar_index=%p) +**mpi_t_category_get_index: mpi_t_category_get_index failed +**mpi_t_category_get_index %p %p: mpi_t_category_get_index(name=%p, cat_index=%p) http://git.mpich.org/mpich.git/commitdiff/e56d9b8f0581770acb05a8aad92e34d25… commit e56d9b8f0581770acb05a8aad92e34d25a12c891 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Feb 27 14:58:06 2015 -0600 Implement new MPI_T routines to get vars/categories by name The new routines are defined in upcoming MPI-3.1. See https://svn.mpi-forum.org/trac/mpi-forum-web/ticket/377 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpi_t/Makefile.mk b/src/mpi_t/Makefile.mk index dd1a0e0..c193ebc 100644 --- a/src/mpi_t/Makefile.mk +++ b/src/mpi_t/Makefile.mk @@ -33,7 +33,10 @@ mpi_sources += \ src/mpi_t/pvar_session_free.c \ src/mpi_t/pvar_start.c \ src/mpi_t/pvar_stop.c \ - src/mpi_t/pvar_write.c + src/mpi_t/pvar_write.c \ + src/mpi_t/cat_get_index.c \ + src/mpi_t/cvar_get_index.c \ + src/mpi_t/pvar_get_index.c mpi_core_sources += src/mpi_t/mpit.c diff --git a/src/mpi_t/cat_get_index.c b/src/mpi_t/cat_get_index.c new file mode 100644 index 0000000..415eaa4 --- /dev/null +++ b/src/mpi_t/cat_get_index.c @@ -0,0 +1,89 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2011 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpiimpl.h" + +/* -- Begin Profiling Symbol Block for routine MPI_T_category_get_index */ +#if defined(HAVE_PRAGMA_WEAK) +#pragma weak MPI_T_category_get_index = PMPI_T_category_get_index +#elif defined(HAVE_PRAGMA_HP_SEC_DEF) +#pragma _HP_SECONDARY_DEF PMPI_T_category_get_index MPI_T_category_get_index +#elif defined(HAVE_PRAGMA_CRI_DUP) +#pragma _CRI duplicate MPI_T_category_get_index as PMPI_T_category_get_index +#endif +/* -- End Profiling Symbol Block */ + +/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build + the MPI routines */ +#ifndef MPICH_MPI_FROM_PMPI +#undef MPI_T_category_get_index +#define MPI_T_category_get_index PMPI_T_category_get_index +#endif /* MPICH_MPI_FROM_PMPI */ + +#undef FUNCNAME +#define FUNCNAME MPI_T_category_get_index +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +/*@ +MPI_T_category_get_index - Get the index of a category + +Output Parameters: +. name - the name of the category (string) + +Output Parameters: +. cat_index - the index of the category (integer) + +.N ThreadSafe + +.N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_INVALID_NAME +.N MPI_T_ERR_NOT_INITIALIZED +@*/ +int MPI_T_category_get_index(const char *name, int *cat_index) +{ + int mpi_errno = MPI_SUCCESS; + + MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); + MPIR_T_THREAD_CS_ENTER(); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + + /* Validate parameters */ +# ifdef HAVE_ERROR_CHECKING + { + MPID_BEGIN_ERROR_CHECKS + { + MPIR_ERRTEST_ARGNULL(name, "name", mpi_errno); + MPIR_ERRTEST_ARGNULL(cat_index, "cat_index", mpi_errno); + } + MPID_END_ERROR_CHECKS + } +# endif /* HAVE_ERROR_CHECKING */ + + /* ... body of routine ... */ + + name2index_hash_t *hash_entry; + + /* Do hash lookup by the name */ + HASH_FIND_STR(cat_hash, name, hash_entry); + if (hash_entry != NULL) { + *cat_index = hash_entry->idx; + } else { + mpi_errno = MPI_T_ERR_INVALID_NAME; + goto fn_fail; + } + + /* ... end of body of routine ... */ + +fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPIR_T_THREAD_CS_EXIT(); + return mpi_errno; + +fn_fail: + goto fn_exit; +} diff --git a/src/mpi_t/cvar_get_index.c b/src/mpi_t/cvar_get_index.c new file mode 100644 index 0000000..c065ea1 --- /dev/null +++ b/src/mpi_t/cvar_get_index.c @@ -0,0 +1,89 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2011 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpiimpl.h" + +/* -- Begin Profiling Symbol Block for routine MPI_T_cvar_get_index */ +#if defined(HAVE_PRAGMA_WEAK) +#pragma weak MPI_T_cvar_get_index = PMPI_T_cvar_get_index +#elif defined(HAVE_PRAGMA_HP_SEC_DEF) +#pragma _HP_SECONDARY_DEF PMPI_T_cvar_get_index MPI_T_cvar_get_index +#elif defined(HAVE_PRAGMA_CRI_DUP) +#pragma _CRI duplicate MPI_T_cvar_get_index as PMPI_T_cvar_get_index +#endif +/* -- End Profiling Symbol Block */ + +/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build + the MPI routines */ +#ifndef MPICH_MPI_FROM_PMPI +#undef MPI_T_cvar_get_index +#define MPI_T_cvar_get_index PMPI_T_cvar_get_index +#endif /* MPICH_MPI_FROM_PMPI */ + +#undef FUNCNAME +#define FUNCNAME MPI_T_cvar_get_index +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +/*@ +MPI_T_cvar_get_index - Get the index of a control variable + +Output Parameters: +. name - name of the control variable (string) + +Output Parameters: +. cvar_index - index of the control variable (integer) + +.N ThreadSafe + +.N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_INVALID_NAME +.N MPI_T_ERR_NOT_INITIALIZED +@*/ +int MPI_T_cvar_get_index(const char *name, int *cvar_index) +{ + int mpi_errno = MPI_SUCCESS; + + MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); + MPIR_T_THREAD_CS_ENTER(); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CVAR_GET_INDEX); + + /* Validate parameters */ +# ifdef HAVE_ERROR_CHECKING + { + MPID_BEGIN_ERROR_CHECKS + { + MPIR_ERRTEST_ARGNULL(name, "name", mpi_errno); + MPIR_ERRTEST_ARGNULL(cvar_index, "cvar_index", mpi_errno); + } + MPID_END_ERROR_CHECKS + } +# endif /* HAVE_ERROR_CHECKING */ + + /* ... body of routine ... */ + + name2index_hash_t *hash_entry; + + /* Do hash lookup by the name */ + HASH_FIND_STR(cvar_hash, name, hash_entry); + if (hash_entry != NULL) { + *cvar_index = hash_entry->idx; + } else { + mpi_errno = MPI_T_ERR_INVALID_NAME; + goto fn_fail; + } + + /* ... end of body of routine ... */ + +fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPIR_T_THREAD_CS_EXIT(); + return mpi_errno; + +fn_fail: + goto fn_exit; +} diff --git a/src/mpi_t/pvar_get_index.c b/src/mpi_t/pvar_get_index.c new file mode 100644 index 0000000..b785bea --- /dev/null +++ b/src/mpi_t/pvar_get_index.c @@ -0,0 +1,97 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2011 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpiimpl.h" + +/* -- Begin Profiling Symbol Block for routine MPI_T_pvar_get_index */ +#if defined(HAVE_PRAGMA_WEAK) +#pragma weak MPI_T_pvar_get_index = PMPI_T_pvar_get_index +#elif defined(HAVE_PRAGMA_HP_SEC_DEF) +#pragma _HP_SECONDARY_DEF PMPI_T_pvar_get_index MPI_T_pvar_get_index +#elif defined(HAVE_PRAGMA_CRI_DUP) +#pragma _CRI duplicate MPI_T_pvar_get_index as PMPI_T_pvar_get_index +#endif +/* -- End Profiling Symbol Block */ + +/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build + the MPI routines */ +#ifndef MPICH_MPI_FROM_PMPI +#undef MPI_T_pvar_get_index +#define MPI_T_pvar_get_index PMPI_T_pvar_get_index +#endif /* MPICH_MPI_FROM_PMPI */ + +#undef FUNCNAME +#define FUNCNAME MPI_T_pvar_get_index +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +/*@ +MPI_T_pvar_get_index - Get the index of a performance variable + +Input Parameters: +. name - the name of the performance variable (string) +. var_class - the class of the performance variable (integer) + +Output Parameters: +. pvar_index - the index of the performance variable (integer) + +.N ThreadSafe + +.N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_INVALID_NAME +.N MPI_T_ERR_NOT_INITIALIZED +@*/ +int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) +{ + int mpi_errno = MPI_SUCCESS; + + MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); + MPIR_T_THREAD_CS_ENTER(); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_PVAR_GET_INDEX); + + /* Validate parameters */ +# ifdef HAVE_ERROR_CHECKING + { + MPID_BEGIN_ERROR_CHECKS + { + MPIR_ERRTEST_ARGNULL(name, "name", mpi_errno); + MPIR_ERRTEST_ARGNULL(pvar_index, "pvar_index", mpi_errno); + if (var_class < MPIR_T_PVAR_CLASS_FIRST || + var_class >= MPIR_T_PVAR_CLASS_LAST) + { + mpi_errno = MPI_T_ERR_INVALID_NAME; + goto fn_fail; + } + } + MPID_END_ERROR_CHECKS + } +# endif /* HAVE_ERROR_CHECKING */ + + /* ... body of routine ... */ + + int seq = var_class - MPIR_T_PVAR_CLASS_FIRST; + name2index_hash_t *hash_entry; + + /* Do hash lookup by the name */ + HASH_FIND_STR(pvar_hashs[seq], name, hash_entry); + if (hash_entry != NULL) { + *pvar_index = hash_entry->idx; + } else { + mpi_errno = MPI_T_ERR_INVALID_NAME; + goto fn_fail; + } + + /* ... end of body of routine ... */ + +fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPIR_T_THREAD_CS_EXIT(); + return mpi_errno; + +fn_fail: + goto fn_exit; +} http://git.mpich.org/mpich.git/commitdiff/cc25a421468645c99f0cc5ca8b36b8fa5… commit cc25a421468645c99f0cc5ca8b36b8fa50295875 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri Feb 27 14:54:49 2015 -0600 Add new MPI_T routines and an error code in headers They are defined in upcoming MPI-3.1. See https://svn.mpi-forum.org/trac/mpi-forum-web/ticket/377 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index b2963d1..230c60c 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -865,12 +865,13 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_T_ERR_PVAR_NO_STARTSTOP 70 /* Pvar can't be started or stopped */ #define MPI_T_ERR_PVAR_NO_WRITE 71 /* Pvar can't be written or reset */ #define MPI_T_ERR_PVAR_NO_ATOMIC 72 /* Pvar can't be R/W atomically */ +#define MPI_T_ERR_INVALID_NAME 73 /* Name doesn't match */ #define MPI_ERR_LASTCODE 0x3fffffff /* Last valid error code for a predefined error class */ /* WARNING: this is also defined in mpishared.h. Update both locations */ -#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 73 /* It is also helpful to know the last valid class */ #define MPICH_ERR_FIRST_MPIX 100 /* Define a gap here because sock is @@ -1530,6 +1531,9 @@ int MPI_T_category_get_cvars(int cat_index, int len, int indices[]); int MPI_T_category_get_pvars(int cat_index, int len, int indices[]); int MPI_T_category_get_categories(int cat_index, int len, int indices[]); int MPI_T_category_changed(int *stamp); +int MPI_T_cvar_get_index(const char *name, int *cvar_index); +int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int MPI_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ @@ -2173,6 +2177,9 @@ int PMPI_T_category_get_cvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_pvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_categories(int cat_index, int len, int indices[]); int PMPI_T_category_changed(int *stamp); +int PMPI_T_cvar_get_index(const char *name, int *cvar_index); +int PMPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int PMPI_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ diff --git a/src/include/mpishared.h b/src/include/mpishared.h index 46a6bf1..8c73b89 100644 --- a/src/include/mpishared.h +++ b/src/include/mpishared.h @@ -62,7 +62,7 @@ #include "mpierrs.h" /* FIXME: This is extracted from mpi.h.in, where it may not be appropriate */ -#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 73 /* It is also helpful to know the last valid class */ #include "mpifunc.h" ----------------------------------------------------------------------- Summary of changes: src/include/mpi.h.in | 10 ++++- src/include/mpishared.h | 2 +- src/mpi_t/Makefile.mk | 5 ++- src/mpi_t/cat_get_index.c | 89 ++++++++++++++++++++++++++++++++++++++++ src/mpi_t/cvar_get_index.c | 89 ++++++++++++++++++++++++++++++++++++++++ src/mpi_t/errnames.txt | 6 +++ src/mpi_t/pvar_get_index.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ src/mpi_t/pvar_read.c | 6 +- test/mpi/.gitignore | 1 + test/mpi/mpi_t/Makefile.am | 3 +- test/mpi/mpi_t/getindex.c | 81 ++++++++++++++++++++++++++++++++++++ test/mpi/mpi_t/testlist | 1 + 12 files changed, 383 insertions(+), 7 deletions(-) create mode 100644 src/mpi_t/cat_get_index.c create mode 100644 src/mpi_t/cvar_get_index.c create mode 100644 src/mpi_t/pvar_get_index.c create mode 100644 test/mpi/mpi_t/getindex.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-180-gc1df83e
by noreply＠mpich.org 27 Feb '15

27 Feb '15

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 c1df83ef4c7a47cfe4738a48044b00c56deb9761 (commit) from f17d0ba5d9fa3147913ca0dc8d87847ecb5bb485 (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/c1df83ef4c7a47cfe4738a48044b00c56… commit c1df83ef4c7a47cfe4738a48044b00c56deb9761 Author: Charles J Archer <charles.j.archer(a)intel.com> Date: Fri Feb 27 10:18:27 2015 -0800 Updates to latest OFI api (endpoint attribute location change) diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 07b119c..652cea6 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -29,6 +29,7 @@ typedef struct fi_info info_t; typedef struct fi_cq_attr cq_attr_t; typedef struct fi_av_attr av_attr_t; typedef struct fi_domain_attr domain_attr_t; +typedef struct fi_ep_attr ep_attr_t; typedef struct fi_tx_attr tx_attr_t; typedef struct fi_cq_tagged_entry cq_tagged_entry_t; typedef struct fi_cq_err_entry cq_err_entry_t; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c index 150f5a2..7e51a58 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c @@ -52,11 +52,11 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* endpoint, so the netmod requires dynamic memory regions */ /* ------------------------------------------------------------------------ */ memset(&hints, 0, sizeof(hints)); - hints.mode = FI_CONTEXT; - hints.ep_type = FI_EP_RDM; /* Reliable datagram */ - hints.caps = FI_TAGGED; /* Tag matching interface */ - hints.caps |= FI_CANCEL; /* Support cancel */ - hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */ + hints.mode = FI_CONTEXT; + hints.caps = FI_TAGGED; /* Tag matching interface */ + hints.caps |= FI_CANCEL; /* Support cancel */ + hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */ + /* ------------------------------------------------------------------------ */ /* FI_VERSION provides binary backward and forward compatibility support */ @@ -73,14 +73,20 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ domain_attr_t domain_attr; memset(&domain_attr, 0, sizeof(domain_attr)); + ep_attr_t ep_attr; + memset(&ep_attr, 0, sizeof(ep_attr)); + tx_attr_t tx_attr; memset(&tx_attr, 0, sizeof(tx_attr)); - domain_attr.threading = FI_THREAD_ENDPOINT; - domain_attr.control_progress = FI_PROGRESS_AUTO; - domain_attr.data_progress = FI_PROGRESS_AUTO; - hints.domain_attr = &domain_attr; - hints.tx_attr = &tx_attr; + hints.ep_attr = &ep_attr; + hints.ep_attr->type = FI_EP_RDM; + + domain_attr.threading = FI_THREAD_ENDPOINT; + domain_attr.control_progress = FI_PROGRESS_AUTO; + domain_attr.data_progress = FI_PROGRESS_AUTO; + hints.domain_attr = &domain_attr; + hints.tx_attr = &tx_attr; FI_RC(fi_getinfo(fi_version, /* Interface version requested */ NULL, /* Optional name or fabric to resolve */ @@ -285,7 +291,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ int MPID_nem_ofi_finalize(void) { int mpi_errno = MPI_SUCCESS; - int ret = 0; + mpir_errflag_t ret = MPIR_ERR_NONE; BEGIN_FUNC(FCNAME); /* --------------------------------------------- */ ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 1 + .../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 28 ++++++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-179-gf17d0ba
by noreply＠mpich.org 27 Feb '15

27 Feb '15

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 f17d0ba5d9fa3147913ca0dc8d87847ecb5bb485 (commit) from 51d6c94873957ca8ccbd996db2888e39c3687ed8 (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/f17d0ba5d9fa3147913ca0dc8d87847ec… commit f17d0ba5d9fa3147913ca0dc8d87847ecb5bb485 Author: artem.v.yalozo <artem.v.yalozo(a)intel.com> Date: Wed Feb 11 20:31:25 2015 +0400 added missed brackets in MPL_LL_DELETE_VS2008 macro Change-Id: Id7cb0c5122eb04eea7f2c5ea541b97a48ca71df3 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpl/include/mpl_utlist.h b/src/mpl/include/mpl_utlist.h index cadc0b0..eb5ea0c 100644 --- a/src/mpl/include/mpl_utlist.h +++ b/src/mpl/include/mpl_utlist.h @@ -391,11 +391,11 @@ do { (tail)=(head); \ } else { \ char *_tmp = (char*)(head); \ - while (head->_next && (head->_next != (del))) { \ - head = head->_next; \ + while ((head)->_next && ((head)->_next != (del))) { \ + (head) = (head)->_next; \ } \ - if (head->_next) { \ - head->_next = ((del)->_next); \ + if ((head)->_next) { \ + (head)->_next = ((del)->_next); \ if ((tail) == (del)) \ (tail)=(head); \ } \ ----------------------------------------------------------------------- Summary of changes: src/mpl/include/mpl_utlist.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-178-g51d6c94
by noreply＠mpich.org 26 Feb '15

26 Feb '15

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 51d6c94873957ca8ccbd996db2888e39c3687ed8 (commit) via eb972bf67b442b36fdcd9e2138ca0e15ed45a9f8 (commit) via fe0d61dbf896be25d1d63f63aed4ff5a3d2ee484 (commit) via ad489f822654fde50d187b483590ee48901a399d (commit) from 6523ad970475dcbe71d8529d0928aa31ed416cdf (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/51d6c94873957ca8ccbd996db2888e39c… commit 51d6c94873957ca8ccbd996db2888e39c3687ed8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Feb 25 12:52:31 2015 -0600 portals4: change variable name Make it clearer that the meappend_large is passed a usable set of match_bits. No further conversion is needed. Signed-off-by: Antonio Pena Monferrer <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index d13adae..0564ac0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -96,7 +96,7 @@ int MPID_nem_ptl_nm_finalize(void) #define FUNCNAME meappend_large #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_bits_t tag, void *buf, size_t remaining) +static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_bits_t match_bits, void *buf, size_t remaining) { int mpi_errno = MPI_SUCCESS; int ret; @@ -113,7 +113,7 @@ static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_ me.options = ( PTL_ME_OP_GET | PTL_ME_USE_ONCE | PTL_ME_IS_ACCESSIBLE | PTL_ME_EVENT_LINK_DISABLE | PTL_ME_EVENT_UNLINK_DISABLE ); me.match_id = id; - me.match_bits = tag; + me.match_bits = match_bits; me.ignore_bits = NPTL_MATCH_IGNORE; me.min_free = 0; @@ -126,7 +126,7 @@ static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_ &foo_me_handle); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeappend", "**ptlmeappend %s", MPID_nem_ptl_strerror(ret)); - MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlMEAppend(req=%p tag=%#lx)", req, tag)); + MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlMEAppend(req=%p tag=%#lx)", req, NPTL_MATCH_GET_TAG(match_bits))); me.start = (char *)me.start + me.length; remaining -= me.length; http://git.mpich.org/mpich.git/commitdiff/eb972bf67b442b36fdcd9e2138ca0e15e… commit eb972bf67b442b36fdcd9e2138ca0e15ed45a9f8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Feb 25 09:12:22 2015 -0600 portals4: use portals4 hdr_data for length info Moves the message length information from the payload to the message header to save on overhead. Signed-off-by: Antonio Pena Monferrer <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index a4a2134..d13adae 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -12,17 +12,12 @@ #define NUM_RECV_BUFS 50 #define CTL_TAG 0 #define GET_TAG 1 -#define PAYLOAD_SIZE (PTL_MAX_EAGER - offsetof(buf_t, packet) - sizeof(MPIDI_CH3_Pkt_t)) -#define SENDBUF_SIZE(sent_sz_) (offsetof(buf_t, packet) + sizeof(MPIDI_CH3_Pkt_t) + (sent_sz_)) +#define PAYLOAD_SIZE (PTL_MAX_EAGER - sizeof(MPIDI_CH3_Pkt_t)) +#define SENDBUF_SIZE(sent_sz_) (sizeof(MPIDI_CH3_Pkt_t) + (sent_sz_)) #define SENDBUF(req_) REQ_PTL(req_)->chunk_buffer[0] #define TMPBUF(req_) REQ_PTL(req_)->chunk_buffer[1] -typedef struct { - size_t remaining; - char packet[PTL_MAX_EAGER]; -} buf_t; - -static buf_t recvbufs[NUM_RECV_BUFS]; +static char recvbufs[NUM_RECV_BUFS * PTL_MAX_EAGER]; static ptl_me_t mes[NUM_RECV_BUFS]; static ptl_handle_me_t me_handles[NUM_RECV_BUFS]; static unsigned long long put_cnt = 0; /* required to not finalizing too early */ @@ -46,8 +41,8 @@ int MPID_nem_ptl_nm_init(void) id_any.phys.nid = PTL_NID_ANY; for (i = 0; i < NUM_RECV_BUFS; ++i) { - mes[i].start = &recvbufs[i]; - mes[i].length = sizeof(buf_t); + mes[i].start = &recvbufs[i * PTL_MAX_EAGER]; + mes[i].length = PTL_MAX_EAGER; mes[i].ct_handle = PTL_CT_NONE; mes[i].uid = PTL_UID_ANY; mes[i].options = (PTL_ME_OP_PUT | PTL_ME_USE_ONCE | PTL_ME_EVENT_UNLINK_DISABLE | @@ -156,9 +151,10 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); int ret; - buf_t *sendbuf; + char *sendbuf; const size_t sent_sz = data_sz < PAYLOAD_SIZE ? data_sz : PAYLOAD_SIZE; const size_t sendbuf_sz = SENDBUF_SIZE(sent_sz); + const size_t remaining = data_sz - sent_sz; ptl_match_bits_t match_bits = NPTL_MATCH(CTL_TAG, 0, MPIDI_Process.my_pg_rank); MPIDI_STATE_DECL(MPID_STATE_SEND_PKT); @@ -166,17 +162,16 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ sendbuf = MPIU_Malloc(sendbuf_sz); MPIU_Assert(sendbuf != NULL); - MPIU_Memcpy(sendbuf->packet, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); - sendbuf->remaining = data_sz - sent_sz; + MPIU_Memcpy(sendbuf, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); TMPBUF(sreq) = NULL; REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->put_done = 0; if (data_sz) { - MPIU_Memcpy(sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz); - if (sendbuf->remaining) /* Post MEs for the remote gets */ + MPIU_Memcpy(sendbuf + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz); + if (remaining) /* Post MEs for the remote gets */ mpi_errno = meappend_large(vc_ptl->id, sreq, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), - (char *)data_p + sent_sz, sendbuf->remaining); + (char *)data_p + sent_sz, remaining); if (mpi_errno) goto fn_fail; } @@ -185,7 +180,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ REQ_PTL(sreq)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)sendbuf, sendbuf_sz, PTL_NO_ACK_REQ, - vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, 0); + vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, NPTL_HEADER(0, remaining)); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlput", "**ptlput %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlPut(size=%lu id=(%#x,%#x) pt=%#x)", @@ -209,9 +204,10 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); int ret; - buf_t *sendbuf; + char *sendbuf; const size_t sent_sz = sreq->dev.segment_size < PAYLOAD_SIZE ? sreq->dev.segment_size : PAYLOAD_SIZE; - size_t sendbuf_sz = SENDBUF_SIZE(sent_sz); + const size_t sendbuf_sz = SENDBUF_SIZE(sent_sz); + const size_t remaining = sreq->dev.segment_size - sent_sz; ptl_match_bits_t match_bits = NPTL_MATCH(CTL_TAG, 0, MPIDI_Process.my_pg_rank); MPIDI_STATE_DECL(MPID_STATE_SEND_NONCONTIG_PKT); MPIDI_FUNC_ENTER(MPID_STATE_SEND_NONCONTIG_PKT); @@ -220,24 +216,23 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) sendbuf = MPIU_Malloc(sendbuf_sz); MPIU_Assert(sendbuf != NULL); - MPIU_Memcpy(sendbuf->packet, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); - sendbuf->remaining = sreq->dev.segment_size - sent_sz; + MPIU_Memcpy(sendbuf, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); TMPBUF(sreq) = NULL; REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->put_done = 0; if (sreq->dev.segment_size) { MPIDI_msg_sz_t last = sent_sz; - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t)); + MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sendbuf + sizeof(MPIDI_CH3_Pkt_t)); - if (sendbuf->remaining) { /* Post MEs for the remote gets */ - TMPBUF(sreq) = MPIU_Malloc(sendbuf->remaining); + if (remaining) { /* Post MEs for the remote gets */ + TMPBUF(sreq) = MPIU_Malloc(remaining); sreq->dev.segment_first = last; last = sreq->dev.segment_size; MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, TMPBUF(sreq)); MPIU_Assert(last == sreq->dev.segment_size); - mpi_errno = meappend_large(vc_ptl->id, sreq, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), TMPBUF(sreq), sendbuf->remaining); + mpi_errno = meappend_large(vc_ptl->id, sreq, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), TMPBUF(sreq), remaining); if (mpi_errno) goto fn_fail; } @@ -247,7 +242,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) REQ_PTL(sreq)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)sendbuf, sendbuf_sz, PTL_NO_ACK_REQ, - vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, 0); + vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, NPTL_HEADER(0, remaining)); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlput", "**ptlput %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlPut(size=%lu id=(%#x,%#x) pt=%#x)", @@ -384,17 +379,18 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) { int ret; const uint64_t buf_idx = (uint64_t) e->user_ptr; - const size_t packet_sz = e->mlength - offsetof(buf_t, packet); + const size_t packet_sz = e->mlength; MPIDI_VC_t *vc; MPID_nem_ptl_vc_area * vc_ptl; + ptl_size_t remaining = NPTL_HEADER_GET_LENGTH(e->hdr_data); - MPIU_Assert(e->start == &recvbufs[buf_idx]); + MPIU_Assert(e->start == &recvbufs[buf_idx * PTL_MAX_EAGER]); MPIDI_PG_Get_vc(MPIDI_Process.my_pg, NPTL_MATCH_GET_RANK(e->match_bits), &vc); vc_ptl = VC_PTL(vc); - if (recvbufs[buf_idx].remaining == 0) { - mpi_errno = MPID_nem_handle_pkt(vc, recvbufs[buf_idx].packet, packet_sz); + if (remaining == 0) { + mpi_errno = MPID_nem_handle_pkt(vc, &recvbufs[buf_idx * PTL_MAX_EAGER], packet_sz); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } @@ -407,17 +403,16 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIU_Assert(req != NULL); MPIDI_CH3U_Request_decrement_cc(req, &incomplete); /* We'll increment it below */ REQ_PTL(req)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; - REQ_PTL(req)->bytes_put = packet_sz + recvbufs[buf_idx].remaining; + REQ_PTL(req)->bytes_put = packet_sz + remaining; TMPBUF(req) = MPIU_Malloc(REQ_PTL(req)->bytes_put); MPIU_Assert(TMPBUF(req) != NULL); - MPIU_Memcpy(TMPBUF(req), recvbufs[buf_idx].packet, packet_sz); + MPIU_Memcpy(TMPBUF(req), &recvbufs[buf_idx * PTL_MAX_EAGER], packet_sz); req->ch.vc = vc; - size = recvbufs[buf_idx].remaining < MPIDI_nem_ptl_ni_limits.max_msg_size ? - recvbufs[buf_idx].remaining : MPIDI_nem_ptl_ni_limits.max_msg_size; + size = remaining < MPIDI_nem_ptl_ni_limits.max_msg_size ? remaining : MPIDI_nem_ptl_ni_limits.max_msg_size; buf_ptr = (char *)TMPBUF(req) + packet_sz; - while (recvbufs[buf_idx].remaining) { + while (remaining) { MPIDI_CH3U_Request_increment_cc(req, &incomplete); /* Will be decremented - and eventually freed in REPLY */ ret = MPID_nem_ptl_rptl_get(MPIDI_nem_ptl_global_md, (ptl_size_t)buf_ptr, size, vc_ptl->id, vc_ptl->ptc, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), 0, req); @@ -428,9 +423,9 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) vc_ptl->id.phys.nid, vc_ptl->id.phys.pid, vc_ptl->ptc, GET_TAG)); buf_ptr += size; - recvbufs[buf_idx].remaining -= size; - if (recvbufs[buf_idx].remaining < MPIDI_nem_ptl_ni_limits.max_msg_size) - size = recvbufs[buf_idx].remaining; + remaining -= size; + if (remaining < MPIDI_nem_ptl_ni_limits.max_msg_size) + size = remaining; } } http://git.mpich.org/mpich.git/commitdiff/fe0d61dbf896be25d1d63f63aed4ff5a3… commit fe0d61dbf896be25d1d63f63aed4ff5a3d2ee484 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Feb 24 23:12:28 2015 -0600 portals4: encode rank in match bits instead of header Use the match bits to encode a process's rank in MPI_COMM_WORLD, to be retrieved by the receiving process. This is the same method used by the 2-sided Portals code, and allows the header to be used for other purposes. Signed-off-by: Antonio Pena Monferrer <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 41ceaa0..a4a2134 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -53,8 +53,8 @@ int MPID_nem_ptl_nm_init(void) mes[i].options = (PTL_ME_OP_PUT | PTL_ME_USE_ONCE | PTL_ME_EVENT_UNLINK_DISABLE | PTL_ME_EVENT_LINK_DISABLE | PTL_ME_IS_ACCESSIBLE); mes[i].match_id = id_any; - mes[i].match_bits = CTL_TAG; - mes[i].ignore_bits = 0; + mes[i].match_bits = NPTL_MATCH(CTL_TAG, 0, MPI_ANY_SOURCE); + mes[i].ignore_bits = NPTL_MATCH_IGNORE; ret = MPID_nem_ptl_me_append(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_control_pt, &mes[i], PTL_PRIORITY_LIST, (void *)(uint64_t)i, &me_handles[i]); @@ -119,7 +119,7 @@ static inline int meappend_large(ptl_process_t id, MPID_Request *req, ptl_match_ PTL_ME_EVENT_LINK_DISABLE | PTL_ME_EVENT_UNLINK_DISABLE ); me.match_id = id; me.match_bits = tag; - me.ignore_bits = 0; + me.ignore_bits = NPTL_MATCH_IGNORE; me.min_free = 0; while (remaining) { @@ -159,6 +159,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ buf_t *sendbuf; const size_t sent_sz = data_sz < PAYLOAD_SIZE ? data_sz : PAYLOAD_SIZE; const size_t sendbuf_sz = SENDBUF_SIZE(sent_sz); + ptl_match_bits_t match_bits = NPTL_MATCH(CTL_TAG, 0, MPIDI_Process.my_pg_rank); MPIDI_STATE_DECL(MPID_STATE_SEND_PKT); MPIDI_FUNC_ENTER(MPID_STATE_SEND_PKT); @@ -174,7 +175,8 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ if (data_sz) { MPIU_Memcpy(sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz); if (sendbuf->remaining) /* Post MEs for the remote gets */ - mpi_errno = meappend_large(vc_ptl->id, sreq, GET_TAG, (char *)data_p + sent_sz, sendbuf->remaining); + mpi_errno = meappend_large(vc_ptl->id, sreq, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), + (char *)data_p + sent_sz, sendbuf->remaining); if (mpi_errno) goto fn_fail; } @@ -183,7 +185,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ REQ_PTL(sreq)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)sendbuf, sendbuf_sz, PTL_NO_ACK_REQ, - vc_ptl->id, vc_ptl->ptc, CTL_TAG, 0, sreq, MPIDI_Process.my_pg_rank); + vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, 0); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlput", "**ptlput %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlPut(size=%lu id=(%#x,%#x) pt=%#x)", @@ -210,6 +212,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) buf_t *sendbuf; const size_t sent_sz = sreq->dev.segment_size < PAYLOAD_SIZE ? sreq->dev.segment_size : PAYLOAD_SIZE; size_t sendbuf_sz = SENDBUF_SIZE(sent_sz); + ptl_match_bits_t match_bits = NPTL_MATCH(CTL_TAG, 0, MPIDI_Process.my_pg_rank); MPIDI_STATE_DECL(MPID_STATE_SEND_NONCONTIG_PKT); MPIDI_FUNC_ENTER(MPID_STATE_SEND_NONCONTIG_PKT); @@ -234,7 +237,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, TMPBUF(sreq)); MPIU_Assert(last == sreq->dev.segment_size); - mpi_errno = meappend_large(vc_ptl->id, sreq, GET_TAG, TMPBUF(sreq), sendbuf->remaining); + mpi_errno = meappend_large(vc_ptl->id, sreq, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), TMPBUF(sreq), sendbuf->remaining); if (mpi_errno) goto fn_fail; } @@ -244,7 +247,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) REQ_PTL(sreq)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)sendbuf, sendbuf_sz, PTL_NO_ACK_REQ, - vc_ptl->id, vc_ptl->ptc, CTL_TAG, 0, sreq, MPIDI_Process.my_pg_rank); + vc_ptl->id, vc_ptl->ptc, match_bits, 0, sreq, 0); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlput", "**ptlput %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlPut(size=%lu id=(%#x,%#x) pt=%#x)", @@ -387,7 +390,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIU_Assert(e->start == &recvbufs[buf_idx]); - MPIDI_PG_Get_vc(MPIDI_Process.my_pg, (uint64_t)e->hdr_data, &vc); + MPIDI_PG_Get_vc(MPIDI_Process.my_pg, NPTL_MATCH_GET_RANK(e->match_bits), &vc); vc_ptl = VC_PTL(vc); if (recvbufs[buf_idx].remaining == 0) { @@ -417,11 +420,11 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) while (recvbufs[buf_idx].remaining) { MPIDI_CH3U_Request_increment_cc(req, &incomplete); /* Will be decremented - and eventually freed in REPLY */ ret = MPID_nem_ptl_rptl_get(MPIDI_nem_ptl_global_md, (ptl_size_t)buf_ptr, - size, vc_ptl->id, vc_ptl->ptc, GET_TAG, 0, req); + size, vc_ptl->id, vc_ptl->ptc, NPTL_MATCH(GET_TAG, 0, MPIDI_Process.my_pg_rank), 0, req); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlget", "**ptlget %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, - "PtlGet(size=%lu id=(%#x,%#x) pt=%#x tag=%#lx)", size, + "PtlGet(size=%lu id=(%#x,%#x) pt=%#x tag=%d)", size, vc_ptl->id.phys.nid, vc_ptl->id.phys.pid, vc_ptl->ptc, GET_TAG)); buf_ptr += size; http://git.mpich.org/mpich.git/commitdiff/ad489f822654fde50d187b483590ee489… commit ad489f822654fde50d187b483590ee48901a399d Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Feb 11 16:15:26 2015 -0600 portals4: simplify operation tags in RMA code Since we use the same portal for puts and gets in the RMA code, we differentiate them with the otherwise unused match_bits. This commit removes the sequenced tag numbers, instead relying on a simple 2 tag system and the natural matching order of the portal. Signed-off-by: Antonio Pena Monferrer <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 1780920..41ceaa0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -11,19 +11,14 @@ #define NUM_RECV_BUFS 50 #define CTL_TAG 0 +#define GET_TAG 1 #define PAYLOAD_SIZE (PTL_MAX_EAGER - offsetof(buf_t, packet) - sizeof(MPIDI_CH3_Pkt_t)) #define SENDBUF_SIZE(sent_sz_) (offsetof(buf_t, packet) + sizeof(MPIDI_CH3_Pkt_t) + (sent_sz_)) #define SENDBUF(req_) REQ_PTL(req_)->chunk_buffer[0] #define TMPBUF(req_) REQ_PTL(req_)->chunk_buffer[1] -#define NEW_TAG(tag_) do { \ - if (++global_tag == CTL_TAG) \ - ++global_tag; \ - (tag_) = global_tag; \ -} while(0) typedef struct { size_t remaining; - ptl_match_bits_t tag; char packet[PTL_MAX_EAGER]; } buf_t; @@ -31,8 +26,6 @@ static buf_t recvbufs[NUM_RECV_BUFS]; static ptl_me_t mes[NUM_RECV_BUFS]; static ptl_handle_me_t me_handles[NUM_RECV_BUFS]; static unsigned long long put_cnt = 0; /* required to not finalizing too early */ -static ptl_match_bits_t global_tag = 0; - #undef FUNCNAME #define FUNCNAME MPID_nem_ptl_nm_init @@ -174,7 +167,6 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ MPIU_Assert(sendbuf != NULL); MPIU_Memcpy(sendbuf->packet, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); sendbuf->remaining = data_sz - sent_sz; - NEW_TAG(sendbuf->tag); TMPBUF(sreq) = NULL; REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->put_done = 0; @@ -182,7 +174,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ if (data_sz) { MPIU_Memcpy(sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz); if (sendbuf->remaining) /* Post MEs for the remote gets */ - mpi_errno = meappend_large(vc_ptl->id, sreq, sendbuf->tag, (char *)data_p + sent_sz, sendbuf->remaining); + mpi_errno = meappend_large(vc_ptl->id, sreq, GET_TAG, (char *)data_p + sent_sz, sendbuf->remaining); if (mpi_errno) goto fn_fail; } @@ -227,7 +219,6 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) MPIU_Assert(sendbuf != NULL); MPIU_Memcpy(sendbuf->packet, hdr_p, sizeof(MPIDI_CH3_Pkt_t)); sendbuf->remaining = sreq->dev.segment_size - sent_sz; - NEW_TAG(sendbuf->tag); TMPBUF(sreq) = NULL; REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->put_done = 0; @@ -243,7 +234,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, TMPBUF(sreq)); MPIU_Assert(last == sreq->dev.segment_size); - mpi_errno = meappend_large(vc_ptl->id, sreq, sendbuf->tag, TMPBUF(sreq), sendbuf->remaining); + mpi_errno = meappend_large(vc_ptl->id, sreq, GET_TAG, TMPBUF(sreq), sendbuf->remaining); if (mpi_errno) goto fn_fail; } @@ -420,21 +411,19 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) req->ch.vc = vc; - req->dev.match.parts.tag = recvbufs[buf_idx].tag; - size = recvbufs[buf_idx].remaining < MPIDI_nem_ptl_ni_limits.max_msg_size ? recvbufs[buf_idx].remaining : MPIDI_nem_ptl_ni_limits.max_msg_size; buf_ptr = (char *)TMPBUF(req) + packet_sz; while (recvbufs[buf_idx].remaining) { MPIDI_CH3U_Request_increment_cc(req, &incomplete); /* Will be decremented - and eventually freed in REPLY */ ret = MPID_nem_ptl_rptl_get(MPIDI_nem_ptl_global_md, (ptl_size_t)buf_ptr, - size, vc_ptl->id, vc_ptl->ptc, recvbufs[buf_idx].tag, 0, req); + size, vc_ptl->id, vc_ptl->ptc, GET_TAG, 0, req); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlget", "**ptlget %s", MPID_nem_ptl_strerror(ret)); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "PtlGet(size=%lu id=(%#x,%#x) pt=%#x tag=%#lx)", size, vc_ptl->id.phys.nid, - vc_ptl->id.phys.pid, vc_ptl->ptc, recvbufs[buf_idx].tag)); + vc_ptl->id.phys.pid, vc_ptl->ptc, GET_TAG)); buf_ptr += size; recvbufs[buf_idx].remaining -= size; if (recvbufs[buf_idx].remaining < MPIDI_nem_ptl_ni_limits.max_msg_size) ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 109 +++++++++----------- 1 files changed, 48 insertions(+), 61 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-174-g6523ad9
by noreply＠mpich.org 26 Feb '15

26 Feb '15

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 6523ad970475dcbe71d8529d0928aa31ed416cdf (commit) from 8a9d5c71449c9955b76deff7489a038d28dad9c8 (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/6523ad970475dcbe71d8529d0928aa31e… commit 6523ad970475dcbe71d8529d0928aa31ed416cdf Author: Sangmin Seo <sseo(a)anl.gov> Date: Wed Feb 18 22:33:33 2015 -0600 Fix async progress problem in NBC I/O. When the async progress thread blocked the progress engine and yielded control, if a thread started waiting inside a wait routine, e.g., ADIOI_GEN_iwc_wait_fn, of NBC I/O implementation, a deadlock happened. The thread waiting continuously called MPI_Test to make progress, but the progress engine did not make progress because it was blocked due to the async progress thread. The async progress thread tried to acquire the lock, but the waiting thread did not release the lock because it did not finish the wait routine. Thus, it was a deadlock. This patch fixes this deadlock problem by forcing the waiting thread to yield if the progress engine has been blocked by another thread. Fixes #2202 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c index 937f5b7..0f376c5 100644 --- a/src/glue/romio/glue_romio.c +++ b/src/glue/romio/glue_romio.c @@ -49,6 +49,25 @@ void MPIR_Ext_cs_exit_allfunc(void) MPIU_THREAD_CS_EXIT(ALLFUNC,); } +/* This routine is for a thread to yield control when the thread is waiting for + * the completion of communication inside a ROMIO routine but the progress + * engine is blocked by another thread. */ +#ifdef MPICH_IS_THREADED +extern volatile int MPIDI_CH3I_progress_blocked; +#endif +void MPIR_Ext_cs_yield_allfunc_if_progress_blocked(void) +{ +#ifdef MPICH_IS_THREADED + MPIU_THREAD_CHECK_BEGIN; + { + if (MPIDI_CH3I_progress_blocked == TRUE) { + MPIU_THREAD_CS_YIELD(ALLFUNC,); + } + } + MPIU_THREAD_CHECK_END; +#endif +} + /* will consider MPI_DATATYPE_NULL to be an error */ #undef FUNCNAME #define FUNCNAME MPIR_Ext_datatype_iscommitted diff --git a/src/include/glue_romio.h.in b/src/include/glue_romio.h.in index f074353..16271b1 100644 --- a/src/include/glue_romio.h.in +++ b/src/include/glue_romio.h.in @@ -53,6 +53,7 @@ int MPIR_Ext_init(void); void MPIR_Ext_cs_enter_allfunc(void); void MPIR_Ext_cs_exit_allfunc(void); +void MPIR_Ext_cs_yield_allfunc_if_progress_blocked(void); /* to facilitate error checking */ int MPIR_Ext_datatype_iscommitted(MPI_Datatype datatype); diff --git a/src/mpi/romio/adio/common/ad_iread_coll.c b/src/mpi/romio/adio/common/ad_iread_coll.c index 023a142..b1311e6 100644 --- a/src/mpi/romio/adio/common/ad_iread_coll.c +++ b/src/mpi/romio/adio/common/ad_iread_coll.c @@ -7,6 +7,7 @@ #include "adio.h" #include "adio_extern.h" #include "mpiu_greq.h" +#include "mpioimpl.h" #ifdef USE_DBG_LOGGING #define RDCOLL_DEBUG 1 @@ -1303,6 +1304,10 @@ static int ADIOI_GEN_irc_wait_fn(int count, void **array_of_states, if ((timeout > 0) && (timeout < (MPI_Wtime() - starttime))) goto fn_exit; + + /* If the progress engine is blocked, we have to yield for another + thread to be able to unblock the progress engine. */ + MPIU_THREAD_CS_YIELD(ALLFUNC,_if_progress_blocked); } } diff --git a/src/mpi/romio/adio/common/ad_iwrite_coll.c b/src/mpi/romio/adio/common/ad_iwrite_coll.c index 7fa423f..b456ec4 100644 --- a/src/mpi/romio/adio/common/ad_iwrite_coll.c +++ b/src/mpi/romio/adio/common/ad_iwrite_coll.c @@ -7,6 +7,7 @@ #include "adio.h" #include "adio_extern.h" #include "mpiu_greq.h" +#include "mpioimpl.h" #ifdef AGGREGATION_PROFILE #include "mpe.h" @@ -1527,6 +1528,10 @@ static int ADIOI_GEN_iwc_wait_fn(int count, void **array_of_states, if ((timeout > 0) && (timeout < (MPI_Wtime() - starttime))) goto fn_exit; + + /* If the progress engine is blocked, we have to yield for another + thread to be able to unblock the progress engine. */ + MPIU_THREAD_CS_YIELD(ALLFUNC,_if_progress_blocked); } } diff --git a/src/mpi/romio/mpi-io/mpioimpl.h b/src/mpi/romio/mpi-io/mpioimpl.h index 77b18cb..1cb92bf 100644 --- a/src/mpi/romio/mpi-io/mpioimpl.h +++ b/src/mpi/romio/mpi-io/mpioimpl.h @@ -20,8 +20,10 @@ #define MPIU_THREAD_CS_ENTER(name_,ctx_) MPIU_THREAD_CS_ENTER_##name_(ctx_) #define MPIU_THREAD_CS_EXIT(name_,ctx_) MPIU_THREAD_CS_EXIT_##name_(ctx_) +#define MPIU_THREAD_CS_YIELD(name_,ctx_) MPIU_THREAD_CS_YIELD_##name_(ctx_) #define MPIU_THREAD_CS_ENTER_ALLFUNC(ctx_) MPIR_Ext_cs_enter_allfunc() #define MPIU_THREAD_CS_EXIT_ALLFUNC(ctx_) MPIR_Ext_cs_exit_allfunc() +#define MPIU_THREAD_CS_YIELD_ALLFUNC(ctx_) MPIR_Ext_cs_yield_allfunc##ctx_() /* committed datatype checking support in ROMIO */ #define MPIO_DATATYPE_ISCOMMITTED(dtype_, err_) \ @@ -36,6 +38,7 @@ of correct programs */ #define MPIU_THREAD_CS_ENTER(x,y) #define MPIU_THREAD_CS_EXIT(x,y) +#define MPIU_THREAD_CS_YIELD(x,y) #define MPIO_DATATYPE_ISCOMMITTED(dtype_, err_) do {} while (0) #ifdef HAVE_WINDOWS_H #define MPIU_UNREFERENCED_ARG(a) a ----------------------------------------------------------------------- Summary of changes: src/glue/romio/glue_romio.c | 19 +++++++++++++++++++ src/include/glue_romio.h.in | 1 + src/mpi/romio/adio/common/ad_iread_coll.c | 5 +++++ src/mpi/romio/adio/common/ad_iwrite_coll.c | 5 +++++ src/mpi/romio/mpi-io/mpioimpl.h | 3 +++ 5 files changed, 33 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-173-g8a9d5c7
by noreply＠mpich.org 26 Feb '15

26 Feb '15

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 8a9d5c71449c9955b76deff7489a038d28dad9c8 (commit) from 03b1213468cef2ba85519491a16c21ad3bb678f6 (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/8a9d5c71449c9955b76deff7489a038d2… commit 8a9d5c71449c9955b76deff7489a038d28dad9c8 Author: Charles J Archer <charles.j.archer(a)intel.com> Date: Thu Feb 26 12:03:20 2015 -0800 Compile time fixes to the latest rc of OpenFabrics Interfaces diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c index 2fd7c87..150f5a2 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c @@ -52,12 +52,11 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* endpoint, so the netmod requires dynamic memory regions */ /* ------------------------------------------------------------------------ */ memset(&hints, 0, sizeof(hints)); - hints.mode = FI_CONTEXT; - hints.ep_type = FI_EP_RDM; /* Reliable datagram */ - hints.caps = FI_TAGGED; /* Tag matching interface */ - hints.caps |= FI_BUFFERED_RECV; /* Buffered receives */ - hints.caps |= FI_CANCEL; /* Support cancel */ - hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */ + hints.mode = FI_CONTEXT; + hints.ep_type = FI_EP_RDM; /* Reliable datagram */ + hints.caps = FI_TAGGED; /* Tag matching interface */ + hints.caps |= FI_CANCEL; /* Support cancel */ + hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */ /* ------------------------------------------------------------------------ */ /* FI_VERSION provides binary backward and forward compatibility support */ @@ -83,12 +82,12 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ hints.domain_attr = &domain_attr; hints.tx_attr = &tx_attr; - FI_RC(fi_getinfo(fi_version, /* Interface version requested */ - NULL, /* Optional name or fabric to resolve */ - NULL, /* Service name or port number to request */ - 0ULL, /* Flag: node/service specify local address */ - &hints, /* In: Hints to filter available providers */ - &prov_tagged), /* Out: List of providers that match hints */ + FI_RC(fi_getinfo(fi_version, /* Interface version requested */ + NULL, /* Optional name or fabric to resolve */ + NULL, /* Service name or port number to request */ + 0ULL, /* Flag: node/service specify local address */ + &hints, /* In: Hints to filter available providers */ + &prov_tagged), /* Out: List of providers that match hints */ getinfo); MPIU_ERR_CHKANDJUMP4(prov_tagged == NULL, mpi_errno, MPI_ERR_OTHER, "**ofi_getinfo", "**ofi_getinfo %s %d %s %s", @@ -375,84 +374,15 @@ cvars: */ static inline int dump_and_choose_providers(info_t * prov, info_t ** prov_use) { - info_t *p = prov; - int i = 0; - *prov_use = prov; - if (MPIR_CVAR_DUMP_PROVIDERS) { - fprintf(stdout, "Dumping Providers(first=%p):\n", prov); - while (p) { - fprintf(stdout, " ********** Provider %d (%p) *********\n", i++, p); - fprintf(stdout, "%-18s: %-#20" PRIx64 "\n", "caps", p->caps); - fprintf(stdout, "%-18s: %-#20" PRIx64 "\n", "mode", p->mode); - fprintf(stdout, "%-18s: %-#20" PRIx32 "\n", "ep_type", p->ep_type); - fprintf(stdout, "%-18s: %-#20" PRIx32 "\n", "addr_format", p->addr_format); - fprintf(stdout, "%-18s: %-20lu\n", "src_addrlen", p->src_addrlen); - fprintf(stdout, "%-18s: %-20lu\n", "dest_addrlen", p->dest_addrlen); - fprintf(stdout, "%-18s: %-20p\n", "src_addr", p->src_addr); - fprintf(stdout, "%-18s: %-20p\n", "dest_addr", p->dest_addr); - fprintf(stdout, "%-18s: %-20p\n", "connreq", p->connreq); - fprintf(stdout, "%-18s: %-20p\n", "tx_attr", p->tx_attr); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".caps", p->tx_attr->caps); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".mode", p->tx_attr->mode); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".op_flags", p->tx_attr->op_flags); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".msg_order", p->tx_attr->msg_order); - fprintf(stdout, " %-18s: %-20lu\n", ".inject_size", p->tx_attr->inject_size); - fprintf(stdout, " %-18s: %-20lu\n", ".size", p->tx_attr->size); - fprintf(stdout, " %-18s: %-20lu\n", ".iov_limit", p->tx_attr->iov_limit); - fprintf(stdout, "%-18s: %-20p\n", "rx_attr", p->rx_attr); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".caps", p->rx_attr->caps); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".mode", p->rx_attr->mode); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".op_flags", p->rx_attr->op_flags); - fprintf(stdout, " %-18s: %-#20" PRIx64 "\n", ".msg_order", p->rx_attr->msg_order); - fprintf(stdout, " %-18s: %-20lu\n", ".total_buffered_recv", - p->rx_attr->total_buffered_recv); - fprintf(stdout, " %-18s: %-20lu\n", ".size", p->rx_attr->size); - fprintf(stdout, " %-18s: %-20lu\n", ".iov_limit", p->rx_attr->iov_limit); - fprintf(stdout, "%-18s: %-20p\n", "ep_attr", p->ep_attr); - fprintf(stdout, " %-18s: %-#20" PRIx32 "\n", ".protocol", p->ep_attr->protocol); - fprintf(stdout, " %-18s: %-20lu\n", ".max_msg_size", p->ep_attr->max_msg_size); - fprintf(stdout, " %-18s: %-20lu\n", ".inject_size", p->ep_attr->inject_size); - fprintf(stdout, " %-18s: %-20lu\n", ".total_buffered_recv", - p->ep_attr->total_buffered_recv); - fprintf(stdout, " %-18s: %-20lu\n", ".max_order_raw_size", - p->ep_attr->max_order_raw_size); - fprintf(stdout, " %-18s: %-20lu\n", ".max_order_war_size", - p->ep_attr->max_order_war_size); - fprintf(stdout, " %-18s: %-20lu\n", ".max_order_waw_size", - p->ep_attr->max_order_waw_size); - fprintf(stdout, " %-18s: %-20lu\n", ".mem_tag_format", - p->ep_attr->mem_tag_format); - fprintf(stdout, " %-18s: %-20lu\n", ".msg_order", p->ep_attr->msg_order); - fprintf(stdout, " %-18s: %-20lu\n", ".tx_ctx_cnt", p->ep_attr->tx_ctx_cnt); - fprintf(stdout, " %-18s: %-20lu\n", ".rx_ctx_cnt", p->ep_attr->rx_ctx_cnt); - fprintf(stdout, "%-18s: %-20p\n", "domain_attr", p->domain_attr); - fprintf(stdout, " %-18s: %-20s\n", ".name", p->domain_attr->name); - fprintf(stdout, " %-18s: %-#20" PRIx32 "\n", ".threading", - p->domain_attr->threading); - fprintf(stdout, " %-18s: %-#20" PRIx32 "\n", ".control_progress", - p->domain_attr->control_progress); - fprintf(stdout, " %-18s: %-#20" PRIx32 "\n", ".data_progress", - p->domain_attr->data_progress); - fprintf(stdout, " %-18s: %-20lu\n", ".mr_key_size", - p->domain_attr->mr_key_size); - fprintf(stdout, " %-18s: %-20lu\n", ".cq_data_size", - p->domain_attr->cq_data_size); - fprintf(stdout, " %-18s: %-20lu\n", ".ep_cnt", p->domain_attr->ep_cnt); - fprintf(stdout, " %-18s: %-20lu\n", ".tx_ctx_cnt", - p->domain_attr->tx_ctx_cnt); - fprintf(stdout, " %-18s: %-20lu\n", ".rx_ctx_cnt", - p->domain_attr->rx_ctx_cnt); - fprintf(stdout, " %-18s: %-20lu\n", ".max_ep_tx_ctx", - p->domain_attr->max_ep_tx_ctx); - fprintf(stdout, " %-18s: %-20lu\n", ".max_ep_rx_ctx", - p->domain_attr->max_ep_rx_ctx); - fprintf(stdout, "%-18s: %-20p\n", "fabric_attr", p->fabric_attr); - fprintf(stdout, " %-18s: %-20s\n", ".name", p->fabric_attr->name); - fprintf(stdout, " %-18s: %-20s\n", ".prov_name", p->fabric_attr->prov_name); - fprintf(stdout, " %-18s: %-#20" PRIx32 "\n", ".prov_version", - p->fabric_attr->prov_version); - p = p->next; - } + info_t *p = prov; + int i = 0; + *prov_use = prov; + if (MPIR_CVAR_DUMP_PROVIDERS) { + fprintf(stdout, "Dumping Providers(first=%p):\n", prov); + while(p) { + fprintf(stdout, "%s", fi_tostr(p, FI_TYPE_INFO)); + p=p->next; } - return i; + } + return i; } ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 112 ++++---------------- 1 files changed, 21 insertions(+), 91 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-172-g03b1213
by noreply＠mpich.org 26 Feb '15

26 Feb '15

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 03b1213468cef2ba85519491a16c21ad3bb678f6 (commit) from 5a10283bf7fdda65ba48bac088aacf052ac232ca (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/03b1213468cef2ba85519491a16c21ad3… commit 03b1213468cef2ba85519491a16c21ad3bb678f6 Author: Wesley Bland <wbland(a)anl.gov> Date: Wed Feb 25 10:17:24 2015 -0600 Remove unused variable in alltoallw Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index e55d55a..e4b534b 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -258,11 +258,9 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int int src, dst, rank, sendcount, recvcount; char *sendaddr, *recvaddr; MPI_Datatype sendtype, recvtype; - MPI_Comm comm; - - local_size = comm_ptr->local_size; + + local_size = comm_ptr->local_size; remote_size = comm_ptr->remote_size; - comm = comm_ptr->handle; rank = comm_ptr->rank; /* check if multiple threads are calling this collective function */ ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/alltoallw.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-171-g5a10283
by noreply＠mpich.org 26 Feb '15

26 Feb '15

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 5a10283bf7fdda65ba48bac088aacf052ac232ca (commit) via 4e80e1d2b9e08c8795d78093e5f436fdf0a92617 (commit) from a8137ff9785f823ec2d661e34e395b98410a3dc0 (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/5a10283bf7fdda65ba48bac088aacf052… commit 5a10283bf7fdda65ba48bac088aacf052ac232ca Author: Rob Latham <robl(a)mcs.anl.gov> Date: Mon Feb 16 16:01:58 2015 -0600 remove _XOPEN_SOURCE in code lustre, or specifically the header files lustre brings in (quota.h) show a problem with caddr_t not being defined if XOPEN_SOURCE is set. We provided this define so we could make use of pread/pwrite, but instead we will use our replacement pread/pwrite if one does not exist. See #1973 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c index 5f1c232..cb187a3 100644 --- a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c +++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c @@ -8,11 +8,6 @@ * Copyright (C) 2008 Sun Microsystems, Lustre group */ -#ifdef _STDC_C99 -#define _XOPEN_SOURCE 600 -#else -#define _XOPEN_SOURCE 500 -#endif #include <unistd.h> #include <stdlib.h> diff --git a/src/mpi/romio/adio/ad_xfs/ad_xfs.h b/src/mpi/romio/adio/ad_xfs/ad_xfs.h index 1a4d4cc..d14858d 100644 --- a/src/mpi/romio/adio/ad_xfs/ad_xfs.h +++ b/src/mpi/romio/adio/ad_xfs/ad_xfs.h @@ -8,11 +8,6 @@ #ifndef AD_XFS_INCLUDE #define AD_XFS_INCLUDE -#ifdef _STDC_C99 -#define _XOPEN_SOURCE 600 -#else -#define _XOPEN_SOURCE 500 -#endif #include <unistd.h> #include <sys/types.h> #include <fcntl.h> diff --git a/src/mpi/romio/adio/common/ad_read.c b/src/mpi/romio/adio/common/ad_read.c index 544ccf4..19f2908 100644 --- a/src/mpi/romio/adio/common/ad_read.c +++ b/src/mpi/romio/adio/common/ad_read.c @@ -6,11 +6,6 @@ */ -#ifdef _STDC_C99 -#define _XOPEN_SOURCE 600 -#else -#define _XOPEN_SOURCE 500 -#endif #include <unistd.h> #include "adio.h" diff --git a/src/mpi/romio/adio/common/ad_write.c b/src/mpi/romio/adio/common/ad_write.c index ad318e4..34a31d9 100644 --- a/src/mpi/romio/adio/common/ad_write.c +++ b/src/mpi/romio/adio/common/ad_write.c @@ -6,11 +6,6 @@ */ -#ifdef _STDC_C99 -#define _XOPEN_SOURCE 600 -#else -#define _XOPEN_SOURCE 500 -#endif #include <unistd.h> #include "adio.h" http://git.mpich.org/mpich.git/commitdiff/4e80e1d2b9e08c8795d78093e5f436fdf… commit 4e80e1d2b9e08c8795d78093e5f436fdf0a92617 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Feb 17 15:02:43 2015 -0600 check for avialablity of pwrite We can test at configure-time if pread/pwrite is available. XOPEN_SOURCE set low enough will not provide this feature, for example (as is the case with --enable-strict). Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/utils.c b/src/mpi/romio/adio/common/utils.c index eef48cb..533ff07 100644 --- a/src/mpi/romio/adio/common/utils.c +++ b/src/mpi/romio/adio/common/utils.c @@ -105,6 +105,35 @@ int ADIOI_Type_create_hindexed_x(int count, return ret; } +/* some systems do not have pread/pwrite, or requrie XOPEN_SOURCE set higher + * than we would like. see #1973 */ +#if (HAVE_DECL_PWRITE == 0) + +#include <sys/types.h> +#include <unistd.h> + +ssize_t pread(int fd, void *buf, size_t count, off_t offset); +ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset); + +ssize_t pread(int fd, void *buf, size_t count, off_t offset) { + off_t lseek_ret; + + lseek_ret = lseek(fd, offset, SEEK_SET); + if (lseek_ret == -1) + return lseek_ret; + return (read(fd, buf, count)); +} + +ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset) { + off_t lseek_ret; + + lseek_ret = lseek(fd, offset, SEEK_SET); + if (lseek_ret == -1) + return lseek_ret; + return (write(fd, buf, count)); +} +#endif + /* * vim: ts=8 sts=4 sw=4 noexpandtab */ diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h index eab98e5..b20ca82 100644 --- a/src/mpi/romio/adio/include/adioi.h +++ b/src/mpi/romio/adio/include/adioi.h @@ -1044,3 +1044,10 @@ void *ADIOI_IO_Thread_Func(void *vptr_args); #endif + +#if (HAVE_DECL_PWRITE == 0) +#include <sys/types.h> +#include <unistd.h> +ssize_t pread(int fd, void *buf, size_t count, off_t offset); +ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset); +#endif diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 68801ad..f975e1c 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1414,6 +1414,14 @@ if test "$ac_cv_header_unistd_h" = "yes" ; then fi fi +# pread and pwrite are useful to ROMIO: if implemented well, they help us avoid +# an extra system call. But --enable-strict or CFLAGS="--std=c99" does not +# expose this feature. If we define XOPEN_SOURCE in ROMIO, we cause headaches +# for some versions of lustre, quota.h, and caddr_t. see if we need to provide +# our own pread/pwrite + +AC_CHECK_DECLS([pwrite]) + #################################################################### # We're about to mess with CC etc. No more feature tests past here, ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c | 5 --- src/mpi/romio/adio/ad_xfs/ad_xfs.h | 5 --- src/mpi/romio/adio/common/ad_read.c | 5 --- src/mpi/romio/adio/common/ad_write.c | 5 --- src/mpi/romio/adio/common/utils.c | 29 +++++++++++++++++++++ src/mpi/romio/adio/include/adioi.h | 7 +++++ src/mpi/romio/configure.ac | 8 ++++++ 7 files changed, 44 insertions(+), 20 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-169-ga8137ff
by noreply＠mpich.org 24 Feb '15

24 Feb '15

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 a8137ff9785f823ec2d661e34e395b98410a3dc0 (commit) from 13b62b9fa5e12a5008dbccee530ae65c1a3ea954 (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/a8137ff9785f823ec2d661e34e395b984… commit a8137ff9785f823ec2d661e34e395b98410a3dc0 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Fri Feb 13 16:39:29 2015 -0600 Use the same basic dt in mtest derived dt tests. The RMA tests including ACC require the same basic datatype elements on sender/receiver sides. However, the mtest was using double-based ddt for one side and char for the other side. This patch unifies the basic dt to double. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/util/mtest_datatype_gen.c b/test/mpi/util/mtest_datatype_gen.c index 7a95da3..5c12371 100644 --- a/test/mpi/util/mtest_datatype_gen.c +++ b/test/mpi/util/mtest_datatype_gen.c @@ -395,16 +395,13 @@ static inline int MTestGetSendDerivedDatatypes(MTestDatatype * sendtype, return merr; sendtype->count = 1; - merr = MPI_Type_size_x(sendtype->datatype, &tsize); - if (merr) - MTestPrintError(merr); /* Create receive datatype */ - merr = MTestTypeBasicCreate(MPI_CHAR, recvtype); + merr = MTestTypeBasicCreate(old_type, recvtype); if (merr) return merr; - recvtype->count = sendtype->count * tsize; + recvtype->count = sendtype->count * align_tot_count; return merr; } @@ -443,16 +440,13 @@ static inline int MTestGetRecvDerivedDatatypes(MTestDatatype * sendtype, return merr; recvtype->count = 1; - merr = MPI_Type_size_x(recvtype->datatype, &tsize); - if (merr) - MTestPrintError(merr); /* Create send datatype */ - merr = MTestTypeBasicCreate(MPI_CHAR, sendtype); + merr = MTestTypeBasicCreate(old_type, sendtype); if (merr) return merr; - sendtype->count = recvtype->count * tsize; + sendtype->count = recvtype->count * align_tot_count; return merr; } ----------------------------------------------------------------------- Summary of changes: test/mpi/util/mtest_datatype_gen.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-168-g13b62b9
by noreply＠mpich.org 23 Feb '15

23 Feb '15

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 13b62b9fa5e12a5008dbccee530ae65c1a3ea954 (commit) from ebe4354c2d26c6ba3a9aeab2f915b90329acf81a (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/13b62b9fa5e12a5008dbccee530ae65c1… commit 13b62b9fa5e12a5008dbccee530ae65c1a3ea954 Author: Wesley Bland <wbland(a)anl.gov> Date: Fri Feb 20 16:13:42 2015 -0600 Clear error bits in MPIC functions When an operation is completed in an MPIC function, it should no longer have the error bits set since that information has now been captured in the errflag. This prevents unnecessary assert failures. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 1e5daa4..62c81df 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -231,6 +231,8 @@ int MPIC_Wait(MPID_Request * request_ptr, mpir_errflag_t *errflag) if (request_ptr->kind == MPID_REQUEST_RECV) MPIR_Process_status(&request_ptr->status, errflag); + MPIR_TAG_CLEAR_ERROR_BITS(request_ptr->status.MPI_TAG); + fn_exit: MPIU_DBG_MSG_D(PT2PT, TYPICAL, "OUT: errflag = %d", *errflag); MPIDI_PT2PT_FUNC_EXIT(MPID_STATE_MPIC_WAIT); @@ -359,6 +361,8 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, MPID_Request_release(request_ptr); } else { MPIR_Process_status(status, errflag); + + MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG); } if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) { @@ -768,6 +772,8 @@ int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], mp * single time, we may have to change that. */ for (i = 0; i < numreq; ++i) { MPIR_Process_status(&status_array[i], errflag); + + MPIR_TAG_CLEAR_ERROR_BITS(status_array[i].MPI_TAG); } fn_exit: ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/helper_fns.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0