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

[mpich] MPICH primary repository branch, master, updated. v3.2b3-6-ge1635ed
by noreply＠mpich.org 04 Jun '15

04 Jun '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 e1635ed2e0bc0fc7ceaa5130b0977dec59d7ec04 (commit) from f6ef4406135f1e8a32cb529a3c3e6f69e514c415 (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/e1635ed2e0bc0fc7ceaa5130b0977dec5… commit e1635ed2e0bc0fc7ceaa5130b0977dec59d7ec04 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Tue Jun 2 23:21:52 2015 -0500 bug fix and add @WRAPPER_LDFLAGS@ to final_ldflags Some special options might be added by libtool, such as -Wl,-flat_namespace -Wl,-commons,use_dylibs, and we do not want to drop them even when interlibrary deps is on. Also reference [eb0e7712] Fixes #2271 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in index a817989..994fdc1 100644 --- a/src/env/mpicc.bash.in +++ b/src/env/mpicc.bash.in @@ -210,11 +210,11 @@ fi final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@" final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICC_LDFLAGS@" +final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # ----------------------------------------------------------------------- diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index 7b88647..8c8cfc0 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -219,11 +219,11 @@ fi final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@" final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICC_LDFLAGS@" +final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # ----------------------------------------------------------------------- diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in index 865fc7f..b671f77 100644 --- a/src/env/mpicxx.bash.in +++ b/src/env/mpicxx.bash.in @@ -216,11 +216,11 @@ fi final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@" final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICXX_LDFLAGS@" +final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index d3dff0f..cf63bda 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -225,11 +225,11 @@ fi final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@" final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICXX_LDFLAGS@" +final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in index d3a9e95..de6d1f5 100644 --- a/src/env/mpif77.bash.in +++ b/src/env/mpif77.bash.in @@ -267,11 +267,11 @@ if [ -n "$profConf" ] ; then fi final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@" -final_ldflags="@MPICH_MPIF77_LDFLAGS@" +final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPIF77_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index 7e347bc..4710512 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -289,11 +289,11 @@ if [ -n "$profConf" ] ; then fi final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@" -final_ldflags="@MPICH_MPIF77_LDFLAGS@" +final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPIF77_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in index af006ee..a3ad54d 100644 --- a/src/env/mpifort.bash.in +++ b/src/env/mpifort.bash.in @@ -308,11 +308,11 @@ elif [ -n "$FCMODINC" ] ; then fi final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@" -final_ldflags="@MPICH_MPIFORT_LDFLAGS@" +final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in index 0cf8e8e..96aba33 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in @@ -325,11 +325,11 @@ elif [ -n "$FCMODINC" ] ; then fi final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@" -final_ldflags="@MPICH_MPIFORT_LDFLAGS@" +final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@" final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then - final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@" - final_libs="$libs @LIBS@ @WRAPPER_LIBS@" + final_ldflags="${final_ldflags} @LDFLAGS@" + final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" fi # A temporary statement to invoke the compiler ----------------------------------------------------------------------- Summary of changes: src/env/mpicc.bash.in | 6 +++--- src/env/mpicc.sh.in | 6 +++--- src/env/mpicxx.bash.in | 6 +++--- src/env/mpicxx.sh.in | 6 +++--- src/env/mpif77.bash.in | 6 +++--- src/env/mpif77.sh.in | 6 +++--- src/env/mpifort.bash.in | 6 +++--- src/env/mpifort.sh.in | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-5-gf6ef440
by noreply＠mpich.org 04 Jun '15

04 Jun '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 f6ef4406135f1e8a32cb529a3c3e6f69e514c415 (commit) from c105d422edaf19af14d492d784c432cf819ee92c (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/f6ef4406135f1e8a32cb529a3c3e6f69e… commit f6ef4406135f1e8a32cb529a3c3e6f69e514c415 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Jun 4 11:01:02 2015 -0500 update CHANGES to reflect the MPI-3.1 standard Signed-off-by: Halim Amer <aamer(a)anl.gov> diff --git a/CHANGES b/CHANGES index 5de210a..0af3592 100644 --- a/CHANGES +++ b/CHANGES @@ -2,12 +2,10 @@ Changes in 3.2 =============================================================================== - # Added support for proposed MPI-3.1 features including nonblocking - collective I/O, address manipulation routines, thread-safety for - MPI initialization, pre-init functionality, and new MPI_T routines - to look up variables by name. Proposed MPI-3.1 features are - implemented as MPIX_ functions and the MPI version number is still - set to 3.0. + # Added support for MPI-3.1 features including nonblocking collective I/O, + address manipulation routines, thread-safety for MPI initialization, + pre-init functionality, and new MPI_T routines to look up variables + by name. # Fortran 2008 bindings are enabled by default and fully supported. ----------------------------------------------------------------------- Summary of changes: CHANGES | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-4-gc105d42
by noreply＠mpich.org 04 Jun '15

04 Jun '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 c105d422edaf19af14d492d784c432cf819ee92c (commit) from 27a5232a498ea4d853fb4a778fa7f3b0291fc774 (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/c105d422edaf19af14d492d784c432cf8… commit c105d422edaf19af14d492d784c432cf819ee92c Author: Lena Oden <loden(a)anl.gov> Date: Tue Jun 2 10:46:01 2015 -0500 Check if type_tag is agnostic to modifiers. Add a test to configure.ac that tests, if type_tag_for_datatype is agnostic for modifiers as const or volatile. If the test fails, the type_tag_for_datatype test is disabled in mpi.h by setting a flag to avoid compiler warning. In this case, there are no type tests for MPI data types when compiling. Fixes #2223. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/configure.ac b/configure.ac index 141307b..44e7c97 100644 --- a/configure.ac +++ b/configure.ac @@ -4433,6 +4433,29 @@ AC_SUBST([MPI_F77_CXX_FLOAT_COMPLEX]) AC_SUBST([MPI_F77_CXX_DOUBLE_COMPLEX]) AC_SUBST([MPI_F77_CXX_LONG_DOUBLE_COMPLEX]) +# ------------------------------------------------------------------------ +# Test if type_tag_for_datatype is agnostic to modifiers such as const, volatile, and restrict +# if not, the type tags are disabled to avoid compiler warings. A new type_tag for const etc. does +# does not help, since only the latest type_tag definition is used. Type tags are defined in mpi.h, +# therefore, they must be also be activated/deavtivated there +PAC_PUSH_FLAG([CFLAGS]) +PAC_APPEND_FLAG([-Werror],[CFLAGS]) +AC_TRY_COMPILE([ +typedef int TEST_Datatype; +#define TEST_INT ((TEST_Datatype)0x44) +static const TEST_Datatype test_int __attribute__((type_tag_for_datatype(TEST,int))) = TEST_INT; +void test(const void* buffer, TEST_Datatype datatype)__attribute__((pointer_with_type_tag(TEST,1,2)));],[ +const int buf[10]; +test(buf, TEST_INT);],ac_attr_support=yes, ac_attr_support=no) +if test "$ac_attr_support" = yes +then + DISABLE_TAG_SUPPORT="#undef NO_TAGS_WITH_MODIFIERS" +else + DISABLE_TAG_SUPPORT="#define NO_TAGS_WITH_MODIFIERS 1" +fi +PAC_POP_FLAG([CFLAGS]) +AC_SUBST(DISABLE_TAG_SUPPORT) + # ---------------------------------------------------------------------------- # Check for the alignment rules moves with types int64_t etc. These # are used in the datatype code to perform pack and unpack operations. diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 6d22fd9..41387a7 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -14,10 +14,12 @@ extern "C" { #endif +@DISABLE_TAG_SUPPORT@ #undef MPICH_DEFINE_ATTR_TYPE_TYPES #if defined(__has_attribute) # if __has_attribute(pointer_with_type_tag) && \ __has_attribute(type_tag_for_datatype) && \ + !defined(NO_TAGS_WITH_MODIFIERS) &&\ !defined(MPICH_NO_ATTR_TYPE_TAGS) # define MPICH_DEFINE_ATTR_TYPE_TYPES 1 # define MPICH_ATTR_POINTER_WITH_TYPE_TAG(buffer_idx, type_idx) __attribute__((pointer_with_type_tag(MPI,buffer_idx,type_idx))) ----------------------------------------------------------------------- Summary of changes: configure.ac | 23 +++++++++++++++++++++++ src/include/mpi.h.in | 2 ++ 2 files changed, 25 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-3-g27a5232
by noreply＠mpich.org 02 Jun '15

02 Jun '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 27a5232a498ea4d853fb4a778fa7f3b0291fc774 (commit) from 7dab7cd3a893e252133c326e8f096986d77b168a (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/27a5232a498ea4d853fb4a778fa7f3b02… commit 27a5232a498ea4d853fb4a778fa7f3b0291fc774 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jun 2 20:33:17 2015 -0500 Issue extended packet header in OFI netmod. In e50bec3af65eb54005dd0150599a387a52dd1fda, we add code in Nemesis and TCP/Portals4/MXM netmods to issue extended packet header stored in the request. In this patch, we did the similiar modification to OFI netmod. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index dcad1d4..fe5ddae 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -187,15 +187,21 @@ int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, char *pack_buffer; uint64_t match_bits; MPID_Request *cts_req; + MPIDI_msg_sz_t buf_offset = 0; BEGIN_FUNC(FCNAME); MPIU_Assert(hdr_sz <= (MPIDI_msg_sz_t) sizeof(MPIDI_CH3_Pkt_t)); MPID_nem_ofi_init_req(sreq); - pkt_len = sizeof(MPIDI_CH3_Pkt_t) + data_sz; + pkt_len = sizeof(MPIDI_CH3_Pkt_t) + sreq->dev.ext_hdr_sz + data_sz; pack_buffer = MPIU_Malloc(pkt_len); MPIU_Assert(pack_buffer); MPIU_Memcpy(pack_buffer, hdr, hdr_sz); - MPIU_Memcpy(pack_buffer + sizeof(MPIDI_CH3_Pkt_t), data, data_sz); + buf_offset += sizeof(MPIDI_CH3_Pkt_t); + if (sreq->dev.ext_hdr_sz > 0) { + MPIU_Memcpy(pack_buffer + buf_offset, sreq->dev.ext_hdr_ptr, sreq->dev.ext_hdr_sz); + buf_offset += sreq->dev.ext_hdr_sz; + } + MPIU_Memcpy(pack_buffer + buf_offset, data, data_sz); START_COMM(); END_FUNC_RC(FCNAME); } @@ -211,6 +217,7 @@ int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, uint64_t match_bits; MPID_Request *cts_req; MPIDI_msg_sz_t first, last; + MPIDI_msg_sz_t buf_offset = 0; BEGIN_FUNC(FCNAME); MPIU_Assert(hdr_sz <= (MPIDI_msg_sz_t) sizeof(MPIDI_CH3_Pkt_t)); @@ -218,11 +225,16 @@ int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, first = sreq->dev.segment_first; last = sreq->dev.segment_size; data_sz = sreq->dev.segment_size - sreq->dev.segment_first; - pkt_len = sizeof(MPIDI_CH3_Pkt_t) + data_sz; + pkt_len = sizeof(MPIDI_CH3_Pkt_t) + sreq->dev.ext_hdr_sz + data_sz; pack_buffer = MPIU_Malloc(pkt_len); MPIU_Assert(pack_buffer); MPIU_Memcpy(pack_buffer, hdr, hdr_sz); - MPID_Segment_pack(sreq->dev.segment_ptr, first, &last, pack_buffer + sizeof(MPIDI_CH3_Pkt_t)); + buf_offset += sizeof(MPIDI_CH3_Pkt_t); + if (sreq->dev.ext_hdr_sz > 0) { + MPIU_Memcpy(pack_buffer + buf_offset, sreq->dev.ext_hdr_ptr, sreq->dev.ext_hdr_sz); + buf_offset += sreq->dev.ext_hdr_sz; + } + MPID_Segment_pack(sreq->dev.segment_ptr, first, &last, pack_buffer + buf_offset); START_COMM(); MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); END_FUNC_RC(FCNAME); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-2-g7dab7cd
by noreply＠mpich.org 02 Jun '15

02 Jun '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 7dab7cd3a893e252133c326e8f096986d77b168a (commit) from 95a64b67ad45815bbbcafcd5b50abbf46232122a (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/7dab7cd3a893e252133c326e8f096986d… commit 7dab7cd3a893e252133c326e8f096986d77b168a Author: Halim Amer <aamer(a)anl.gov> Date: Sun May 31 17:32:37 2015 -0500 Fixed several issues related to Ibsend The implementation of Ibsend had several issues: 1) incorrect ref counting when canceling a request, which leads to handle leaks; 2) writing MPI_REQUEST_NULL directly in the handle field of a request (MPID_Request) in the request pool because the handle field is passed by reference to MPIR_Wait_impl; 3) the memory used in the attached buffer is never freed after a successful cancellation This patch fixes all the above mentioned issues. In addition it fixes and closes ticket:287. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c index 1b925a3..55ba130 100644 --- a/src/mpi/pt2pt/bsendutil.c +++ b/src/mpi/pt2pt/bsendutil.c @@ -81,6 +81,7 @@ static int MPIR_Bsend_check_active ( void ); static MPIR_Bsend_data_t *MPIR_Bsend_find_buffer( int ); static void MPIR_Bsend_take_buffer( MPIR_Bsend_data_t *, int ); static int MPIR_Bsend_finalize( void * ); +static void MPIR_Bsend_free_segment( MPIR_Bsend_data_t * ); /* * Attach a buffer. This checks for the error conditions and then @@ -317,6 +318,39 @@ int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype, } /* + * The following routine looks up the segment used by request req + * and frees it. The request is assumed to be completed. This routine + * is called by only MPIR_Ibsend_free. + */ +#undef FUNCNAME +#define FUNCNAME MPIR_Bsend_free_seg +#undef FCNAME +#define FCNAME MPIDI_QUOTE(FUNCNAME) +int MPIR_Bsend_free_req_seg( MPID_Request* req ) +{ + int mpi_errno = MPI_ERR_INTERN; + MPIR_Bsend_data_t *active = BsendBuffer.active; + + MPIU_DBG_MSG_P(BSEND,TYPICAL,"Checking active starting at %p", active); + while (active) { + + if (active->request == req) { + MPIR_Bsend_free_segment( active ); + mpi_errno = MPI_SUCCESS; + } + + active = active->next;; + + MPIU_DBG_MSG_P(BSEND,TYPICAL,"Next active is %p",active); + } + + fn_exit: + return mpi_errno; + fn_fail: + goto fn_exit; +} + +/* * The following routines are used to manage the allocation of bsend segments * in the user buffer. These routines handle, for example, merging segments * when an active segment that is adjacent to a free segment becomes free. diff --git a/src/mpi/pt2pt/bsendutil.h b/src/mpi/pt2pt/bsendutil.h index d5742dd..ba29964 100644 --- a/src/mpi/pt2pt/bsendutil.h +++ b/src/mpi/pt2pt/bsendutil.h @@ -12,4 +12,5 @@ int MPIR_Bsend_attach( void *, int ); int MPIR_Bsend_detach( void *, int * ); int MPIR_Bsend_isend(const void *, int, MPI_Datatype, int, int, MPID_Comm *, MPIR_Bsend_kind_t, MPID_Request ** ); +int MPIR_Bsend_free_req_seg(MPID_Request * ); diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index af2b5cc..1696759 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -46,18 +46,8 @@ PMPI_LOCAL int MPIR_Ibsend_free( void *extra ) { ibsend_req_info *ibsend_info = (ibsend_req_info *)extra; - /* Release the MPID_Request (there is still another ref pending - within the bsendutil functions) */ - /* XXX DJG FIXME-MT should we be checking this? */ - if (MPIU_Object_get_ref(ibsend_info->req) > 1) { - int inuse; - /* Note that this should mean that the request was - cancelled (that would have decremented the ref count) - */ - MPIR_Request_release_ref( ibsend_info->req, &inuse ); - } - MPIU_Free( ibsend_info ); + return MPI_SUCCESS; } #undef FUNCNAME @@ -70,6 +60,7 @@ PMPI_LOCAL int MPIR_Ibsend_cancel( void *extra, int complete ) ibsend_req_info *ibsend_info = (ibsend_req_info *)extra; MPI_Status status; MPID_Request *req = ibsend_info->req; + MPI_Request req_hdl = req->handle; /* FIXME: There should be no unreferenced args! */ /* Note that this value should always be 1 because @@ -81,10 +72,16 @@ PMPI_LOCAL int MPIR_Ibsend_cancel( void *extra, int complete ) /* Try to cancel the underlying request */ mpi_errno = MPIR_Cancel_impl(req); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - mpi_errno = MPIR_Wait_impl( &req->handle, &status ); + mpi_errno = MPIR_Wait_impl( &req_hdl, &status ); if (mpi_errno) MPIU_ERR_POP(mpi_errno); MPIR_Test_cancelled_impl( &status, &ibsend_info->cancelled ); - + + /* If the cancelation is successful, free the memory in the + attached buffer used by the request */ + if (ibsend_info->cancelled) { + mpi_errno = MPIR_Bsend_free_req_seg(ibsend_info->req); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + } fn_exit: return mpi_errno; fn_fail: @@ -119,8 +116,6 @@ int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest if (mpi_errno) MPIU_ERR_POP(mpi_errno); /* The request is immediately complete because the MPIR_Bsend_isend has already moved the data out of the user's buffer */ - MPIR_Request_add_ref( request_ptr ); - /* Request count is now 2 (set to 1 in Grequest_start) */ MPIR_Grequest_complete_impl(new_request_ptr); MPIU_OBJ_PUBLISH_HANDLE(*request, new_request_ptr->handle); ----------------------------------------------------------------------- Summary of changes: src/mpi/pt2pt/bsendutil.c | 34 ++++++++++++++++++++++++++++++++++ src/mpi/pt2pt/bsendutil.h | 1 + src/mpi/pt2pt/ibsend.c | 25 ++++++++++--------------- 3 files changed, 45 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-1-g95a64b6
by noreply＠mpich.org 02 Jun '15

02 Jun '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 95a64b67ad45815bbbcafcd5b50abbf46232122a (commit) from 25204ef3ea181d8e3f4a702abd19615773c2b3c1 (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/95a64b67ad45815bbbcafcd5b50abbf46… commit 95a64b67ad45815bbbcafcd5b50abbf46232122a Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Jun 2 07:50:02 2015 -0500 Remove xfails for some more tests. These tests are not passing yet, but the plan is to fix them for the upcoming release. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index de33962..057b96f 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -18,7 +18,7 @@ red4 10 alltoall1 8 alltoallv 10 alltoallv0 10 -alltoallw1 10 xfail=ticket2180 +alltoallw1 10 alltoallw2 10 alltoallw_zeros 1 alltoallw_zeros 2 @@ -78,7 +78,7 @@ exscan 10 exscan2 5 gather 4 gather2 4 -gather_big 8 xfail=ticket1767 +gather_big 8 scattern 4 scatter2 4 scatter3 4 diff --git a/test/mpi/errors/coll/testlist b/test/mpi/errors/coll/testlist index 9697478..7cb768a 100644 --- a/test/mpi/errors/coll/testlist +++ b/test/mpi/errors/coll/testlist @@ -3,4 +3,4 @@ noalias2 4 mpiversion=2.2 noalias3 4 mpiversion=3.0 rerr 2 reduce_local 1 -bcastlength 4 xfail=ticket2260 +bcastlength 4 diff --git a/test/mpi/f90/f90types/testlist b/test/mpi/f90/f90types/testlist index 626db00..69c63af 100644 --- a/test/mpi/f90/f90types/testlist +++ b/test/mpi/f90/f90types/testlist @@ -1,2 +1,2 @@ -createf90types 1 xfail=ticket2265 -createf90types 1 arg=10000 xfail=ticket2265 +createf90types 1 +createf90types 1 arg=10000 diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index 1dd8bbe..2c88ede 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -8,8 +8,7 @@ async 4 async_any 4 userioerr 1 resized 1 -# resize2 really is a goofy type, one we have never seen in real applications -resized2 1 xfail=ticket2088 +resized2 1 bigtype 1 hindexed_io 1 i_bigtype 1 mpiversion=3.1 diff --git a/test/mpi/pt2pt/testlist b/test/mpi/pt2pt/testlist index 4f6421b..514f7b8 100644 --- a/test/mpi/pt2pt/testlist +++ b/test/mpi/pt2pt/testlist @@ -25,11 +25,11 @@ greq1 1 probe-unexp 4 probenull 1 # For testing, scancel will run with 1 process as well -scancel 2 xfail=ticket287 +scancel 2 scancel2 2 -pscancel 2 xfail=ticket287 +pscancel 2 rcancel 2 -cancelrecv 2 xfail=ticket2266 +cancelrecv 2 cancelanysrc 2 isendselfprobe 1 inactivereq 1 diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index 33a6385..9e680e6 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -133,7 +133,7 @@ atomic_rmw_cas 3 atomic_rmw_gacc 3 aint 2 mpiversion=3.1 acc-pairtype 2 -manyget 2 xfail=ticket2264 +manyget 2 derived-acc-flush_local 3 mpiversion=3.0 ## This test is not strictly correct. This was meant to test out the diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist index 7767799..1485529 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist @@ -3,5 +3,5 @@ dup_leak_test 2 comm_dup_deadlock 4 comm_create_threads 4 comm_create_group_threads 4 -comm_idup 4 mpiversion=3.0 xfail=ticket2108 +comm_idup 4 mpiversion=3.0 ctxidup 4 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/testlist | 4 ++-- test/mpi/errors/coll/testlist | 2 +- test/mpi/f90/f90types/testlist | 4 ++-- test/mpi/io/testlist.in | 3 +-- test/mpi/pt2pt/testlist | 6 +++--- test/mpi/rma/testlist.in | 2 +- test/mpi/threads/comm/testlist | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.2b3, created. v3.2b3
by noreply＠mpich.org 01 Jun '15

01 Jun '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 annotated tag, v3.2b3 has been created at b922ef64a2c7630d393b6d187fcb77d800146771 (tag) tagging 25204ef3ea181d8e3f4a702abd19615773c2b3c1 (commit) replaces v3.2b2 tagged by Ken Raffenetti on Mon Jun 1 00:55:20 2015 -0500 - Log ----------------------------------------------------------------- tagging 'v3.2b3' Antonio J. Pena (2): Destroy the handle mutex on finalize Fixed the test threads/spawn/th_taskmaster Halim Amer (1): Fix handle leaks when canceling LMT send requests Huiwei Lu (1): Fix threaded MPI_Comm_idup Igor Ivanov (2): netmod/mxm: Add barrier before mxm_ep_destroy() call mpid/common/hcoll: Fix broken hcoll support Jeff Hammond (2): compress test cases with loop add comments and double precision cases Jithin Jose (2): OFI: Added FI_RC_RETRY and use it for all TX/RX operations. OFI: Set address length correctly while adding to business card Junchao Zhang (8): Adjust MPI_BOTTOM to zero in F77/90 bindings Add a test for MPI_BOTTOM and absolute datatypes in C/Fortran mixed code Code cleanup to remove USE_POINTER_FOR_BOTTOM Mark test/mpi/f90/f90types/createf90types with xfail Replace MPIX_Aint_ with MPI_Aint_ for MPI-3.1 Replace MPIX_T_ with MPI_T_ for MPI-3.1 Replace MPIX_ with MPI_ in NBC-IO for MPI-3.1 Change MPI_SUBVERSION from 0 to 1 for MPI-3.1 Ken Raffenetti (22): build-system: fix prepend/append flag macros build-system: add lib64 dirs only if they exist tsuite: test to expose limitation in Portals4 netmod bug-fix: error macro for atomic datatype checking tsuite: disable namepub tests when not configured Revert "Patched libtool for inter-library dependency on FreeBSD." tsuite: explicitly add -lpthread when used in tests dev/sock: fix build error with usleep netmod/portals4: cleanup pt2pt request tracking netmod/portals4: minor request ref helper fixup netmod/portals4: pkt enum typo netmod/portals4: free allocated memory in cancel send netmod/portals4: ignore reserved tag bits fixup for [90100837] xfail io/resized2 test for now tsuite: move file errhandler test to io bucket tsuite: mark manyget test as xfail mark some additional tests as xfail prior to release xfail cancelrecv another xfail to prep release xfail bcastlength for release update version and CHANGES for 3.2b3 Min Si (6): Removed duplicate header check in src/pm/hydra/configure.ac. Added function check and declaration for hstrerror. Patched libtool for inter-library dependency on FreeBSD. Bug fix: use lb + extent for derived dt in mtest datatype. Added lower-bound tests in mtest datatype routine. Added contig derived dt tests in mtest datatype. Paul Coffman (1): PAMI_Rput_typed / PAMI_Rget_typed add ref count to MPID_Datatype Pavan Balaji (7): Reenable a bunch of tests that were disabled so far. Promote MPL_large_writev/readv return types to ssize_t. Remove MPICHLIB_LDFLAGS/LIBS Cleaned up the management of wrapper flags in MPICH. Added support for static compilation. remove the newmad netmod. remove the scif netmod. Rob Latham (5): tweak hint inspection approach test case for large gather fixup: correctly const-ify hint processing routine proper return value for MPI_File_call_errhandler avoid segfault when calling built-in error handler Sangmin Seo (2): ROMIO: check if the host OS is Linux ROMIO: fix stack fault in NBC I/O Valentin Petrov (5): OFI: Add support for large tags using immediate data and OFI tag layouts OFI: Fix memory leak in anysource cancel path OFI: Remove unnecessary DYNAMIC_MR capability OFI: MPIR_Barrier_impl should not be called from MPID_nem_ofi_finalize. OFI: Bug fix for RTS/CTS/DATA protocol. Xin Zhao (13): Add a test for derived ACCs working with MPI_Win_flush_local. Add asserts and comments in Nemesis and MXM netmod about streaming offset. Correct usage of req's segment_first and segment_size in Nemesis Bug-fix: add true_lb when directly issuing contiguous derived data. Modify comments about issuing origin data in RMA. Modify comments about piggybacking LOCK with op. Revert "Move 'stream_offset' out of RMA packet struct." Initialize tmpbuf in request to NULL when creating new request. Add extended packet header in CH3 layer used by RMA messages Issue extended packet header in nemesis/netmod. Rename request handlers for ACC/GACC. Merge issuing functions for streamed msgs and non-streamed msgs in CH3. Bug-fix: issue extended packet header in sock. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-79-g25204ef
by noreply＠mpich.org 31 May '15

31 May '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 25204ef3ea181d8e3f4a702abd19615773c2b3c1 (commit) from cb910743a8bd88089400c897933a3926eb522478 (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/25204ef3ea181d8e3f4a702abd1961577… commit 25204ef3ea181d8e3f4a702abd19615773c2b3c1 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Sun May 31 19:05:34 2015 -0500 update version and CHANGES for 3.2b3 Signed-off-by: Halim Amer <aamer(a)anl.gov> diff --git a/CHANGES b/CHANGES index 81874e8..5de210a 100644 --- a/CHANGES +++ b/CHANGES @@ -33,7 +33,7 @@ A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.1.3..v3.2b2 + http://git.mpich.org/mpich.git/shortlog/v3.1.3..v3.2b3 A full list of bugs that have been fixed is available at the following link: diff --git a/maint/version.m4 b/maint/version.m4 index f283b80..8e15768 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.2b2])dnl +m4_define([MPICH_VERSION_m4],[3.2b3])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: ----------------------------------------------------------------------- Summary of changes: CHANGES | 2 +- maint/version.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0