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

[mpich] MPICH primary repository branch, master, updated. v3.2b2-50-g914f461
by noreply＠mpich.org 28 May '15

28 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 914f461b1a171c3a29043b548af842fb6159379b (commit) from 9854c4c481cb188c8d84e9e49552141262f8579f (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/914f461b1a171c3a29043b548af842fb6… commit 914f461b1a171c3a29043b548af842fb6159379b Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu May 28 09:00:02 2015 -0500 xfail io/resized2 test for now Refs #2088 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index 2f9da64..5fee38d 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -8,7 +8,8 @@ async 4 async_any 4 userioerr 1 resized 1 -resized2 1 +# resize2 really is a goofy type, one we have never seen in real applications +resized2 1 xfail=ticket2088 bigtype 1 hindexed_io 1 @mpix@i_bigtype 1 ----------------------------------------------------------------------- Summary of changes: test/mpi/io/testlist.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-49-g9854c4c
by noreply＠mpich.org 28 May '15

28 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 9854c4c481cb188c8d84e9e49552141262f8579f (commit) from 58737d1e4590e9752431c57f4b5dd1dab63faabc (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/9854c4c481cb188c8d84e9e4955214126… commit 9854c4c481cb188c8d84e9e49552141262f8579f Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri May 22 14:51:04 2015 -0500 fixup for [90100837] Use PAC macro to AC_SUBST and export WRAPPER_XXX variables. Ensures that they are available to the testsuite configure script. Closes #2190 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/configure.ac b/configure.ac index 54b2910..141307b 100644 --- a/configure.ac +++ b/configure.ac @@ -273,13 +273,7 @@ PAC_PREFIX_ALL_FLAGS(USER) # so executables built within MPICH use them. If inter-library # dependencies are not supported on the platform, these libraries are # added to the MPICH wrappers (mpicc and friends) as well. -AC_SUBST(WRAPPER_CFLAGS) -AC_SUBST(WRAPPER_CPPFLAGS) -AC_SUBST(WRAPPER_CXXFLAGS) -AC_SUBST(WRAPPER_FFLAGS) -AC_SUBST(WRAPPER_FCFLAGS) -AC_SUBST(WRAPPER_LDFLAGS) -AC_SUBST(WRAPPER_LIBS) +PAC_PREFIX_ALL_FLAGS(WRAPPER) # MPICH_MPIx_FLAGS are used by mpicc and friends. They are like # WRAPPER flags, but these are provided by the user. ----------------------------------------------------------------------- Summary of changes: configure.ac | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-48-g58737d1
by noreply＠mpich.org 27 May '15

27 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 58737d1e4590e9752431c57f4b5dd1dab63faabc (commit) from bf3c7d4192c5d0ad3f47e89ad9fadc7c8e8e6bbc (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/58737d1e4590e9752431c57f4b5dd1dab… commit 58737d1e4590e9752431c57f4b5dd1dab63faabc Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed May 27 15:35:39 2015 -0500 netmod/portals4: ignore reserved tag bits Two tag bits are reserved for error propagation. We need to make sure they are ignored by the network matching capabilities. Refs #2260 No reviewer. diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index b8c633f..30dcde9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -152,7 +152,7 @@ typedef struct { #define NPTL_MATCH(tag_, ctx_, rank_) ((((ptl_match_bits_t)(tag_) << NPTL_MATCH_TAG_OFFSET) & NPTL_MATCH_TAG_MASK) | \ (((ptl_match_bits_t)(ctx_) << NPTL_MATCH_CTX_OFFSET) & NPTL_MATCH_CTX_MASK) | \ ((ptl_match_bits_t)(rank_) & NPTL_MATCH_RANK_MASK)) -#define NPTL_MATCH_IGNORE NPTL_MATCH_RANK_MASK +#define NPTL_MATCH_IGNORE (NPTL_MATCH_RANK_MASK | (ptl_match_bits_t)(MPIR_TAG_ERROR_BIT | MPIR_TAG_PROC_FAILURE_BIT) << 32) #define NPTL_MATCH_IGNORE_ANY_TAG (NPTL_MATCH_IGNORE | NPTL_MATCH_TAG_MASK) #define NPTL_MATCH_GET_RANK(match_bits_) ((match_bits_) & NPTL_MATCH_RANK_MASK) ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_impl.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.2b2-47-gbf3c7d4
by noreply＠mpich.org 27 May '15

27 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 bf3c7d4192c5d0ad3f47e89ad9fadc7c8e8e6bbc (commit) from 443f495c1fe5eac127633dbc1805a47f4e48d849 (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/bf3c7d4192c5d0ad3f47e89ad9fadc7c8… commit bf3c7d4192c5d0ad3f47e89ad9fadc7c8e8e6bbc Author: Halim Amer <aamer(a)anl.gov> Date: Tue May 26 21:27:58 2015 -0500 Fix handle leaks when canceling LMT send requests If the destination of a LMT nonblocking send, which follows a rendez-vous protocol, receives the RTS packet to the unexpected queue followed by a cancelation request, the request in the unexpected queue never gets freed. To solve the issue, we forcefully free the rendez-vous request by adding an additional request release operation. Refs #287 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index 302d793..298ee59 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -252,6 +252,10 @@ int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { MPIU_Free(rreq->dev.tmpbuf); } + if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_RNDV_MSG) + { + MPID_Request_release(rreq); + } MPID_Request_release(rreq); ack = TRUE; } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_cancel_send.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-46-g443f495
by noreply＠mpich.org 26 May '15

26 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 443f495c1fe5eac127633dbc1805a47f4e48d849 (commit) from 65945a437838d8716da01ea12a9c58e664ee8bf8 (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/443f495c1fe5eac127633dbc1805a47f4… commit 443f495c1fe5eac127633dbc1805a47f4e48d849 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue May 26 14:25:28 2015 -0500 netmod/portals4: free allocated memory in cancel send Frees memory allocated to track large sends when those sends are successfully cancelled. No reviewer. diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index be03923..d04ba04 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -385,12 +385,15 @@ int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *p if (resp_pkt->ack) { MPIR_STATUS_SET_CANCEL_BIT(sreq->status, TRUE); - /* remove any remaining get MEs */ + /* remove/free any remaining get MEs and handles */ for (i = 0; i < REQ_PTL(sreq)->num_gets; i++) { ret = PtlMEUnlink(REQ_PTL(sreq)->get_me_p[i]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeunlink", "**ptlmeunlink %s", MPID_nem_ptl_strerror(ret)); MPIDI_CH3U_Request_complete(sreq); } + if (REQ_PTL(sreq)->get_me_p) + MPIU_Free(REQ_PTL(sreq)->get_me_p); + MPIU_DBG_MSG(CH3_OTHER,TYPICAL,"message cancelled"); } else { MPIR_STATUS_SET_CANCEL_BIT(sreq->status, FALSE); ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_probe.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-45-g65945a4
by noreply＠mpich.org 26 May '15

26 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 65945a437838d8716da01ea12a9c58e664ee8bf8 (commit) from fd32dce74ddaa62ae537dc7a88e43a02a9db11a0 (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/65945a437838d8716da01ea12a9c58e66… commit 65945a437838d8716da01ea12a9c58e664ee8bf8 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Tue May 26 09:24:39 2015 -0500 Code cleanup to remove USE_POINTER_FOR_BOTTOM The configure test was dropped long time ago in MPICH, and to keep ABI compatible, we don't want to restore it. Refs #1877 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/fortran/mpif_h/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h index a28f84c..799c9f7 100644 --- a/src/binding/fortran/mpif_h/mpi_fortimpl.h +++ b/src/binding/fortran/mpif_h/mpi_fortimpl.h @@ -160,11 +160,6 @@ typedef MPI_Aint MPI_FAint; #include "mpi_fortlogical.h" -/* If Cray-style pointers are supported, we don't need to check for a - "special" address. */ -#ifdef USE_POINTER_FOR_BOTTOM -#define MPIR_F_PTR(a) (a) -#else /* MPIR_F_MPI_BOTTOM is the address of the Fortran MPI_BOTTOM value */ extern FORT_DLL_SPEC int MPIR_F_NeedInit; extern FORT_DLL_SPEC void *MPIR_F_MPI_BOTTOM; @@ -200,8 +195,6 @@ extern FORT_DLL_SPEC void *MPI_F_ARGVS_NULL; /* Provide a prototype for the mpirinitf function */ extern void mpirinitf_( void ); -#endif - /* * These are hooks for Fortran characters. * MPID_FCHAR_T is the type of a Fortran character argument diff --git a/src/binding/fortran/mpif_h/setbot.c.in b/src/binding/fortran/mpif_h/setbot.c.in index da4a91c..faf193c 100644 --- a/src/binding/fortran/mpif_h/setbot.c.in +++ b/src/binding/fortran/mpif_h/setbot.c.in @@ -51,7 +51,6 @@ const MPI_Fint MPIR_F_FALSE=F77_FALSE_VALUE; # MPI-2, section 4.12.5, on the declaration of MPI_F_STATUS_IGNORE # MPI_F_STATUSES_IGNORE as global variables in mpi.h (!) */ -#ifndef USE_POINTER_FOR_BOTTOM int MPIR_F_NeedInit = 1; void *MPIR_F_MPI_BOTTOM = 0; void *MPIR_F_MPI_IN_PLACE = 0; @@ -65,7 +64,6 @@ void *MPI_F_STATUSES_IGNORE = 0; MPI_Fint *MPI_F_ERRCODES_IGNORE = 0; void *MPI_F_ARGVS_NULL = 0; void *MPIR_F_MPI_WEIGHTS_EMPTY = 0; -#endif FORT_DLL_SPEC void FORT_CALL mpirinitc_( void *si, void *ssi, void *bt, void *ip, ----------------------------------------------------------------------- Summary of changes: src/binding/fortran/mpif_h/mpi_fortimpl.h | 7 ------- src/binding/fortran/mpif_h/setbot.c.in | 2 -- 2 files changed, 0 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-44-gfd32dce
by noreply＠mpich.org 22 May '15

22 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 fd32dce74ddaa62ae537dc7a88e43a02a9db11a0 (commit) via 0970b5849e2900595330ccac81956748d41753e4 (commit) from b6b638afede62b245d307d7dfa7dab67364ee8f7 (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/fd32dce74ddaa62ae537dc7a88e43a02a… commit fd32dce74ddaa62ae537dc7a88e43a02a9db11a0 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Fri May 22 14:36:37 2015 -0500 Add a test for MPI_BOTTOM and absolute datatypes in C/Fortran mixed code Refs #1877 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 6cfaa34..1b35005 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -5,6 +5,8 @@ /f90/datatype/Makefile.am /f90/datatype/hindex1f90.f90 /f90/datatype/hindexed_blockf90.f90 +/f90/datatype/bottomf90.f90 +/f90/datatype/bottomc.c /f90/ext/Makefile.am /f90/ext/stamp-Makefile.am /f90/io/Makefile.am @@ -801,6 +803,7 @@ /f77/datatype/typenamef /f77/datatype/typesnamef /f77/datatype/typesubf +/f77/datatype/bottom /f77/ext/c2fmult /f77/ext/ctypesinf /f77/info/infotest2f diff --git a/test/mpi/f77/datatype/Makefile.am b/test/mpi/f77/datatype/Makefile.am index 26eb033..33e597e 100644 --- a/test/mpi/f77/datatype/Makefile.am +++ b/test/mpi/f77/datatype/Makefile.am @@ -13,7 +13,9 @@ EXTRA_DIST = testlist AM_DEFAULT_SOURCE_EXT = .f noinst_PROGRAMS = typenamef typesnamef typecntsf typesubf typem2f gaddressf \ - packef allctypesf hindex1f hindexed_blockf typename3f + packef allctypesf hindex1f hindexed_blockf typename3f bottom + +bottom_SOURCES=bottomc.c bottomf.f ## typeaints.h will be distributed because it's listed in AC_CONFIG_FILES/AC_OUTPUT diff --git a/test/mpi/f77/datatype/bottomc.c b/test/mpi/f77/datatype/bottomc.c new file mode 100644 index 0000000..d94bd24 --- /dev/null +++ b/test/mpi/f77/datatype/bottomc.c @@ -0,0 +1,70 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <assert.h> +#include "mpi.h" +#include "../../include/mpitestconf.h" + +/* + Name mapping. All routines are created with names that are lower case + with a single trailing underscore. This matches many compilers. + We use #define to change the name for Fortran compilers that do + not use the lowercase/underscore pattern +*/ + +#ifdef F77_NAME_UPPER +#define c_routine_ C_ROUTINE + +#elif defined(F77_NAME_LOWER) || defined(F77_NAME_MIXED) +/* Mixed is ok because we use lowercase in all uses */ +#define c_routine_ c_routine + +#elif defined(F77_NAME_LOWER_2USCORE) || defined(F77_NAME_LOWER_USCORE) || \ + defined(F77_NAME_MIXED_USCORE) +/* Else leave name alone (routines have no underscore, so both + of these map to a lowercase, single underscore) */ +#else +#error 'Unrecognized Fortran name mapping' +#endif + +void c_routine_(MPI_Fint *ftype, int *errs) +{ + int count = 5; + int lens[2] = {1,1}; + int buf[6]; + int i, rank; + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + MPI_Aint displs[2]; + MPI_Datatype types[2], newtype; + /* create an absolute datatype for buffer that consists */ + /* of count, followed by R(5) */ + MPI_Get_address(&count, &displs[0]); + displs[1] = 0; + types[0] = MPI_INT; + types[1] = MPI_Type_f2c(*ftype); + MPI_Type_create_struct(2, lens, displs, types, &newtype); + MPI_Type_commit(&newtype); + + if (rank == 0) { + /* the message sent contains an int count of 5, followed + by the 5 MPI_INTEGER entries of the Fortran array R. + Here we assume MPI_INTEGER has the same size as MPI_INT + */ + assert(sizeof(MPI_Fint) == sizeof(int)); + MPI_Send(MPI_BOTTOM, 1, newtype, 1, 0, MPI_COMM_WORLD); + } else { + MPI_Recv(buf, 6, MPI_INT, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE); + + if (buf[0] != 5) *errs++; + for (i=1; i < 6; i++) if (buf[i] != i) *errs++; + } + + MPI_Type_free(&newtype); +} diff --git a/test/mpi/f77/datatype/bottomf.f b/test/mpi/f77/datatype/bottomf.f new file mode 100644 index 0000000..8dc4114 --- /dev/null +++ b/test/mpi/f77/datatype/bottomf.f @@ -0,0 +1,35 @@ +C -*- Mode: Fortran; -*- +C +C (C) 2015 by Argonne National Laboratory. +C See COPYRIGHT in top-level directory. +C +C +C This test tests absolute datatypes and MPI_BOTTOM in mixed +C Fortran and C code. MPI requires MPI_Get_address return +C the same value in all languages. +C See discussion on p.652 of MPI-3.0 + + program main + implicit none + include 'mpif.h' + integer :: R(5) + integer :: type, ierr, aoblen(1), aotype(1) + integer (kind=mpi_address_kind) :: aodisp(1) + integer errs + + errs = 0 + R = (/1, 2, 3, 4, 5/) + + call mtest_init(ierr) + + ! create an absolute datatype for array r + aoblen(1) = 5 + call MPI_Get_address(R, aodisp(1), ierr) + aotype(1) = MPI_INTEGER + call MPI_Type_create_struct(1,aoblen,aodisp,aotype, type, ierr) + call c_routine(type, errs) + + call MPI_Type_free(type, ierr); + call mtest_finalize(errs) + call MPI_Finalize(ierr) + end diff --git a/test/mpi/f77/datatype/testlist b/test/mpi/f77/datatype/testlist index 15b67c7..72fdc57 100644 --- a/test/mpi/f77/datatype/testlist +++ b/test/mpi/f77/datatype/testlist @@ -9,3 +9,4 @@ gaddressf 1 allctypesf 1 hindex1f 1 hindexed_blockf 1 mpiversion=3.0 +bottom 2 http://git.mpich.org/mpich.git/commitdiff/0970b5849e2900595330ccac81956748d… commit 0970b5849e2900595330ccac81956748d41753e4 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Thu May 21 15:30:38 2015 -0500 Adjust MPI_BOTTOM to zero in F77/90 bindings Change the bindings to make it as if MPI_BOTTOM in Fortran is at address zero as it in C. See discussion on p.652 of MPI-3.0 Fixes #1877 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface index ba75a71..9f60cf2 100755 --- a/src/binding/fortran/mpif_h/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -4234,11 +4234,7 @@ sub build_specials { *ierr = MPI_Address( v1, &a );\n"; &specialInitStatement( $OUTFD ); print $OUTFD "\ -#ifdef USE_POINTER_FOR_BOTTOM b = a; -#else - b = a - (MPIR_Pint) MPIR_F_MPI_BOTTOM; -#endif *v2 = (MPI_Fint)( b ); #ifdef HAVE_AINT_LARGER_THAN_FINT /* Check for truncation */ @@ -4273,9 +4269,6 @@ sub build_specials { *ierr = MPI_Get_address( v1, &a );\n"; &specialInitStatement( $OUTFD ); print $OUTFD "\ -#ifndef USE_POINTER_FOR_BOTTOM - a = a - (MPIR_Pint) MPIR_F_MPI_BOTTOM; -#endif *v2 = a; }\n"; close ($OUTFD); @@ -4782,6 +4775,31 @@ sub print_mpif_int { print MPIFFD " PARAMETER ($key=$value)\n"; } +# Change the non-zero addressed F77/90 MPI_BOTTOM to C's MPI_BOTTOM, which +# in MPICH is (void*)0. Note that MPI_BOTTOM can only appear at choice +# buffer positions. For simplicity, we treat all void * parameters as +# possible choice buffers. It is a little bit overkilling, but never +# hurts, since if in the user's Fortran source code MPI_BOTTOM is passed +# to a non-choice buffer parameter, either the program is already wrong, +# or the parameter is non-significant. +# +# To make this adjustment work, MPI_Get_Address, MPI_Address should return +# address as if MPI_BOTTOM was at address zero. +# +# See discussion of the MPI_BOTTOM problem on p.652 of MPI-3.0 + +sub adjust_mpi_bottom { + my $OUTFD = $_[0]; + my @params = split(/\s*,\s*/, $_[1]); + my $count = 1; + foreach my $param (@params) { + if ($param =~ /void.*\*/) { + printf $OUTFD " if (v$count == MPIR_F_MPI_BOTTOM) v$count = MPI_BOTTOM;\n"; + } + $count++; + } +} + sub ReadAndProcessInterface { my $prototype_file = $_[0]; my $protectMPIO = $_[1]; # Wrap MPI-IO routines in ifdefs MPI_MODE_RDONLY @@ -4930,6 +4948,7 @@ sub ReadAndProcessInterface { &printCallForFint( $routine_prefix, $routine_name, $args ); } &print_special_decls( $routine_name ); + &adjust_mpi_bottom($OUTFD, $args); if (defined($ChangeCall{$routine_name})) { my ($newName,$extraArgs) = split(/:/,$ChangeCall{$routine_name} ); ----------------------------------------------------------------------- Summary of changes: src/binding/fortran/mpif_h/buildiface | 33 ++++++++++++--- test/mpi/.gitignore | 3 + test/mpi/f77/datatype/Makefile.am | 4 +- test/mpi/f77/datatype/bottomc.c | 70 +++++++++++++++++++++++++++++++++ test/mpi/f77/datatype/bottomf.f | 35 ++++++++++++++++ test/mpi/f77/datatype/testlist | 1 + 6 files changed, 138 insertions(+), 8 deletions(-) create mode 100644 test/mpi/f77/datatype/bottomc.c create mode 100644 test/mpi/f77/datatype/bottomf.f hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-42-gb6b638a
by noreply＠mpich.org 22 May '15

22 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 b6b638afede62b245d307d7dfa7dab67364ee8f7 (commit) via 465684106f7545d7cd3bf068c021dc218bc0bb2b (commit) from f08d09bc32bde098cdf1a8ac32a2e876e466ebe0 (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/b6b638afede62b245d307d7dfa7dab673… commit b6b638afede62b245d307d7dfa7dab67364ee8f7 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu May 21 13:41:15 2015 -0500 Fixed the test threads/spawn/th_taskmaster According to the standard, collectives using the same communicator must implement thread safety in the application level. So, if using MPI_Comm_spawn in THREAD_MULTIPLE safety level, it must use different communicators. I've modified the test to use different communicators per thread so that we can still test its thread safety. Fixes #2256 diff --git a/test/mpi/threads/spawn/th_taskmaster.c b/test/mpi/threads/spawn/th_taskmaster.c index a8f6536..3bb3f58 100644 --- a/test/mpi/threads/spawn/th_taskmaster.c +++ b/test/mpi/threads/spawn/th_taskmaster.c @@ -14,6 +14,9 @@ int comm_world_rank; int comm_world_size; +#ifdef USE_THREADS +MPI_Comm th_comms[DEFAULT_TASK_WINDOW]; +#endif #define CHECK_SUCCESS(status) \ { \ @@ -28,7 +31,7 @@ void process_spawn(MPI_Comm * comm, int thread_id) { CHECK_SUCCESS(MPI_Comm_spawn((char*)"./th_taskmaster", (char **)NULL, 1, MPI_INFO_NULL, 0, - MPI_COMM_WORLD, comm, NULL)); + th_comms[thread_id], comm, NULL)); } void process_disconnect(MPI_Comm * comm, int thread_id); @@ -101,6 +104,10 @@ int main(int argc, char *argv[]) #endif /* USE_THREADS */ #ifdef USE_THREADS + /* We need different communicators per thread */ + for (i = 0; i < DEFAULT_TASK_WINDOW; i++) + CHECK_SUCCESS(MPI_Comm_dup(MPI_COMM_WORLD, &th_comms[i])); + /* Create a thread for each task. Each thread will spawn a * child process to perform its task. */ for (i = 0; i < tasks;) { @@ -110,6 +117,9 @@ int main(int argc, char *argv[]) MTest_Join_threads(); i += DEFAULT_TASK_WINDOW; } + + for (i = 0; i < DEFAULT_TASK_WINDOW; i++) + CHECK_SUCCESS(MPI_Comm_free(&th_comms[i])); #else /* Directly spawn a child process to perform each task */ for (i = 0; i < tasks;) { http://git.mpich.org/mpich.git/commitdiff/465684106f7545d7cd3bf068c021dc218… commit 465684106f7545d7cd3bf068c021dc218bc0bb2b Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu May 21 16:34:36 2015 -0500 Destroy the handle mutex on finalize It was created but never destroyed. diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index aaf20c8..6be0c7b 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -250,6 +250,8 @@ int MPIR_Thread_CS_Finalize( void ) /* There is a single, global lock, held for the duration of an MPI call */ MPID_Thread_mutex_destroy(&MPIR_ThreadInfo.global_mutex, &err); MPIU_Assert(err == 0); + MPID_Thread_mutex_destroy(&MPIR_ThreadInfo.handle_mutex, &err); + MPIU_Assert(err == 0); #elif MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT /* MPIU_THREAD_GRANULARITY_PER_OBJECT: There are multiple locks, ----------------------------------------------------------------------- Summary of changes: src/mpi/init/initthread.c | 2 ++ test/mpi/threads/spawn/th_taskmaster.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-40-gf08d09b
by noreply＠mpich.org 20 May '15

20 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 f08d09bc32bde098cdf1a8ac32a2e876e466ebe0 (commit) via 0ac04e9d15fac513b702800900c01ae7b3e0f91c (commit) via 6cf18737a44bea2affe6ef834314343cf2adc4fe (commit) from b56f5da846530b7f48da5db76c78963b99d004f0 (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/f08d09bc32bde098cdf1a8ac32a2e876e… commit f08d09bc32bde098cdf1a8ac32a2e876e466ebe0 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon May 18 15:01:43 2015 -0500 netmod/portals4: pkt enum typo Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 8f39d73..b8c633f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -220,7 +220,7 @@ int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *p typedef enum MPIDI_nem_ptl_pkt_type { MPIDI_NEM_PTL_PKT_CANCEL_SEND_REQ, MPIDI_NEM_PTL_PKT_CANCEL_SEND_RESP, - MPIDI_NEM_TCP_PKT_INVALID = -1 /* force signed, to avoid warnings */ + MPIDI_NEM_PTL_PKT_INVALID = -1 /* force signed, to avoid warnings */ } MPIDI_nem_ptl_pkt_type_t; typedef struct MPIDI_nem_ptl_pkt_cancel_send_req http://git.mpich.org/mpich.git/commitdiff/0ac04e9d15fac513b702800900c01ae7b… commit 0ac04e9d15fac513b702800900c01ae7b3e0f91c Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon May 18 14:12:39 2015 -0500 netmod/portals4: minor request ref helper fixup Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index f732751..76bb7ea 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -702,7 +702,7 @@ int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPID_IOV s_ rreq->dev.match.parts.rank); MPIDI_CH3U_Request_increment_cc(rreq, &was_incomplete); MPIU_Assert(was_incomplete == 0); - MPIU_Object_add_ref(rreq); + MPIR_Request_add_ref(rreq); MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); http://git.mpich.org/mpich.git/commitdiff/6cf18737a44bea2affe6ef834314343cf… commit 6cf18737a44bea2affe6ef834314343cf2adc4fe Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon May 18 11:12:34 2015 -0500 netmod/portals4: cleanup pt2pt request tracking Simplifies request completion logic and ensures operations are properly accounted for in the cancel send case. Removes pt2pt send tracking in the VC, as requests are enough to guarantee completion. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index 3de3b1f..be03923 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -389,6 +389,7 @@ int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *p for (i = 0; i < REQ_PTL(sreq)->num_gets; i++) { ret = PtlMEUnlink(REQ_PTL(sreq)->get_me_p[i]); MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeunlink", "**ptlmeunlink %s", MPID_nem_ptl_strerror(ret)); + MPIDI_CH3U_Request_complete(sreq); } MPIU_DBG_MSG(CH3_OTHER,TYPICAL,"message cancelled"); } else { diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index 32c4275..5d71929 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -67,7 +67,7 @@ static int handler_send(const ptl_event_t *e) MPIDI_VC_t *vc = sreq->ch.vc; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); - int i, ret, incomplete; + int i, ret; MPIDI_STATE_DECL(MPID_STATE_HANDLER_SEND); @@ -75,7 +75,7 @@ static int handler_send(const ptl_event_t *e) MPIU_Assert(e->type == PTL_EVENT_SEND || e->type == PTL_EVENT_GET); - /* if we are done, release all resources and complete the request */ + /* if we are done, release all netmod resources */ if (MPID_cc_get(sreq->cc) == 1) { if (REQ_PTL(sreq)->md != PTL_INVALID_HANDLE) { ret = PtlMDRelease(REQ_PTL(sreq)->md); @@ -88,15 +88,8 @@ static int handler_send(const ptl_event_t *e) if (REQ_PTL(sreq)->get_me_p) MPIU_Free(REQ_PTL(sreq)->get_me_p); - - MPIDI_CH3U_Request_complete(sreq); - vc_ptl->num_queued_sends--; - - if (vc->state == MPIDI_VC_STATE_CLOSED && vc_ptl->num_queued_sends == 0) - MPID_nem_ptl_vc_terminated(vc); - } else { - MPIDI_CH3U_Request_decrement_cc(sreq, &incomplete); } + MPIDI_CH3U_Request_complete(sreq); fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_HANDLER_SEND); @@ -135,7 +128,6 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * sreq->dev.match.parts.tag = tag; sreq->dev.match.parts.context_id = comm->context_id + context_offset; sreq->ch.vc = vc; - vc_ptl->num_queued_sends++; if (!vc_ptl->id_initialized) { mpi_errno = MPID_nem_ptl_init_id(vc); ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_impl.h | 2 +- .../channels/nemesis/netmod/portals4/ptl_probe.c | 1 + .../channels/nemesis/netmod/portals4/ptl_recv.c | 2 +- .../channels/nemesis/netmod/portals4/ptl_send.c | 14 +++----------- 4 files changed, 6 insertions(+), 13 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b2-37-gb56f5da
by noreply＠mpich.org 19 May '15

19 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 b56f5da846530b7f48da5db76c78963b99d004f0 (commit) via cd79f45ff521812e9f582debd52394cec66b667a (commit) from 13b72b4d12c61b201a8349c18638e3481668cd7f (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/b56f5da846530b7f48da5db76c78963b9… commit b56f5da846530b7f48da5db76c78963b99d004f0 Author: Sangmin Seo <sseo(a)anl.gov> Date: Tue May 19 00:08:50 2015 -0500 ROMIO: fix stack fault in NBC I/O This is currently a workaround to avoid weird errors, e.g., stack fault, occurred in the NBC I/O implementation on Linux. When the host OS is Linux and aio-lite is not used, a blocking ADIO function is used in the NBC I/O implementation. Fixes #2201 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/ad_iread_coll.c b/src/mpi/romio/adio/common/ad_iread_coll.c index b1311e6..76eebef 100644 --- a/src/mpi/romio/adio/common/ad_iread_coll.c +++ b/src/mpi/romio/adio/common/ad_iread_coll.c @@ -357,6 +357,27 @@ static void ADIOI_GEN_IreadStridedColl_indio(ADIOI_NBC_Request *nbc_req, fd->fp_ind = vars->orig_fp; ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig); +#if defined(ROMIO_RUN_ON_LINUX) && !defined(HAVE_AIO_LITE_H) + /* NOTE: This is currently a workaround to avoid weird errors, e.g., + * stack fault, occurred on Linux. When the host OS is Linux and + * aio-lite is not used, a blocking ADIO function is used here. + * See https://trac.mpich.org/projects/mpich/ticket/2201. */ + MPI_Status status; + if (vars->buftype_is_contig && filetype_is_contig) { + if (file_ptr_type == ADIO_EXPLICIT_OFFSET) { + off = fd->disp + (fd->etype_size) * offset; + ADIO_ReadContig(fd, buf, count, datatype, ADIO_EXPLICIT_OFFSET, + off, &status, error_code); + } + else ADIO_ReadContig(fd, buf, count, datatype, ADIO_INDIVIDUAL, + 0, &status, error_code); + } + else { + ADIO_ReadStrided(fd, buf, count, datatype, file_ptr_type, + offset, &status, error_code); + } + ADIOI_GEN_IreadStridedColl_fini(nbc_req, error_code); +#else if (vars->buftype_is_contig && filetype_is_contig) { if (file_ptr_type == ADIO_EXPLICIT_OFFSET) { off = fd->disp + (fd->etype_size) * offset; @@ -372,6 +393,7 @@ static void ADIOI_GEN_IreadStridedColl_indio(ADIOI_NBC_Request *nbc_req, } nbc_req->data.rd.state = ADIOI_IRC_STATE_GEN_IREADSTRIDEDCOLL_INDIO; +#endif return; } @@ -834,12 +856,19 @@ static void ADIOI_Iread_and_exch_l1_begin(ADIOI_NBC_Request *nbc_req, if (flag) { ADIOI_Assert(size == (int)size); +#if defined(ROMIO_RUN_ON_LINUX) && !defined(HAVE_AIO_LITE_H) + MPI_Status status; + ADIO_ReadContig(fd, read_buf+vars->for_curr_iter, (int)size, + MPI_BYTE, ADIO_EXPLICIT_OFFSET, vars->off, + &status, error_code); +#else ADIO_IreadContig(fd, read_buf+vars->for_curr_iter, (int)size, MPI_BYTE, ADIO_EXPLICIT_OFFSET, vars->off, &vars->req2, error_code); nbc_req->data.rd.state = ADIOI_IRC_STATE_IREAD_AND_EXCH_L1_BEGIN; return; +#endif } ADIOI_R_Iexchange_data(nbc_req, error_code); diff --git a/src/mpi/romio/adio/common/ad_iwrite_coll.c b/src/mpi/romio/adio/common/ad_iwrite_coll.c index b456ec4..7832ab4 100644 --- a/src/mpi/romio/adio/common/ad_iwrite_coll.c +++ b/src/mpi/romio/adio/common/ad_iwrite_coll.c @@ -375,6 +375,28 @@ static void ADIOI_GEN_IwriteStridedColl_indio(ADIOI_NBC_Request *nbc_req, fd->fp_ind = vars->orig_fp; ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig); +#if defined(ROMIO_RUN_ON_LINUX) && !defined(HAVE_AIO_LITE_H) + /* NOTE: This is currently a workaround to avoid weird errors, e.g., + * stack fault, occurred on Linux. When the host OS is Linux and + * aio-lite is not used, a blocking ADIO function is used here. + * See https://trac.mpich.org/projects/mpich/ticket/2201. */ + MPI_Status status; + if (vars->buftype_is_contig && filetype_is_contig) { + if (file_ptr_type == ADIO_EXPLICIT_OFFSET) { + off = fd->disp + (ADIO_Offset)(fd->etype_size) * offset; + ADIO_WriteContig(fd, buf, count, datatype, + ADIO_EXPLICIT_OFFSET, + off, &status, error_code); + } + else ADIO_WriteContig(fd, buf, count, datatype, ADIO_INDIVIDUAL, + 0, &status, error_code); + } + else { + ADIO_WriteStrided(fd, buf, count, datatype, file_ptr_type, + offset, &status, error_code); + } + ADIOI_GEN_IwriteStridedColl_fini(nbc_req, error_code); +#else if (vars->buftype_is_contig && filetype_is_contig) { if (file_ptr_type == ADIO_EXPLICIT_OFFSET) { off = fd->disp + (ADIO_Offset)(fd->etype_size) * offset; @@ -391,6 +413,7 @@ static void ADIOI_GEN_IwriteStridedColl_indio(ADIOI_NBC_Request *nbc_req, } nbc_req->data.wr.state = ADIOI_IWC_STATE_GEN_IWRITESTRIDEDCOLL_INDIO; +#endif return; } @@ -893,12 +916,19 @@ static void ADIOI_Iexch_and_write_l1_body(ADIOI_NBC_Request *nbc_req, if (flag) { ADIOI_Assert(size == (int)size); +#if defined(ROMIO_RUN_ON_LINUX) && !defined(HAVE_AIO_LITE_H) + MPI_Status status; + ADIO_WriteContig(fd, write_buf, (int)size, MPI_BYTE, + ADIO_EXPLICIT_OFFSET, vars->off, &status, + error_code); +#else ADIO_IwriteContig(fd, write_buf, (int)size, MPI_BYTE, ADIO_EXPLICIT_OFFSET, vars->off, &vars->req3, error_code); nbc_req->data.wr.state = ADIOI_IWC_STATE_IEXCH_AND_WRITE_L1_BODY; return; +#endif } ADIOI_Iexch_and_write_l1_end(nbc_req, error_code); http://git.mpich.org/mpich.git/commitdiff/cd79f45ff521812e9f582debd52394cec… commit cd79f45ff521812e9f582debd52394cec66b667a Author: Sangmin Seo <sseo(a)anl.gov> Date: Mon May 18 23:58:35 2015 -0500 ROMIO: check if the host OS is Linux configure defines ROMIO_RUN_ON_LINUX as 1 when the host OS is Linux. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 857ddec..5753856 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1155,6 +1155,17 @@ AS_IF([test "x$with_aiolite" == xyes], ) # End of aio-related tests +# Linux aio library seems to have problems when they are used in our NBC I/O +# implementation. We let the code know when the host OS is Linux so that the +# NBC I/O implementation uses blocking I/O operations. +# See http://trac.mpich.org/projects/mpich/ticket/2201. + +# compute canonical system types +AC_CANONICAL_HOST +AS_CASE([$host_os], + [linux*], AC_DEFINE(ROMIO_RUN_ON_LINUX,1,[Define if run on Linux])) +# End of OS check + # # Check for statfs (many) and specifically f_fstypename field (BSD) # ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/ad_iread_coll.c | 29 +++++++++++++++++++++++++++ src/mpi/romio/adio/common/ad_iwrite_coll.c | 30 ++++++++++++++++++++++++++++ src/mpi/romio/configure.ac | 11 ++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0