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

[mpich] MPICH primary repository branch, master, updated. v3.1b1-186-g2946b9b
by noreply＠mpich.org 05 Nov '13

05 Nov '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 2946b9b7a984629ca4d990651e62b33fdb35ee0f (commit) from 9088ea81f0a6f4aa52119538ccc0e8985a6686f9 (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/2946b9b7a984629ca4d990651e62b33fd… commit 2946b9b7a984629ca4d990651e62b33fdb35ee0f Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 5 18:50:09 2013 -0600 Partially revert 9088ea81 Reverted file maint/version.m4 to leave MPICH_RELEASE_DATE with its default value "unreleased development copy". The proper value is actually generated by autogen.sh. diff --git a/maint/version.m4 b/maint/version.m4 index 3451683..03f2acf 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -15,7 +15,7 @@ # playing with autotools-fire. m4_define([MPICH_VERSION_m4],[3.1rc1])dnl -m4_define([MPICH_RELEASE_DATE_m4],[Tue Nov 5 10:12:32 CST 2013])dnl +m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-in… ----------------------------------------------------------------------- Summary of changes: maint/version.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

Re: [mpich-commits] [mpi-all-commits] [mpich] MPICH primary repository branch, master, updated. v3.1b1-185-g9088ea8
by Pavan Balaji 05 Nov '13

05 Nov '13

On Nov 5, 2013, at 10:39 AM, mysql vizuser <noreply(a)mpich.org> wrote: > diff --git a/maint/version.m4 b/maint/version.m4 > index 03f2acf..3451683 100644 > --- a/maint/version.m4 > +++ b/maint/version.m4 > @@ -15,7 +15,7 @@ > # playing with autotools-fire. > > m4_define([MPICH_VERSION_m4],[3.1rc1])dnl > -m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl > +m4_define([MPICH_RELEASE_DATE_m4],[Tue Nov 5 10:12:32 CST 2013])dnl > > # For libtool ABI versioning rules see: > # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-in… Incorrect patch. This is automatically added by autogen.sh. -- Pavan Balaji http://www.mcs.anl.gov/~balaji

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-185-g9088ea8
by noreply＠mpich.org 05 Nov '13

05 Nov '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 9088ea81f0a6f4aa52119538ccc0e8985a6686f9 (commit) from db3c77fae27c14973ff3136a086f9232dbb1817c (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/9088ea81f0a6f4aa52119538ccc0e8985… commit 9088ea81f0a6f4aa52119538ccc0e8985a6686f9 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 5 10:33:23 2013 -0600 Updated release information for 3.1rc1 diff --git a/CHANGES b/CHANGES index 45308b1..ba0b4ac 100644 --- a/CHANGES +++ b/CHANGES @@ -19,7 +19,7 @@ collectives. See the README.envvar file for more information. # Allow non-blocking collectives and fault tolerance at the same - time. The option MPIR_PARAM_ENABLE_COLL_FT_RET has been removed as + time. The option MPIR_PARAM_ENABLE_COLL_FT_RET has been deprecated as it is no longer necessary. # Improvements to MPI_WIN_ALLOCATE to internally allocate shared diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 20c3b0f..a7ea1e6 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -11,13 +11,6 @@ http://trac.mpich.org/projects/mpich/ticket/1719 -### Large counts - - * The new MPI-3 "large count" routines (e.g., MPI_Type_size_x) do not - work correctly due to 64-bit to 32-bit truncations occurring inside - the MPICH library. We expect to fix this in upcoming releases. - - ### Fine-grained thread safety * ch3:sock does not (and will not) support fine-grained threading. diff --git a/maint/version.m4 b/maint/version.m4 index 03f2acf..3451683 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -15,7 +15,7 @@ # playing with autotools-fire. m4_define([MPICH_VERSION_m4],[3.1rc1])dnl -m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl +m4_define([MPICH_RELEASE_DATE_m4],[Tue Nov 5 10:12:32 CST 2013])dnl # For libtool ABI versioning rules see: # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-in… ----------------------------------------------------------------------- Summary of changes: CHANGES | 2 +- RELEASE_NOTES | 7 ------- maint/version.m4 | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-184-gdb3c77f
by noreply＠mpich.org 05 Nov '13

05 Nov '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 db3c77fae27c14973ff3136a086f9232dbb1817c (commit) from c43f4ce2933960bc452f4e6f901f8139829095f4 (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/db3c77fae27c14973ff3136a086f9232d… commit db3c77fae27c14973ff3136a086f9232dbb1817c Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Nov 5 10:23:41 2013 -0600 blurb about large count/type changes diff --git a/CHANGES b/CHANGES index d6c8a61..45308b1 100644 --- a/CHANGES +++ b/CHANGES @@ -34,6 +34,10 @@ # Several improvements to the Hydra-SLURM integration. + # MPICH now supports operations on very large datatypes (those that describe + more than 32 bits of data). This work also allows MPICH to fully support + MPI-3's introduction of MPI_Count. + # Several other minor bug fixes, memory leak fixes, and code cleanup. A full list of changes is available at the following link: ----------------------------------------------------------------------- Summary of changes: CHANGES | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-183-gc43f4ce
by noreply＠mpich.org 03 Nov '13

03 Nov '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 c43f4ce2933960bc452f4e6f901f8139829095f4 (commit) from d089353f5514a61062bd34bde2c0c5135902b97c (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/c43f4ce2933960bc452f4e6f901f81398… commit c43f4ce2933960bc452f4e6f901f8139829095f4 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Nov 1 16:23:40 2013 -0500 Align nemesis payload: union approach Drop payload into a union paired with a double, and payload will end up double-aligned. Can't use an anonymous union, though: that's c11. named-union requires updating any place that used payload. There aren't too many, though. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_datatypes.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_datatypes.h index 13a3940..51d06ef 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_datatypes.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_datatypes.h @@ -144,15 +144,25 @@ #define MPID_NEM_MPICH_HEAD_LEN sizeof(MPID_nem_pkt_header_t) #define MPID_NEM_MPICH_DATA_LEN (MPID_NEM_CELL_PAYLOAD_LEN - MPID_NEM_MPICH_HEAD_LEN) -#include "mpid_nem_pkt_header.h" +#define MPID_NEM_PKT_HEADER_FIELDS \ + int source; \ + int dest; \ + MPIR_Pint datalen; \ + unsigned short seqno; \ + unsigned short type; /* currently used only with checkpointing */ + +typedef struct MPID_nem_pkt_header +{ + MPID_NEM_PKT_HEADER_FIELDS; +} MPID_nem_pkt_header_t; typedef struct MPID_nem_pkt_mpich { MPID_NEM_PKT_HEADER_FIELDS; -#if (MPID_NEM_PKT_HEADER_PADDING > 0) - char padding[MPID_NEM_PKT_HEADER_PADDING]; -#endif - char payload[MPID_NEM_MPICH_DATA_LEN]; + union { + char payload[MPID_NEM_MPICH_DATA_LEN]; + double dummy; /* align paylod to double */ + } p; } MPID_nem_pkt_mpich_t; typedef union diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h index 2e3f299..f702e1f 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h @@ -74,7 +74,7 @@ MPID_nem_mpich_send_header (void* buf, int size, MPIDI_VC_t *vc, int *again) MPIU_DBG_STMT (CH3_CHANNEL, VERBOSE, pbox->cell.pkt.mpich.type = MPID_NEM_PKT_MPICH_HEAD); - MPIU_Memcpy((void *)pbox->cell.pkt.mpich.payload, buf, size); + MPIU_Memcpy((void *)pbox->cell.pkt.mpich.p.payload, buf, size); OPA_store_release_int(&pbox->flag.value, 1); @@ -120,7 +120,7 @@ MPID_nem_mpich_send_header (void* buf, int size, MPIDI_VC_t *vc, int *again) el->pkt.mpich.seqno = vc_ch->send_seqno++; MPIU_DBG_STMT (CH3_CHANNEL, VERBOSE, el->pkt.mpich.type = MPID_NEM_PKT_MPICH_HEAD); - MPIU_Memcpy((void *)el->pkt.mpich.payload, buf, size); + MPIU_Memcpy((void *)el->pkt.mpich.p.payload, buf, size); DO_PAPI (PAPI_accum_var (PAPI_EventSet, PAPI_vvalues11)); MPIU_DBG_MSG (CH3_CHANNEL, VERBOSE, "--> Sent queue"); @@ -213,7 +213,7 @@ MPID_nem_mpich_sendv (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *again) #endif /*PREFETCH_CELL */ payload_len = MPID_NEM_MPICH_DATA_LEN; - cell_buf = (char *) el->pkt.mpich.payload; /* cast away volatile */ + cell_buf = (char *) el->pkt.mpich.p.payload; /* cast away volatile */ while (*n_iov && payload_len >= (*iov)->MPID_IOV_LEN) { @@ -304,8 +304,8 @@ MPID_nem_mpich_sendv_header (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *ag pbox->cell.pkt.mpich.seqno = vc_ch->send_seqno++; MPIU_DBG_STMT (CH3_CHANNEL, VERBOSE, pbox->cell.pkt.mpich.type = MPID_NEM_PKT_MPICH_HEAD); - MPIU_Memcpy((void *)pbox->cell.pkt.mpich.payload, (*iov)[0].MPID_IOV_BUF, (*iov)[0].MPID_IOV_LEN); - MPIU_Memcpy ((char *)pbox->cell.pkt.mpich.payload + (*iov)[0].MPID_IOV_LEN, (*iov)[1].MPID_IOV_BUF, (*iov)[1].MPID_IOV_LEN); + MPIU_Memcpy((void *)pbox->cell.pkt.mpich.p.payload, (*iov)[0].MPID_IOV_BUF, (*iov)[0].MPID_IOV_LEN); + MPIU_Memcpy ((char *)pbox->cell.pkt.mpich.p.payload + (*iov)[0].MPID_IOV_LEN, (*iov)[1].MPID_IOV_BUF, (*iov)[1].MPID_IOV_LEN); OPA_store_release_int(&pbox->flag.value, 1); *n_iov = 0; @@ -343,9 +343,9 @@ MPID_nem_mpich_sendv_header (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *ag MPID_nem_queue_dequeue (MPID_nem_mem_region.my_freeQ, &el); #endif /*PREFETCH_CELL */ - MPIU_Memcpy((void *)el->pkt.mpich.payload, (*iov)->MPID_IOV_BUF, sizeof(MPIDI_CH3_Pkt_t)); + MPIU_Memcpy((void *)el->pkt.mpich.p.payload, (*iov)->MPID_IOV_BUF, sizeof(MPIDI_CH3_Pkt_t)); - cell_buf = (char *)(el->pkt.mpich.payload) + sizeof(MPIDI_CH3_Pkt_t); + cell_buf = (char *)(el->pkt.mpich.p.payload) + sizeof(MPIDI_CH3_Pkt_t); ++(*iov); --(*n_iov); @@ -452,11 +452,11 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, MPIDI_msg_sz_t *segment_f MPIU_DBG_STMT (CH3_CHANNEL, VERBOSE, pbox->cell.pkt.mpich.type = MPID_NEM_PKT_MPICH_HEAD); /* copy header */ - MPIU_Memcpy((void *)pbox->cell.pkt.mpich.payload, header, header_sz); + MPIU_Memcpy((void *)pbox->cell.pkt.mpich.p.payload, header, header_sz); /* copy data */ last = segment_size; - MPID_Segment_pack(segment, *segment_first, &last, (char *)pbox->cell.pkt.mpich.payload + sizeof(MPIDI_CH3_Pkt_t)); + MPID_Segment_pack(segment, *segment_first, &last, (char *)pbox->cell.pkt.mpich.p.payload + sizeof(MPIDI_CH3_Pkt_t)); MPIU_Assert(last == segment_size); OPA_store_release_int(&pbox->flag.value, 1); @@ -498,7 +498,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, MPIDI_msg_sz_t *segment_f #endif /*PREFETCH_CELL */ /* copy header */ - MPIU_Memcpy((void *)el->pkt.mpich.payload, header, header_sz); + MPIU_Memcpy((void *)el->pkt.mpich.p.payload, header, header_sz); /* copy data */ if (segment_size - *segment_first <= MPID_NEM_MPICH_DATA_LEN - sizeof(MPIDI_CH3_Pkt_t)) @@ -506,7 +506,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, MPIDI_msg_sz_t *segment_f else last = *segment_first + MPID_NEM_MPICH_DATA_LEN - sizeof(MPIDI_CH3_Pkt_t); - MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.mpich.payload + sizeof(MPIDI_CH3_Pkt_t)); + MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.mpich.p.payload + sizeof(MPIDI_CH3_Pkt_t)); datalen = sizeof(MPIDI_CH3_Pkt_t) + last - *segment_first; *segment_first = last; @@ -589,7 +589,7 @@ MPID_nem_mpich_send_seg (MPID_Segment *segment, MPIDI_msg_sz_t *segment_first, M else last = *segment_first + MPID_NEM_MPICH_DATA_LEN; - MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.mpich.payload); + MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.mpich.p.payload); datalen = last - *segment_first; *segment_first = last; diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h deleted file mode 100644 index 5888cf3..0000000 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2013 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -#ifndef MPID_NEM_PKT_HEADER_H -#define MPID_NEM_PKT_HEADER_H - -#define MPID_NEM_PKT_HEADER_FIELDS \ - struct { \ - int source; \ - int dest; \ - MPIR_Pint datalen; \ - unsigned short seqno; \ - unsigned short type; /* currently used only with checkpointing */ \ - }; - -typedef struct MPID_nem_pkt_header -{ - MPID_NEM_PKT_HEADER_FIELDS; -} MPID_nem_pkt_header_t; - - -#endif /* MPID_NEM_DATATYPES_H */ diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index 0b4657e..7e9cf28 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -368,7 +368,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) if (cell) { - char *cell_buf = (char *)cell->pkt.mpich.payload; + char *cell_buf = (char *)cell->pkt.mpich.p.payload; MPIDI_msg_sz_t payload_len = cell->pkt.mpich.datalen; MPIDI_CH3_Pkt_t *pkt = (MPIDI_CH3_Pkt_t *)cell_buf; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c index 34243cd..2ba0960 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c @@ -117,7 +117,7 @@ MPID_nem_init(int pg_rank, MPIDI_PG_t *pg_p, int has_parent ATTRIBUTE((unused))) MPIU_Assert(MPID_NEM_CELL_PAYLOAD_LEN + MPID_NEM_CELL_HEAD_LEN == sizeof(MPID_nem_cell_t)); MPIU_Assert(sizeof(MPID_nem_cell_t) == sizeof(MPID_nem_abs_cell_t)); /* Make sure payload is aligned on a double */ - MPIU_Assert(MPID_NEM_ALIGNED(&((MPID_nem_cell_t*)0)->pkt.mpich.payload[0], sizeof(double))); + MPIU_Assert(MPID_NEM_ALIGNED(&((MPID_nem_cell_t*)0)->pkt.mpich.p.payload[0], sizeof(double))); /* Initialize the business card */ mpi_errno = MPIDI_CH3I_BCInit( &bc_val, &val_max_remaining ); diff --git a/src/mpid/ch3/channels/nemesis/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/subconfigure.m4 index fab8504..87b7e5d 100644 --- a/src/mpid/ch3/channels/nemesis/subconfigure.m4 +++ b/src/mpid/ch3/channels/nemesis/subconfigure.m4 @@ -319,22 +319,6 @@ if test "$enable_nemesis_lock_free_queues" = "yes" ; then AC_DEFINE(MPID_NEM_USE_LOCK_FREE_QUEUES, 1, [Define to enable lock-free communication queues]) fi -# for nemisis header alignment, will need to know how this structure laid out: -AC_CHECK_SIZEOF(MPID_nem_pkt_header_t, 0, [ -typedef $MPI_PINT MPIR_Pint; -#include "${master_top_srcdir}/src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h"]) - -AC_CHECK_ALIGNOF(MPID_nem_pkt_header_t, [ -typedef $MPI_PINT MPIR_Pint; -#include "${master_top_srcdir}/src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h"]) - -# We're trying to get 'payload' to live at a double-aligned memory address -AS_VAR_ARITH([mpid_pkt_header_padding], - [ $ac_cv_alignof_MPID_nem_pkt_header_t % $ac_cv_sizeof_double]) -AC_DEFINE_UNQUOTED(MPID_NEM_PKT_HEADER_PADDING, [$mpid_pkt_header_padding], [Amount of padding needed in the MPID_nem_pkt_header_t structure]) - - - AC_SUBST(device_name) AC_SUBST(channel_name) ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/include/mpid_nem_datatypes.h | 20 ++++++++++++---- .../ch3/channels/nemesis/include/mpid_nem_inline.h | 24 +++++++++--------- .../channels/nemesis/include/mpid_nem_pkt_header.h | 25 -------------------- src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c | 2 +- src/mpid/ch3/channels/nemesis/subconfigure.m4 | 16 ------------ 6 files changed, 29 insertions(+), 60 deletions(-) delete mode 100644 src/mpid/ch3/channels/nemesis/include/mpid_nem_pkt_header.h hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-182-gd089353
by noreply＠mpich.org 03 Nov '13

03 Nov '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 d089353f5514a61062bd34bde2c0c5135902b97c (commit) from a5aa7920ba7045ff66a3c3f5cfec7d8037b40fea (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/d089353f5514a61062bd34bde2c0c5135… commit d089353f5514a61062bd34bde2c0c5135902b97c Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Nov 1 16:51:20 2013 -0500 testcase for status object manipulations MPI_Count in a status object breaks ABI, so we have a scheme to use lo and hi parts of adjacent struct members. but it's not foolproof. Test case to demonstrate bugs and hopefully catch future regressions. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/test/mpi/pt2pt/Makefile.am b/test/mpi/pt2pt/Makefile.am index 5031100..4929daa 100644 --- a/test/mpi/pt2pt/Makefile.am +++ b/test/mpi/pt2pt/Makefile.am @@ -48,5 +48,6 @@ noinst_PROGRAMS = \ waittestnull \ sendall \ large_message \ - mprobe + mprobe \ + big_count_status diff --git a/test/mpi/pt2pt/big_count_status.c b/test/mpi/pt2pt/big_count_status.c new file mode 100644 index 0000000..3b93109 --- /dev/null +++ b/test/mpi/pt2pt/big_count_status.c @@ -0,0 +1,51 @@ +#include <mpi.h> +#include <assert.h> +#include <stdio.h> + +int test_count(MPI_Count count) +{ + MPI_Status stat; + int cancelled, cancelled2; + MPI_Count bcount, bcount2; + int nerrs = 0; + + bcount = count; + cancelled = 0; + MPI_Status_set_cancelled(&stat, cancelled); + MPI_Status_set_elements_x(&stat, MPI_BYTE, bcount); + MPI_Get_elements_x(&stat, MPI_BYTE, &bcount2); + MPI_Test_cancelled(&stat, &cancelled2); + if (bcount != bcount2) { + fprintf(stderr, "Count Error: expected %lx, got %lx\n", bcount, bcount2); + nerrs++; + } + if (cancelled != cancelled2) { + fprintf(stderr, "Cancelled Error: expected %d, got %d\n", cancelled, cancelled2); + nerrs++; + } + return nerrs; +} + +int main(int argc, char **argv) +{ + int nerrors = 0; + + MPI_Init(&argc, &argv); + /* baseline: this tiny value should pose no problems */ + nerrors += test_count(60); + /* one with no next-to-high-bits set */ + nerrors += test_count(0x3654321f71234567); + /* masking after shift can help the count_high, but count_low is still + * wrong */ + nerrors += test_count(0x7654321f71234567); + /* original problematic count reported by Artem Yalozo */ + nerrors += test_count(0x7654321ff1234567); + + if (nerrors != 0) { + fprintf(stderr, "found %d errors\n", nerrors); + } + else { + printf(" No Errors\n"); + } + MPI_Finalize(); +} diff --git a/test/mpi/pt2pt/testlist b/test/mpi/pt2pt/testlist index f5c86aa..89de3e2 100644 --- a/test/mpi/pt2pt/testlist +++ b/test/mpi/pt2pt/testlist @@ -37,3 +37,4 @@ waitany-null 1 # perhaps disable in the release tarball large_message 3 mprobe 2 mpiversion=3.0 +big_count_status 1 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/pt2pt/Makefile.am | 3 +- test/mpi/pt2pt/big_count_status.c | 51 +++++++++++++++++++++++++++++++++++++ test/mpi/pt2pt/testlist | 1 + 3 files changed, 54 insertions(+), 1 deletions(-) create mode 100644 test/mpi/pt2pt/big_count_status.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-181-ga5aa792
by noreply＠mpich.org 03 Nov '13

03 Nov '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 a5aa7920ba7045ff66a3c3f5cfec7d8037b40fea (commit) via fda1c8ce26ec28005f7a8b37c788bd9b2afdd158 (commit) from 11e1e075af056e65285474a769bac7a6bd4a60ae (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/a5aa7920ba7045ff66a3c3f5cfec7d803… commit a5aa7920ba7045ff66a3c3f5cfec7d8037b40fea Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun Nov 3 12:00:00 2013 -0600 Fix assertion for large counts. We were checking for (size of datatype < MPIR_COUNT_MAX / count) earlier. This is not a good test when the count is very large. This patch modifies the assertion to (count * size of datatype < MPIR_COUNT_MAX) so we don't run into integer division issues. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/datatype/status_set_elements_x.c b/src/mpi/datatype/status_set_elements_x.c index 7e9082c..c1d7ae2 100644 --- a/src/mpi/datatype/status_set_elements_x.c +++ b/src/mpi/datatype/status_set_elements_x.c @@ -38,7 +38,7 @@ int MPIR_Status_set_elements_x_impl(MPI_Status *status, MPI_Datatype datatype, M /* overflow check, should probably be a real error check? */ if (count != 0) { MPIU_Assert(size_x >= 0 && count > 0); - MPIU_Assert(size_x < MPIR_COUNT_MAX / count); + MPIU_Assert(count * size_x < MPIR_COUNT_MAX); } MPIR_STATUS_SET_COUNT(*status, size_x * count); http://git.mpich.org/mpich.git/commitdiff/fda1c8ce26ec28005f7a8b37c788bd9b2… commit fda1c8ce26ec28005f7a8b37c788bd9b2afdd158 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun Nov 3 08:56:36 2013 -0600 Fix bit manipulation in the MPI_Status object. In C, left-shift has well-defined behavior, but right-shift does not for signed integers. The implementation is free to pad the shifted bits with 0's or 1's. In this patch, we type-cast the values to unsigned integers to make the behavior well-defined. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/configure.ac b/configure.ac index 5300fa8..ea90595 100644 --- a/configure.ac +++ b/configure.ac @@ -5755,6 +5755,7 @@ AS_IF([test "$MPI_SIZEOF_AINT" -gt "$MPI_SIZEOF_OFFSET"], AC_SUBST([MPI_COUNT]) AC_SUBST([COUNT_KIND]) AC_DEFINE_UNQUOTED([MPIR_COUNT_MAX],[$MPIR_COUNT_MAX],[limits.h _MAX constant for MPI_Count]) +AC_DEFINE_UNQUOTED(MPIR_Ucount,unsigned $MPI_COUNT,[MPIR_Ucount is an unsigned MPI_Count-sized integer]) AS_CASE([$MPI_SIZEOF_COUNT], [4], [len_mpi_count=04], diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 4786d60..4987129 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2318,11 +2318,11 @@ void MPIR_Err_print_stack(FILE *, int); { \ (status_).count_lo = ((int) count_); \ (status_).count_hi_and_cancelled &= 1; \ - (status_).count_hi_and_cancelled |= (int) ((MPI_Count) count_ >> MPIR_BITS_IN_INT << 1); \ + (status_).count_hi_and_cancelled |= (int) ((MPIR_Ucount) count_ >> MPIR_BITS_IN_INT << 1); \ } #define MPIR_STATUS_GET_COUNT(status_) \ - ((MPI_Count) ((((MPI_Count) (status_).count_hi_and_cancelled) >> 1 << MPIR_BITS_IN_INT) + (status_).count_lo)) + ((MPI_Count) ((((MPIR_Ucount) (((unsigned int) (status_).count_hi_and_cancelled) >> 1)) << MPIR_BITS_IN_INT) + (unsigned int) (status_).count_lo)) #define MPIR_STATUS_SET_CANCEL_BIT(status_, cancelled_) \ { \ ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + src/include/mpiimpl.h | 4 ++-- src/mpi/datatype/status_set_elements_x.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-179-g11e1e07
by noreply＠mpich.org 02 Nov '13

02 Nov '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 11e1e075af056e65285474a769bac7a6bd4a60ae (commit) from 05262f9ad06aeb9b182957d530b43e7419e9e356 (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/11e1e075af056e65285474a769bac7a6b… commit 11e1e075af056e65285474a769bac7a6bd4a60ae Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Sat Nov 2 12:13:01 2013 -0500 Increased tmp string buffer len from 1K to 16K Fixes ticket #1773 Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index e17b8c8..c14de0a 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -117,7 +117,7 @@ extern char *HYD_dbg_prefix; #define HYD_POLLHUP (0x0004) #define HYD_TMPBUF_SIZE (64 * 1024) -#define HYD_TMP_STRLEN 1024 +#define HYD_TMP_STRLEN (16 * 1024) #define HYD_NUM_TMP_STRINGS 1000 #define HYD_DEFAULT_RETRY_COUNT (10) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/include/hydra.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-178-g05262f9
by noreply＠mpich.org 01 Nov '13

01 Nov '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 05262f9ad06aeb9b182957d530b43e7419e9e356 (commit) from ca75e5c4df27d0a51fc5e87af13bcfcd73116b0a (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/05262f9ad06aeb9b182957d530b43e741… commit 05262f9ad06aeb9b182957d530b43e7419e9e356 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Oct 31 19:05:45 2013 -0500 Fix perl warnings in the C++ buildiface. Use if (@array) format instead of if (defined(@array)) format, since the latter is deprecated in perl. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/cxx/buildiface b/src/binding/cxx/buildiface index 3be7c08..af42e5d 100755 --- a/src/binding/cxx/buildiface +++ b/src/binding/cxx/buildiface @@ -1191,7 +1191,7 @@ print $OUTFD "class File;\n\n"; # other functions. print $OUTFD "// base (classless) routines\n"; @routines = keys(%class_mpi1base); -if (defined(@routinesMpi1base)) { +if (@routinesMpi1base) { @routines = @routinesMpi1base; } if ($outputRoutineLists) { @@ -1257,7 +1257,7 @@ typedef int MPI_File;\ $class_hash = "class_$mpiclass"; @routines = keys(%$class_hash); $arrname = "routines$mpiclass"; - if (defined(@$arrname)) { + if (@$arrname) { @routines = @$arrname; } if ($#routines < 0) { next; } @@ -1308,7 +1308,7 @@ typedef int MPI_File;\ # Add a few more external functions (some require the above definitions) @routines = keys(%class_mpi2base); - if (defined(@routinesMpi2base)) { + if (@routinesMpi2base) { @routines = @routinesMpi2base; } if ($outputRoutineLists) { ----------------------------------------------------------------------- Summary of changes: src/binding/cxx/buildiface | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1b1-177-gca75e5c
by noreply＠mpich.org 01 Nov '13

01 Nov '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 ca75e5c4df27d0a51fc5e87af13bcfcd73116b0a (commit) from ba82b5361e518f16fc06fcec6151d968e26bfbd5 (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/ca75e5c4df27d0a51fc5e87af13bcfcd7… commit ca75e5c4df27d0a51fc5e87af13bcfcd73116b0a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Oct 31 22:05:44 2013 -0500 Remove xfails for ticket 1893. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/test/mpi/datatype/testlist b/test/mpi/datatype/testlist index b64d59e..54e564f 100644 --- a/test/mpi/datatype/testlist +++ b/test/mpi/datatype/testlist @@ -50,6 +50,6 @@ hindexed_block_contents 1 mpiversion=3.0 longdouble 1 large-count 1 mpiversion=3.0 xfail=ticket1767 cxx-types 1 mpiversion=3.0 -large_type 1 mpiversion=3.0 xfail=ticket1893 -large_type_sendrec 2 arg=31 mpiversion=3.0 xfail=ticket1893 -large_type_sendrec 2 arg=32 mpiversion=3.0 xfail=ticket1893 +large_type 1 mpiversion=3.0 +large_type_sendrec 2 arg=31 mpiversion=3.0 +large_type_sendrec 2 arg=32 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/datatype/testlist | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0