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

[mpich] MPICH primary repository branch, master, updated. v3.0.4-327-gcd5b43b
by noreply＠mpich.org 07 Jul '13

07 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via cd5b43b2323661a6f25d29647784b66fb152a723 (commit) via d1a023411d28ba68a9b73ea7746919d763410291 (commit) via ba6b50462c61fe0b35b4614ecc2d2570423b714c (commit) from 01569bddc81323b636ba0ad776d29059c32fd9a1 (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/cd5b43b2323661a6f25d29647784b66fb… commit cd5b43b2323661a6f25d29647784b66fb152a723 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun Jul 7 09:42:44 2013 -0500 Added a file to OpenPA .gitignore. diff --git a/src/openpa/.gitignore b/src/openpa/.gitignore index 5aeafe7..c40b720 100644 --- a/src/openpa/.gitignore +++ b/src/openpa/.gitignore @@ -6,6 +6,7 @@ _configs.sed aclocal.m4 autom4te.cache/ confdb/ar-lib +confdb/compile confdb/config.guess confdb/config.sub confdb/depcomp http://git.mpich.org/mpich.git/commitdiff/d1a023411d28ba68a9b73ea7746919d76… commit d1a023411d28ba68a9b73ea7746919d763410291 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jul 6 23:32:32 2013 -0500 Remove caching wrapper for gethostname. This was added for terrible systems that rely on a slow DNS server to look up the local hostname. Most OSs do a much better job setting local host names in the local /etc/hosts file today. Even if they don't, we no longer do a large number of lookups anymore, so this should not be a problem. diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index ce27f26..685c3eb 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -553,7 +553,6 @@ HYD_status HYDU_create_process(char **client_arg, struct HYD_env *env_list, /* others */ int HYDU_dceil(int x, int y); HYD_status HYDU_add_to_node_list(const char *hostname, int num_procs, struct HYD_node **node_list); -HYD_status HYDU_gethostname(char *hostname); void HYDU_delay(unsigned long delay); /* signals */ diff --git a/src/pm/hydra/ui/mpich/mpiexec.c b/src/pm/hydra/ui/mpich/mpiexec.c index 653d3cd..34c9763 100644 --- a/src/pm/hydra/ui/mpich/mpiexec.c +++ b/src/pm/hydra/ui/mpich/mpiexec.c @@ -184,8 +184,8 @@ int main(int argc, char **argv) char localhost[MAX_HOSTNAME_LEN] = { 0 }; /* The RMK didn't give us anything back; use localhost */ - status = HYDU_gethostname(localhost); - HYDU_ERR_POP(status, "unable to get local hostname\n"); + if (gethostname(localhost, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local hostname\n"); status = HYDU_add_to_node_list(localhost, 1, &HYD_server_info.node_list); HYDU_ERR_POP(status, "unable to add to node list\n"); @@ -293,8 +293,8 @@ int main(int argc, char **argv) HYD_server_info.localhost = HYDU_strdup(node->hostname); else { HYDU_MALLOC(HYD_server_info.localhost, char *, MAX_HOSTNAME_LEN, status); - status = HYDU_gethostname(HYD_server_info.localhost); - HYDU_ERR_POP(status, "unable to get local hostname\n"); + if (gethostname(HYD_server_info.localhost, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local hostname\n"); } } diff --git a/src/pm/hydra/ui/mpich/utils.c b/src/pm/hydra/ui/mpich/utils.c index a84d9da..f012374 100644 --- a/src/pm/hydra/ui/mpich/utils.c +++ b/src/pm/hydra/ui/mpich/utils.c @@ -336,8 +336,8 @@ static HYD_status mfile_fn(char *arg, char ***argv) HYDU_ERR_POP(status, "error parsing hostfile\n"); } else { - status = HYDU_gethostname(localhost); - HYDU_ERR_POP(status, "unable to get local hostname\n"); + if (gethostname(localhost, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local hostname\n"); status = HYDU_add_to_node_list(localhost, 1, &HYD_server_info.node_list); HYDU_ERR_POP(status, "unable to add to node list\n"); diff --git a/src/pm/hydra/utils/dbg/dbg.c b/src/pm/hydra/utils/dbg/dbg.c index 49b66d1..5fada6d 100644 --- a/src/pm/hydra/utils/dbg/dbg.c +++ b/src/pm/hydra/utils/dbg/dbg.c @@ -15,8 +15,8 @@ HYD_status HYDU_dbg_init(const char *str) HYDU_mem_init(); - status = HYDU_gethostname(hostname); - HYDU_ERR_POP(status, "unable to get local host name\n"); + if (gethostname(hostname, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local host name\n"); HYDU_MALLOC(HYD_dbg_prefix, char *, strlen(hostname) + 1 + strlen(str) + 1, status); HYDU_snprintf(HYD_dbg_prefix, strlen(hostname) + 1 + strlen(str) + 1, "%s@%s", str, hostname); diff --git a/src/pm/hydra/utils/others/others.c b/src/pm/hydra/utils/others/others.c index 4d0287d..3216e46 100644 --- a/src/pm/hydra/utils/others/others.c +++ b/src/pm/hydra/utils/others/others.c @@ -58,34 +58,6 @@ HYD_status HYDU_add_to_node_list(const char *hostname, int num_procs, struct HYD goto fn_exit; } -/* This function just adds a simple caching logic to gethostname to - * avoid hitting the DNS too many times */ -HYD_status HYDU_gethostname(char *hostname) -{ - static char localhost[MAX_HOSTNAME_LEN] = { 0 }; - HYD_status status = HYD_SUCCESS; - - HYDU_FUNC_ENTER(); - - if (strcmp(localhost, "")) { - HYDU_snprintf(hostname, MAX_HOSTNAME_LEN, "%s", localhost); - goto fn_exit; - } - - if (gethostname(hostname, MAX_HOSTNAME_LEN) < 0) - HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, - "gethostname error (hostname: %s; errno: %d)\n", hostname, errno); - - HYDU_snprintf(localhost, MAX_HOSTNAME_LEN, "%s", hostname); - - fn_exit: - HYDU_FUNC_EXIT(); - return status; - - fn_fail: - goto fn_exit; -} - void HYDU_delay(unsigned long delay) { struct timeval start, end; diff --git a/src/pm/hydra/utils/sock/sock.c b/src/pm/hydra/utils/sock/sock.c index 6c33727..bc5af12 100644 --- a/src/pm/hydra/utils/sock/sock.c +++ b/src/pm/hydra/utils/sock/sock.c @@ -164,8 +164,8 @@ HYD_status HYDU_sock_connect(const char *host, uint16_t port, int *fd, int retri if (ret < 0) { char localhost[MAX_HOSTNAME_LEN] = { 0 }; - status = HYDU_gethostname(localhost); - HYDU_ERR_POP(status, "unable to get local hostname\n"); + if (gethostname(localhost, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local hostname\n"); HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to connect from \"%s\" to \"%s\" (%s)\n", @@ -649,8 +649,8 @@ HYDU_sock_create_and_listen_portstr(char *iface, char *hostname, char *port_rang else { char localhost[MAX_HOSTNAME_LEN] = { 0 }; - status = HYDU_gethostname(localhost); - HYDU_ERR_POP(status, "unable to get local hostname\n"); + if (gethostname(localhost, MAX_HOSTNAME_LEN) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "unable to get local hostname\n"); ip = HYDU_strdup(localhost); } http://git.mpich.org/mpich.git/commitdiff/ba6b50462c61fe0b35b4614ecc2d25704… commit ba6b50462c61fe0b35b4614ecc2d2570423b714c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jul 6 22:31:07 2013 -0500 Correct error string. diff --git a/src/mpi/errhan/errnames.txt b/src/mpi/errhan/errnames.txt index 127f150..c621050 100644 --- a/src/mpi/errhan/errnames.txt +++ b/src/mpi/errhan/errnames.txt @@ -876,9 +876,9 @@ is too big (> MPIU_SHMW_GHND_SZ) **toomanynbc: too many outstanding nonblocking collectives detected -**ifname_and_hostname:Only one of MPICH_INTERFACE_HOSTNAME and MPICH_NETWORK_IFACE environment variables are allowed, but both were set. -**iface_notfound:The network interface specified in MPICH_NETWORK_IFACE was not found. -**iface_notfound %s:The network interface, \"%s\", specified in MPICH_NETWORK_IFACE was not found. +**ifname_and_hostname:Only one of MPIR_PARAM_CH3_INTERFACE_HOSTNAME and MPIR_PARAM_CH3_NETWORK_IFACE environment variables are allowed, but both were set. +**iface_notfound:The network interface specified in MPIR_PARAM_CH3_NETWORK_IFACE was not found. +**iface_notfound %s:The network interface, \"%s\", specified in MPIR_PARAM_CH3_NETWORK_IFACE was not found. **procnamefailed:Failed to get processor name ----------------------------------------------------------------------- Summary of changes: src/mpi/errhan/errnames.txt | 6 +++--- src/openpa/.gitignore | 1 + src/pm/hydra/include/hydra.h | 1 - src/pm/hydra/ui/mpich/mpiexec.c | 8 ++++---- src/pm/hydra/ui/mpich/utils.c | 4 ++-- src/pm/hydra/utils/dbg/dbg.c | 4 ++-- src/pm/hydra/utils/others/others.c | 28 ---------------------------- src/pm/hydra/utils/sock/sock.c | 8 ++++---- 8 files changed, 16 insertions(+), 44 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-324-g01569bd
by noreply＠mpich.org 06 Jul '13

06 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 01569bddc81323b636ba0ad776d29059c32fd9a1 (commit) from f92fcb3ca9f9bf85e13f0b36b4154eab4038cc6e (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/01569bddc81323b636ba0ad776d29059c… commit 01569bddc81323b636ba0ad776d29059c32fd9a1 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jul 6 09:40:22 2013 -0500 Reprioritize gcc over clang. We got a number of complaints with the recent move to prioritize clang over gcc. The biggest one was the lack of good OpenMP support in clang. http://clang-developers.42468.n3.nabble.com/RFC-OpenMP-Support-in-Clang-td4… diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 index 47d58da..41fba79 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 @@ -11,7 +11,7 @@ AC_DEFUN([PAC_PROG_CC],[ dnl developers notice this case. AC_BEFORE([$0],[AC_PROG_CC]) PAC_PUSH_FLAG([CFLAGS]) - AC_PROG_CC([icc pgcc xlc xlC pathcc clang gcc cc]) + AC_PROG_CC([icc pgcc xlc xlC pathcc gcc clang cc]) PAC_POP_FLAG([CFLAGS]) ]) dnl diff --git a/confdb/aclocal_cxx.m4 b/confdb/aclocal_cxx.m4 index f744701..72febd8 100644 --- a/confdb/aclocal_cxx.m4 +++ b/confdb/aclocal_cxx.m4 @@ -1,7 +1,7 @@ dnl PAC_CXX_SEARCH_LIST - expands to a whitespace separated list of C++ dnl compilers for use with AC_PROG_CXX that is more suitable for HPC software dnl packages -AC_DEFUN([PAC_CXX_SEARCH_LIST],[$CCC icpc pgCC xlC pathCC clang++ g++ c++ cc++ cxx CC cl]) +AC_DEFUN([PAC_CXX_SEARCH_LIST],[$CCC icpc pgCC xlC pathCC g++ clang++ c++ cc++ cxx CC cl]) dnl PAC_PROG_CXX - reprioritize the C++ compiler search order dnl NOTE: this macro suffers from a basically intractable "expanded before it dnl was required" problem when libtool is also used ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_cc.m4 | 2 +- confdb/aclocal_cxx.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-323-gf92fcb3
by noreply＠mpich.org 03 Jul '13

03 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f92fcb3ca9f9bf85e13f0b36b4154eab4038cc6e (commit) from ab1323d8df5729c2e76a61e224c41f0af1995809 (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/f92fcb3ca9f9bf85e13f0b36b4154eab4… commit f92fcb3ca9f9bf85e13f0b36b4154eab4038cc6e Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Fri Jun 14 11:03:11 2013 -0500 Fixes #1868. Bill found some misuse of MPIR_ERR_RECOVERABLE and few other error messages and wrote a test in autogen.sh to discover/report them. This fixes the errors raised by that test and re-enables it at autogen time. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/maint/extracterrmsgs b/maint/extracterrmsgs index 1015c43..d2061fb 100755 --- a/maint/extracterrmsgs +++ b/maint/extracterrmsgs @@ -24,7 +24,7 @@ $quiet = 0; $build_test_pgm = 1; # FIXME: checkErrClass should be set to 1; currently set to zero # to permit autogen.sh to complete -$checkErrClass = 0; +$checkErrClass = 1; # Strict is used to control checking of error message strings. $gStrict = 0; diff --git a/src/include/mpimem.h b/src/include/mpimem.h index 6b5c181..876fd63 100644 --- a/src/include/mpimem.h +++ b/src/include/mpimem.h @@ -426,7 +426,7 @@ if (pointer_) { \ void *realloc_tmp_ = MPIU_Realloc((ptr_), (size_)); \ if ((size_) && !realloc_tmp_) { \ MPIU_Free(ptr_); \ - MPIU_ERR_SETANDJUMP2(rc_,MPIU_CHKMEM_ISFATAL,"**nomem2","**nomem2 %d %s",(size_),MPIU_QUOTE(ptr_)); \ + MPIU_ERR_SETANDJUMP2(rc_,MPI_ERR_OTHER,"**nomem2","**nomem2 %d %s",(size_),MPIU_QUOTE(ptr_)); \ } \ (ptr_) = realloc_tmp_; \ } while (0) @@ -434,7 +434,7 @@ if (pointer_) { \ #define MPIU_REALLOC_ORJUMP(ptr_,size_,rc_) do { \ void *realloc_tmp_ = MPIU_Realloc((ptr_), (size_)); \ if (size_) \ - MPIU_ERR_CHKANDJUMP2(!realloc_tmp_,rc_,MPIU_CHKMEM_ISFATAL,"**nomem2","**nomem2 %d %s",(size_),MPIU_QUOTE(ptr_)); \ + MPIU_ERR_CHKANDJUMP2(!realloc_tmp_,rc_,MPI_ERR_OTHER,"**nomem2","**nomem2 %d %s",(size_),MPIU_QUOTE(ptr_)); \ (ptr_) = realloc_tmp_; \ } while (0) diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 4cbe92f..40595e0 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -475,7 +475,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, comm_size = comm_ptr->remote_size; if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPIR_ERR_RECOVERABLE, "**sendbuf_inplace"); + MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } for (i=0; i<comm_size; i++) { diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index 2da9a05..2e82bbc 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -468,7 +468,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], check_send = (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE); if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPIR_ERR_RECOVERABLE, "**sendbuf_inplace"); + MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } if (comm_ptr->comm_kind == MPID_INTRACOMM) diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 1b3e6af..26a72b7 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -364,7 +364,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(rdispls,"rdispls", mpi_errno); MPIR_ERRTEST_ARGNULL(recvtypes,"recvtypes", mpi_errno); if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPIR_ERR_RECOVERABLE, "**sendbuf_inplace"); + MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 9982694..af3a99a 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -863,7 +863,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int nfree = -1; int ntotal = -1; MPIR_ContextMaskStats(&nfree, &ntotal); - MPIU_ERR_SETANDJUMP3(mpi_errno, MPIR_ERR_RECOVERABLE, + MPIU_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, "**toomanycomm", "**toomanycomm %d %d %d", nfree, ntotal, ignore_id); } @@ -874,7 +874,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int nfree = -1; int ntotal = -1; MPIR_ContextMaskStats(&nfree, &ntotal); - MPIU_ERR_SETANDJUMP3(mpi_errno, MPIR_ERR_RECOVERABLE, + MPIU_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, "**toomanycomm", "**toomanycomm %d %d %d", nfree, ntotal, ignore_id); } @@ -1141,7 +1141,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, } MPIR_ContextMaskStats(&nfree, &ntotal); - MPIU_ERR_SETANDJUMP3(mpi_errno, MPIR_ERR_RECOVERABLE, + MPIU_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, "**toomanycommfrag", "**toomanycommfrag %d %d %d", nfree, ntotal, ignore_id); /* --END ERROR HANDLING-- */ @@ -1192,7 +1192,7 @@ static int gcn_helper(MPID_Comm *comm, int tag, void *state) int nfree = -1; int ntotal = -1; MPIR_ContextMaskStats(&nfree, &ntotal); - MPIU_ERR_SETANDJUMP3(mpi_errno, MPIR_ERR_RECOVERABLE, + MPIU_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, "**toomanycomm", "**toomanycomm %d %d %d", nfree, ntotal, /*ignore_id=*/0); } @@ -1557,7 +1557,7 @@ int MPIR_Comm_copy( MPID_Comm *comm_ptr, int size, MPID_Comm **outcomm_ptr ) int nfree = -1; int ntotal = -1; MPIR_ContextMaskStats(&nfree, &ntotal); - MPIU_ERR_SETANDJUMP3(mpi_errno, MPIR_ERR_RECOVERABLE, + MPIU_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, "**toomanycomm", "**toomanycomm %d %d %d", nfree, ntotal, /*ignore_id=*/0); } diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 67ae7b4..82395d2 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -316,7 +316,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], /* FIXME: Why not - there is only one allocated at a time. Is it only that there is no defined macro to pop and free an item? */ buf = MPIU_Malloc(count*sizeof(int)); - MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPIR_ERR_RECOVERABLE, "**nomem"); + MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPI_ERR_OTHER, "**nomem"); mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_A_TAG, comm_old, MPI_STATUS_IGNORE); /* FIXME: buf is never freed on error! */ @@ -350,7 +350,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], /* can't use CHKLMEM macros b/c we are in a loop */ /* Why not? */ buf = MPIU_Malloc(count*sizeof(int)); - MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPIR_ERR_RECOVERABLE, "**nomem"); + MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPI_ERR_OTHER, "**nomem"); mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_B_TAG, comm_old, MPI_STATUS_IGNORE); /* FIXME: buf is never freed on error! */ diff --git a/src/mpi/topo/dist_gr_create_adj.c b/src/mpi/topo/dist_gr_create_adj.c index 5573694..b5c84bc 100644 --- a/src/mpi/topo/dist_gr_create_adj.c +++ b/src/mpi/topo/dist_gr_create_adj.c @@ -116,7 +116,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, if (indegree > 0) { MPIR_ERRTEST_ARGNULL(sources, "sources", mpi_errno); if (sourceweights == MPI_UNWEIGHTED && destweights != MPI_UNWEIGHTED) { - MPIU_ERR_SET(mpi_errno, MPIR_ERR_RECOVERABLE, "**unweightedboth"); + MPIU_ERR_SET(mpi_errno, MPI_ERR_TOPOLOGY, "**unweightedboth"); goto fn_fail; } /* TODO check ranges for array elements too (**argarrayneg / **rankarray)*/ @@ -124,7 +124,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, if (outdegree > 0) { MPIR_ERRTEST_ARGNULL(destinations, "destinations", mpi_errno); if (destweights == MPI_UNWEIGHTED && sourceweights != MPI_UNWEIGHTED) { - MPIU_ERR_SET(mpi_errno, MPIR_ERR_RECOVERABLE, "**unweightedboth"); + MPIU_ERR_SET(mpi_errno, MPI_ERR_TOPOLOGY, "**unweightedboth"); goto fn_fail; } } ----------------------------------------------------------------------- Summary of changes: maint/extracterrmsgs | 2 +- src/include/mpimem.h | 4 ++-- src/mpi/coll/alltoallv.c | 2 +- src/mpi/coll/alltoallw.c | 2 +- src/mpi/coll/ialltoallw.c | 2 +- src/mpi/comm/commutil.c | 10 +++++----- src/mpi/topo/dist_gr_create.c | 4 ++-- src/mpi/topo/dist_gr_create_adj.c | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-322-gab1323d
by noreply＠mpich.org 02 Jul '13

02 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via ab1323d8df5729c2e76a61e224c41f0af1995809 (commit) from 5d2dd1c58465a86249bcb699ad802f091a212524 (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/ab1323d8df5729c2e76a61e224c41f0af… commit ab1323d8df5729c2e76a61e224c41f0af1995809 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Jul 2 18:24:44 2013 -0500 Increase timeout for rma-contig test. Addresses #1887. diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index 4a3a776..0168a34 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -99,4 +99,4 @@ linked_list_bench_lock_shr 4 mpiversion=3.0 linked_list_bench_lock_shr_nocheck 4 mpiversion=3.0 mutex_bench 4 mpiversion=3.0 mutex_bench_shared 4 mpiversion=3.0 -rma-contig 4 mpiversion=3.0 \ No newline at end of file +rma-contig 4 mpiversion=3.0 timeLimit=600 \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0