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

[mpich] MPICH primary repository branch, master, updated. v3.0.4-338-g828b0b4
by noreply＠mpich.org 16 Jul '13

16 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 828b0b4d46f0a499560123f2f3797b197c07abea (commit) from 7d44307f269cae96118beb19760221aff99bd74a (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/828b0b4d46f0a499560123f2f3797b197… commit 828b0b4d46f0a499560123f2f3797b197c07abea Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Tue Jul 16 12:25:43 2013 -0500 Correct bad parameter names. We were using MPIR_PARAM_NEMESIS_ENABLE_CKPOINT in some cases and MPIR_PARAM_ENABLE_CKPOINT in some cases. This patch makes the names consistent. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index 19810fe..4535325 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -310,7 +310,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) } #ifdef ENABLE_CHECKPOINTING - if (MPIR_PARAM_ENABLE_CKPOINT) { + if (MPIR_PARAM_NEMESIS_ENABLE_CKPOINT) { if (MPIDI_nem_ckpt_start_checkpoint) { MPIDI_nem_ckpt_start_checkpoint = FALSE; mpi_errno = MPIDI_nem_ckpt_start(); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c index e45eb20..1f74e85 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c @@ -146,7 +146,7 @@ int MPIDI_nem_ckpt_init(void) MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_NEM_CKPT_INIT); - if (!MPIR_PARAM_ENABLE_CKPOINT) + if (!MPIR_PARAM_NEMESIS_ENABLE_CKPOINT) goto fn_exit; client_id = cr_init(); diff --git a/src/pm/hydra/ui/mpich/utils.c b/src/pm/hydra/ui/mpich/utils.c index f012374..2a10515 100644 --- a/src/pm/hydra/ui/mpich/utils.c +++ b/src/pm/hydra/ui/mpich/utils.c @@ -1742,7 +1742,7 @@ HYD_status HYD_uii_mpx_get_parameters(char **t_argv) /* If the user set the checkpoint prefix, set env var to enable * checkpointing on the processes */ if (HYD_server_info.user_global.ckpoint_prefix) - HYDU_append_env_to_list("MPIR_PARAM_ENABLE_CKPOINT", "1", + HYDU_append_env_to_list("MPIR_PARAM_NEMESIS_ENABLE_CKPOINT", "1", &HYD_server_info.user_global.global_env.system); /* Preset common environment options for disabling STDIO buffering ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c | 2 +- src/pm/hydra/ui/mpich/utils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-337-g7d44307
by noreply＠mpich.org 16 Jul '13

16 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 7d44307f269cae96118beb19760221aff99bd74a (commit) from 2de997d9b3e94bad01d5f46d76f163d71e2bd7bd (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/7d44307f269cae96118beb19760221aff… commit 7d44307f269cae96118beb19760221aff99bd74a Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Jun 27 10:25:37 2013 -0500 partial fix for tt 1742 It would appear that we can get more than two gigs worth of data down to the write(2) and read(2) system call, but those syscalls fail to process all of it. Perfectly valid behavior for unix to return less than requested, but until now, ROMIO never dealt with it. Still to do: update Blue Gene drivers closes ticket #1742 , since that ticket is only asking about I/O to less than two gigs. Lots and Lots more work needed for larger than two gigs. diff --git a/src/mpi/romio/adio/common/ad_read.c b/src/mpi/romio/adio/common/ad_read.c index 3cea7ed..1961b16 100644 --- a/src/mpi/romio/adio/common/ad_read.c +++ b/src/mpi/romio/adio/common/ad_read.c @@ -22,15 +22,16 @@ void ADIOI_GEN_ReadContig(ADIO_File fd, void *buf, int count, off_t err_lseek = -1; ssize_t err = -1; int datatype_size; - ADIO_Offset len; + ADIO_Offset len, bytes_xfered=0; + size_t rd_count; static char myname[] = "ADIOI_GEN_READCONTIG"; + char *p; #ifdef AGGREGATION_PROFILE MPE_Log_event (5034, 0, NULL); #endif MPI_Type_size(datatype, &datatype_size); len = (ADIO_Offset)datatype_size * (ADIO_Offset)count; - ADIOI_Assert(len == (unsigned int) len); /* read takes an unsigned int parm */ if (file_ptr_type == ADIO_INDIVIDUAL) { offset = fd->fp_ind; @@ -57,33 +58,46 @@ void ADIOI_GEN_ReadContig(ADIO_File fd, void *buf, int count, /* --END ERROR HANDLING-- */ } + p=buf; + while (bytes_xfered < len) { #ifdef ADIOI_MPE_LOGGING - MPE_Log_event( ADIOI_MPE_read_a, 0, NULL ); + MPE_Log_event( ADIOI_MPE_read_a, 0, NULL ); #endif - err = read(fd->fd_sys, buf, (unsigned int)len); + rd_count = len - bytes_xfered; + err = read(fd->fd_sys, p, rd_count); + /* --BEGIN ERROR HANDLING-- */ + if (err == -1) { + *error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, + myname, __LINE__, + MPI_ERR_IO, "**io", + "**io %s", strerror(errno)); + fd->fp_sys_posn = -1; + return; + } + /* --END ERROR HANDLING-- */ + if (err == 0) { + /* end of file */ + break; + } + #ifdef ADIOI_MPE_LOGGING - MPE_Log_event( ADIOI_MPE_read_b, 0, NULL ); + MPE_Log_event( ADIOI_MPE_read_b, 0, NULL ); #endif - /* --BEGIN ERROR HANDLING-- */ - if (err == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, - MPIR_ERR_RECOVERABLE, - myname, __LINE__, - MPI_ERR_IO, "**io", - "**io %s", strerror(errno)); - fd->fp_sys_posn = -1; - return; + bytes_xfered += err; + p += err; } - /* --END ERROR HANDLING-- */ - fd->fp_sys_posn = offset + err; + fd->fp_sys_posn = offset + bytes_xfered; if (file_ptr_type == ADIO_INDIVIDUAL) { - fd->fp_ind += err; + fd->fp_ind += bytes_xfered; } #ifdef HAVE_STATUS_SET_BYTES - if (err != -1) MPIR_Status_set_bytes(status, datatype, err); + /* what if we only read half a datatype? */ + /* bytes_xfered could be larger than int */ + if (err != -1) MPIR_Status_set_bytes(status, datatype, bytes_xfered); #endif *error_code = MPI_SUCCESS; diff --git a/src/mpi/romio/adio/common/ad_write.c b/src/mpi/romio/adio/common/ad_write.c index eeba5da..6f01aff 100644 --- a/src/mpi/romio/adio/common/ad_write.c +++ b/src/mpi/romio/adio/common/ad_write.c @@ -22,8 +22,10 @@ void ADIOI_GEN_WriteContig(ADIO_File fd, const void *buf, int count, off_t err_lseek = -1; ssize_t err = -1; int datatype_size; - ADIO_Offset len; + ADIO_Offset len, bytes_xfered=0; + size_t wr_count; static char myname[] = "ADIOI_GEN_WRITECONTIG"; + char * p; #ifdef AGGREGATION_PROFILE MPE_Log_event (5036, 0, NULL); @@ -31,7 +33,6 @@ void ADIOI_GEN_WriteContig(ADIO_File fd, const void *buf, int count, MPI_Type_size(datatype, &datatype_size); len = (ADIO_Offset)datatype_size * (ADIO_Offset)count; - ADIOI_Assert(len == (unsigned int) len); /* read takes an unsigned int parm */ if (file_ptr_type == ADIO_INDIVIDUAL) { offset = fd->fp_ind; @@ -58,33 +59,40 @@ void ADIOI_GEN_WriteContig(ADIO_File fd, const void *buf, int count, /* --END ERROR HANDLING-- */ } + p = (char *)buf; + while (bytes_xfered < len) { #ifdef ADIOI_MPE_LOGGING - MPE_Log_event( ADIOI_MPE_write_a, 0, NULL ); + MPE_Log_event( ADIOI_MPE_write_a, 0, NULL ); #endif - err = write(fd->fd_sys, buf, (unsigned int)len); + wr_count = len - bytes_xfered; + err = write(fd->fd_sys, p, wr_count); + /* --BEGIN ERROR HANDLING-- */ + if (err == -1) { + *error_code = MPIO_Err_create_code(MPI_SUCCESS, + MPIR_ERR_RECOVERABLE, + myname, __LINE__, + MPI_ERR_IO, "**io", + "**io %s", strerror(errno)); + fd->fp_sys_posn = -1; + return; + } + /* --END ERROR HANDLING-- */ #ifdef ADIOI_MPE_LOGGING - MPE_Log_event( ADIOI_MPE_write_b, 0, NULL ); + MPE_Log_event( ADIOI_MPE_write_b, 0, NULL ); #endif - /* --BEGIN ERROR HANDLING-- */ - if (err == -1) { - *error_code = MPIO_Err_create_code(MPI_SUCCESS, - MPIR_ERR_RECOVERABLE, - myname, __LINE__, - MPI_ERR_IO, "**io", - "**io %s", strerror(errno)); - fd->fp_sys_posn = -1; - return; + bytes_xfered += err; + p += err; } - /* --END ERROR HANDLING-- */ - fd->fp_sys_posn = offset + err; + fd->fp_sys_posn = offset + bytes_xfered; if (file_ptr_type == ADIO_INDIVIDUAL) { - fd->fp_ind += err; + fd->fp_ind += bytes_xfered; } #ifdef HAVE_STATUS_SET_BYTES - if (err != -1 && status) MPIR_Status_set_bytes(status, datatype, err); + /* bytes_xfered could be larger than int */ + if (err != -1 && status) MPIR_Status_set_bytes(status, datatype, bytes_xfered); #endif *error_code = MPI_SUCCESS; diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index a1d0a5e..298ab99 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -706,6 +706,10 @@ fi # AC_C_INLINE +AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_OFF_T + # Header files # Find the CPP before the header check AC_PROG_CPP ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/ad_read.c | 50 +++++++++++++++++++++------------ src/mpi/romio/adio/common/ad_write.c | 44 +++++++++++++++++------------ src/mpi/romio/configure.ac | 4 +++ 3 files changed, 62 insertions(+), 36 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-336-g2de997d
by noreply＠mpich.org 15 Jul '13

15 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 2de997d9b3e94bad01d5f46d76f163d71e2bd7bd (commit) from 235c3f27724df2097a5f84d901618b8a6f32b282 (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/2de997d9b3e94bad01d5f46d76f163d71… commit 2de997d9b3e94bad01d5f46d76f163d71e2bd7bd Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jul 13 12:42:57 2013 -0500 Get rid of PAC_CC_PREFIX. This environment is unused, since we never got it to work. The original idea was to push the configuration for all compilers into a single file. This never worked correctly, so it was disabled, but never deleted. We don't fall back to the original config.rpath which defaults to an acl_cv_ prefix since that's very buggy. The variables rely on not having that prefix. diff --git a/confdb/aclocal_shl.m4 b/confdb/aclocal_shl.m4 index 35ff000..f974bfa 100644 --- a/confdb/aclocal_shl.m4 +++ b/confdb/aclocal_shl.m4 @@ -481,19 +481,11 @@ export LDFLAGS export LD export with_gnu_ld -# FIXME these variables refer to each other and prefixing breaks that, so we -# will disable the prefixing for now -## force all variables set in $2 to be prefixed with the compiler name instead of "acl_cv_" -#PAC_CC_PREFIX=$1_ -PAC_CC_PREFIX= -export PAC_CC_PREFIX - AS_IF([$ac_aux_dir/config.rpath "$host" > $2],[:],[AC_MSG_ERROR([unable to execute $ac_aux_dir/config.rpath])]) C_LINKPATH_SHL="" AC_SUBST([C_LINKPATH_SHL]) -AS_UNSET([PAC_CC_PREFIX]) rm -f conftest.out # restore the old values diff --git a/confdb/config.rpath b/confdb/config.rpath index b1ea1f0..70f614e 100755 --- a/confdb/config.rpath +++ b/confdb/config.rpath @@ -1,24 +1,5 @@ #! /bin/sh # -################################################################################ -# MPICH custom modifications: -# -# This is the latest git version of config.rpath from gnulib as of 2011-06-16. -# The only modifications can be found at the bottom of the script where all of -# the output variables have been prefixed with "${PAC_CC_PREFIX}", which the -# caller should set if prefixed variables are desired. That is, if -# "PAC_CC_PREFIX=FC_" then "FC_shlibext=..." will be in the output instead of -# "acl_cv_shlibext=...". -# -# The provenance of this script is a bit unclear. It appears to be code that -# was excised from libtool 1.x and placed into GNU gettext. The gettext project -# was the "official" upstream source of this script for a while, but it appears -# that gnulib is now where the most up-to-date version can be found. -# -# See PAC_COMPILER_SHLIB_FLAGS in confdb/aclocal_shl.m4 for MPICH's use of this -# script. [goodell@ 2011-06-16] -################################################################################ -# # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # @@ -675,14 +656,10 @@ escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_sub escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -# if the caller did not pass a prefix, then use a default that is compatible -# with the unmodified upstream version of this script -: ${PAC_CC_PREFIX=acl_cv_} -LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/'"$PAC_CC_PREFIX"'\1=/' <<EOF - -# MPICH ADDITION -# Shared library suffix, including any period (normally "so"). -shrext="$shrext" +# MPICH modification: we don't prefix with acl_cv_ by default. This +# is causing problems in the stock version of config.rpath as well. +# LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF +LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/\1=/' <<EOF # How to pass a linker flag through the compiler. wl="$escaped_wl" ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_shl.m4 | 8 -------- confdb/config.rpath | 31 ++++--------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-335-g235c3f2
by noreply＠mpich.org 15 Jul '13

15 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 235c3f27724df2097a5f84d901618b8a6f32b282 (commit) from fde78362e6a2d8a1042d06ae7c1f48135a4c3f3a (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/235c3f27724df2097a5f84d901618b8a6… commit 235c3f27724df2097a5f84d901618b8a6f32b282 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu Jul 11 20:19:15 2013 -0500 Fixes ticket #1899. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index 685c3eb..5e4a51c 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -189,7 +189,8 @@ struct HYD_string_stash { #define HYD_STRING_STASH(stash, str, status) \ do { \ if ((stash).cur_count >= (stash).max_count - 1) { \ - HYDU_REALLOC((stash).strlist, char **, (stash).max_count + HYD_NUM_TMP_STRINGS, \ + HYDU_REALLOC((stash).strlist, char **, \ + ((stash).max_count + HYD_NUM_TMP_STRINGS) * sizeof(char *), \ (status)); \ (stash).max_count += HYD_NUM_TMP_STRINGS; \ } \ ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/include/hydra.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-334-gfde7836
by noreply＠mpich.org 09 Jul '13

09 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via fde78362e6a2d8a1042d06ae7c1f48135a4c3f3a (commit) from f47c806f6736a269d02846de77996ff199354394 (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/fde78362e6a2d8a1042d06ae7c1f48135… commit fde78362e6a2d8a1042d06ae7c1f48135a4c3f3a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Tue Jul 9 22:41:25 2013 -0500 Update author list for MPICH guides. diff --git a/doc/installguide/install.tex.vin b/doc/installguide/install.tex.vin index d5dd02b..41bc3ec 100644 --- a/doc/installguide/install.tex.vin +++ b/doc/installguide/install.tex.vin @@ -51,8 +51,6 @@ \author{ Pavan Balaji\\ Wesley Bland\\ -James Dinan\\ -David Goodell\\ William Gropp\\ Rob Latham\\ Antonio Pe$\tilde{n}$a\\ @@ -62,6 +60,8 @@ David Ashton\\ Darius Buntinas\\ Ralph Butler\\ Anthony Chan\\ +James Dinan\\ +David Goodell\\ Jayesh Krishna\\ Ewing Lusk\\ Guillaume Mercier\\ diff --git a/doc/userguide/user.tex.vin b/doc/userguide/user.tex.vin index 336f062..13d9125 100644 --- a/doc/userguide/user.tex.vin +++ b/doc/userguide/user.tex.vin @@ -49,8 +49,6 @@ Argonne National Laboratory} \author{ Pavan Balaji\\ Wesley Bland\\ -James Dinan\\ -David Goodell\\ William Gropp\\ Rob Latham\\ Antonio Pe$\tilde{n}$a\\ @@ -60,6 +58,8 @@ David Ashton\\ Darius Buntinas\\ Ralph Butler\\ Anthony Chan\\ +James Dinan\\ +David Goodell\\ Jayesh Krishna\\ Ewing Lusk\\ Guillaume Mercier\\ ----------------------------------------------------------------------- Summary of changes: doc/installguide/install.tex.vin | 4 ++-- doc/userguide/user.tex.vin | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-333-gf47c806
by noreply＠mpich.org 09 Jul '13

09 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f47c806f6736a269d02846de77996ff199354394 (commit) from 14b4acc7e789de66e68a1224ad11fe1e1b817c34 (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/f47c806f6736a269d02846de77996ff19… commit f47c806f6736a269d02846de77996ff199354394 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Jul 2 18:41:52 2013 +0000 small memory management cleanups missed a free of an unused array in one case, and freed some arrays immediately after calling MPI_Alltoallv in an attempt to chip away at memory footprint. diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c b/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c index 976160c..c9312f3 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c +++ b/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c @@ -1331,6 +1331,7 @@ static void ADIOI_W_Exchange_data_alltoallv( min_st_offset, fd_size, fd_start, fd_end, send_buf_idx, curr_to_proc, done_to_proc, iter, buftype_extent); + ADIOI_Free(send_buf); } /* alltoallv */ @@ -1339,6 +1340,9 @@ static void ADIOI_W_Exchange_data_alltoallv( all_recv_buf, recv_size, rdispls, MPI_BYTE, fd->comm ); + ADIOI_Free( all_send_buf ); + ADIOI_Free(sdispls); + /* data sieving pre-read */ /* To avoid a read-modify-write, check if there are holes in the data to be written. For this, merge the (sorted) offset lists @@ -1416,9 +1420,7 @@ static void ADIOI_W_Exchange_data_alltoallv( } ADIOI_Free( tmp_len ); - ADIOI_Free( all_send_buf ); ADIOI_Free( all_recv_buf ); - ADIOI_Free(sdispls); ADIOI_Free(rdispls); return; } ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-332-g14b4acc
by noreply＠mpich.org 08 Jul '13

08 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 14b4acc7e789de66e68a1224ad11fe1e1b817c34 (commit) from 8448badc4099f6b0ded16e02aeb0ecd60178ffa7 (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/14b4acc7e789de66e68a1224ad11fe1e1… commit 14b4acc7e789de66e68a1224ad11fe1e1b817c34 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Fri Jul 5 20:04:56 2013 -0500 ch3 should be creating UNIFIED windows. diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 8a581e7..48c27e8 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -80,7 +80,7 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info *info, MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPID_WIN_CREATE); - mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_CREATE, MPI_WIN_SEPARATE, comm_ptr, win_ptr); + mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_CREATE, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); (*win_ptr)->base = base; @@ -106,7 +106,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPID_WIN_ALLOCATE); - mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_ALLOCATE, MPI_WIN_SEPARATE, comm_ptr, win_ptr); + mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_ALLOCATE, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } mpi_errno = MPIDI_CH3U_Win_fns.allocate(size, disp_unit, info, comm_ptr, baseptr, win_ptr); @@ -133,7 +133,7 @@ int MPID_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm_ptr, mpi_errno = win_init(0 /* spec defines size to be 0 */, 1 /* spec defines disp_unit to be 1 */, - MPI_WIN_FLAVOR_DYNAMIC, MPI_WIN_SEPARATE, + MPI_WIN_FLAVOR_DYNAMIC, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_rma.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-331-g8448bad
by noreply＠mpich.org 08 Jul '13

08 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8448badc4099f6b0ded16e02aeb0ecd60178ffa7 (commit) from 8390fb6abce79734c20db035b4c23f4a0487fa14 (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/8448badc4099f6b0ded16e02aeb0ecd60… commit 8448badc4099f6b0ded16e02aeb0ecd60178ffa7 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon Jul 8 18:46:16 2013 -0500 Remove unused mpicc.conf.in and friends. diff --git a/configure.ac b/configure.ac index 4910610..fe8194e 100644 --- a/configure.ac +++ b/configure.ac @@ -712,7 +712,7 @@ PAC_ARG_STRICT # ----------------------------------------------------------------------------- # First check that we have a clean build if we are doing a VPATH build -PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc src/env/mpicc.conf,lib) +PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc,lib) # ---------------------------------------------------------------------------- # This test is complicated by the fact that top_srcdir is not set until @@ -6196,16 +6196,12 @@ AC_OUTPUT(Makefile \ src/packaging/envmods/mpich.module \ src/env/mpixxx_opts.conf \ src/env/mpicc.sh \ - src/env/mpicc.conf \ src/env/mpicc.bash \ src/env/mpicxx.sh \ - src/env/mpicxx.conf \ src/env/mpicxx.bash \ src/env/mpif77.sh \ - src/env/mpif77.conf \ src/env/mpif77.bash \ src/env/mpif90.sh \ - src/env/mpif90.conf \ src/env/mpif90.bash \ src/env/parkill \ src/util/dbg/getfuncstack \ diff --git a/src/env/Makefile.mk b/src/env/Makefile.mk index 113d917..9d398b0 100644 --- a/src/env/Makefile.mk +++ b/src/env/Makefile.mk @@ -19,29 +19,20 @@ endif BUILD_PROFILING_LIB src_env_mpichversion_LDFLAGS = $(mpich_libtool_static_flag) -sysconf_DATA += src/env/mpicc.conf - if BUILD_F77_BINDING bin_SCRIPTS += src/env/mpif77 -sysconf_DATA += src/env/mpif77.conf endif BUILD_F77_BINDING if BUILD_F90_LIB bin_SCRIPTS += src/env/mpif90 -sysconf_DATA += src/env/mpif90.conf endif BUILD_F90_LIB if BUILD_CXX_LIB bin_SCRIPTS += src/env/mpicxx -sysconf_DATA += src/env/mpicxx.conf endif BUILD_CXX_LIB # create a local copy of the compiler wrapper that will actually be installed if BUILD_BASH_SCRIPTS -src/env/mpicc.bash: $(top_builddir)/src/env/mpicc.conf -src/env/mpicxx.bash: $(top_builddir)/src/env/mpicxx.conf -src/env/mpif77.bash: $(top_builddir)/src/env/mpif77.conf -src/env/mpif90.bash: $(top_builddir)/src/env/mpif90.conf src/env/mpicc: $(top_builddir)/src/env/mpicc.bash cp -p $? $@ src/env/mpicxx: $(top_builddir)/src/env/mpicxx.bash @@ -51,10 +42,6 @@ src/env/mpif77: $(top_builddir)/src/env/mpif77.bash src/env/mpif90: $(top_builddir)/src/env/mpif90.bash cp -p $? $@ else !BUILD_BASH_SCRIPTS -src/env/mpicc.sh: $(top_builddir)/src/env/mpicc.conf -src/env/mpicxx.sh: $(top_builddir)/src/env/mpicxx.conf -src/env/mpif77.sh: $(top_builddir)/src/env/mpif77.conf -src/env/mpif90.sh: $(top_builddir)/src/env/mpif90.conf src/env/mpicc: $(top_builddir)/src/env/mpicc.sh cp -p $? $@ src/env/mpicxx: $(top_builddir)/src/env/mpicxx.sh @@ -81,4 +68,3 @@ wrapper_doc_src = src/env/mpicc.txt \ src/env/mpiexec.txt doc1_src_txt += $(wrapper_doc_src) EXTRA_DIST += $(wrapper_doc_src) - diff --git a/src/env/mpicc.conf.in b/src/env/mpicc.conf.in deleted file mode 100644 index e7fe5fd..0000000 --- a/src/env/mpicc.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicc. This is -# essentially just the variable-initialization part of mpicc. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries. -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -CC="@CC@" -CFLAGS="@WRAPPER_CFLAGS@" -CPPFLAGS="@WRAPPER_CPPFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" diff --git a/src/env/mpicxx.conf.in b/src/env/mpicxx.conf.in deleted file mode 100644 index 30c9bc4..0000000 --- a/src/env/mpicxx.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicxx. This is -# essentially just the variable-initialization part of mpicxx. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries. -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -CXX="@CXX@" -CXXFLAGS="@WRAPPER_CXXFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICXXLIBNAME="@MPICXXLIBNAME@" -MPICH_VERSION="@MPICH_VERSION@" diff --git a/src/env/mpif77.conf.in b/src/env/mpif77.conf.in deleted file mode 100644 index 3b83acc..0000000 --- a/src/env/mpif77.conf.in +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpif77. This is -# essentially just the variable-initialization part of mpif77. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -F77="@F77@" -F77CPP="@F77CPP@" -FFLAGS="@WRAPPER_FFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" -# -# ---------------------------------------------------------------------------- -# We also keep track of properties of the compilation system. These -# are read by the top-level configure to initialize the Fortran types -# within the mpi.h file. -# -# MPI Types for the Fortran types -MPI_COMPLEX=@MPI_COMPLEX@ -MPI_DOUBLE_COMPLEX=@MPI_DOUBLE_COMPLEX@ -MPI_LOGICAL=@MPI_LOGICAL@ -MPI_REAL=@MPI_REAL@ -MPI_DOUBLE_PRECISION=@MPI_DOUBLE_PRECISION@ -MPI_INTEGER=@MPI_INTEGER@ -MPI_2INTEGER=@MPI_2INTEGER@ -MPI_2COMPLEX=@MPI_2COMPLEX@ -MPI_2DOUBLE_COMPLEX=@MPI_2DOUBLE_COMPLEX@ -MPI_2REAL=@MPI_2REAL@ -MPI_2DOUBLE_PRECISION=@MPI_2DOUBLE_PRECISION@ -MPI_CHARACTER=@MPI_CHARACTER@ -# C type corresponding to a Fortran INTEGER -MPI_FINT=@MPI_FINT@ -# -# Name mangling -F77_NAME_MANGLE=@F77_NAME_MANGLE@ diff --git a/src/env/mpif90.conf.in b/src/env/mpif90.conf.in deleted file mode 100644 index 800a8ba..0000000 --- a/src/env/mpif90.conf.in +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicc. This is -# essentially just the variable-initialization part of mpif90. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -FC="@FC@" -FCCPP="@FCCPP@" -# Fortran 90 Compiler characteristics -FCINC="@FCINC@" -# f90modinc specifies how to add a directory to the search path for modules. -# Some compilers (Intel ifc version 5) do not support this concept, and -# instead need -# a specific list of files that contain module names and directories. -# The FCMODINCSPEC is a more general approach that uses <dir> and <file> -# for the directory and file respectively. -FCMODINC="@FCMODINCFLAG@" -FCMODINCSPEC="@FCMODINCSPEC@" -FCEXT="@FCEXT@" -FCFLAGS="@WRAPPER_FCFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +----- src/env/Makefile.mk | 14 -------------- src/env/mpicc.conf.in | 24 ------------------------ src/env/mpicxx.conf.in | 24 ------------------------ src/env/mpif77.conf.in | 48 ------------------------------------------------ src/env/mpif90.conf.in | 35 ----------------------------------- 6 files changed, 1 insertions(+), 150 deletions(-) delete mode 100644 src/env/mpicc.conf.in delete mode 100644 src/env/mpicxx.conf.in delete mode 100644 src/env/mpif77.conf.in delete mode 100644 src/env/mpif90.conf.in hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-330-g8390fb6
by noreply＠mpich.org 08 Jul '13

08 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8390fb6abce79734c20db035b4c23f4a0487fa14 (commit) from f77aacb88230a2197fbfd0e50fe4a05ea2013056 (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/8390fb6abce79734c20db035b4c23f4a0… commit 8390fb6abce79734c20db035b4c23f4a0487fa14 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon Jul 8 14:35:17 2013 -0500 Replace "-" with "\-" to keep Debian lintian checks happy. Replace "-" with "\-", so the manpage shows a minus instead of a hyphen. Thanks to Torquil Macdonald Sørensen <torquil(a)gmail.com> for providing the initial patch. Signed-off-by: Torquil Macdonald Sørensen <torquil(a)gmail.com> Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/env/mpicc.txt b/src/env/mpicc.txt index 2bff06c..bd8e517 100644 --- a/src/env/mpicc.txt +++ b/src/env/mpicc.txt @@ -10,28 +10,28 @@ as it provides the necessary libraries. Command line arguments: -+ -show - Show the commands that would be used without ++ \-show - Show the commands that would be used without running them -. -help - Give short help -. -cc=name - Use compiler 'name' instead of the default choice. Use +. \-help - Give short help +. \-cc=name - Use compiler 'name' instead of the default choice. Use this only if the compiler is compatible with the MPICH library (see below) -. -config=name - Load a configuration file for a particular compiler. +. \-config=name - Load a configuration file for a particular compiler. This allows a single 'mpicc' command to be used with multiple compilers. -. -compile_info - Show the steps for compiling a program. This option +. \-compile_info - Show the steps for compiling a program. This option can be used to see what options and include paths are used by mpicc. -. -link_info - Show the steps for linking a program. This optoin +. \-link_info - Show the steps for linking a program. This option can be used to see what options and libraries are used by mpicc. -. -profile=name - Use the MPI profiling given by name. See below for +. \-profile=name - Use the MPI profiling given by name. See below for details -. -echo - Show exactly what this program is doing. +. \-echo - Show exactly what this program is doing. This option should normally not be used. -- others - are passed to the compiler or linker. For example, '-c' - causes files to be compiled, '-g' selects compilation with - debugging on most systems, and '-o name' causes linking +- others - are passed to the compiler or linker. For example, '\-c' + causes files to be compiled, '\-g' selects compilation with + debugging on most systems, and '\-o name' causes linking with the output executable given the name 'name'. Environment Variables: @@ -42,8 +42,8 @@ code compiled with the different compilers. The environment variable 'MPICC_PROFILE' specifies a profile library - and has the same effect as if '-profile=$MPICC_PROFILE' were used as - an argument to 'mpicc'. See the discussion of '-profile' below for more + and has the same effect as if '\-profile=$MPICC_PROFILE' were used as + an argument to 'mpicc'. See the discussion of '\-profile' below for more details. Compatible Compilers: @@ -52,7 +52,7 @@ uses compatible run-time libraries. On many systems, the various compilers are compatible and may be used interchangably. There are exceptions; if you use the 'MPICH_CC' environment variable or the - '-cc=name' command-line argument to override the choice of compiler + '\-cc=name' command-line argument to override the choice of compiler and encounter problems, try reconfiguring MPICH with the new compiler and installing MPICH in a separate location. See the installation manual for more details. @@ -60,21 +60,21 @@ Examples: To compile a single file 'foo.c', use .vb - mpicc -c foo.c + mpicc \-c foo.c .ve To link the output and make an executable, use .vb - mpicc -o foo foo.o + mpicc \-o foo foo.o .ve Combining compilation and linking in a single command .vb - mpicc -o foo foo.c + mpicc \-o foo foo.c .ve is a convenient way to build simple programs. Selecting a Profiling Library: - The '-profile=name' argument allows you to specify an MPI profiling + The '\-profile=name' argument allows you to specify an MPI profiling library to be used. 'name' can have two forms\: .n A library in the same directory as the MPI library @@ -95,12 +95,12 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" - PROFILE_INCPATHS="-I/usr/local/myprof/include" + PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" + PROFILE_INCPATHS="\-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line - argument '-profile=myprof' will cause these + argument '\-profile=myprof' will cause these definitions to be added to the relevant compile commands. .seealso: mpif77, mpicxx, mpif90, mpiexec diff --git a/src/env/mpicxx.txt b/src/env/mpicxx.txt index d3388e0..d920672 100644 --- a/src/env/mpicxx.txt +++ b/src/env/mpicxx.txt @@ -10,28 +10,28 @@ as it provides the necessary libraries. Command line arguments: -+ -show - Show the commands that would be used without ++ \-show - Show the commands that would be used without running them -. -help - Give short help -. -cxx=name - Use compiler 'name' instead of the default choice. Use +. \-help - Give short help +. \-cxx=name - Use compiler 'name' instead of the default choice. Use this only if the compiler is compatible with the MPICH library (see below) -. -config=name - Load a configuration file for a particular compiler. +. \-config=name - Load a configuration file for a particular compiler. This allows a single 'mpicxx' command to be used with multiple compilers. -. -compile_info - Show the steps for compiling a program. This option +. \-compile_info - Show the steps for compiling a program. This option can be used to see what options and include paths are used by mpicxx. -. -link_info - Show the steps for linking a program. This optoin +. \-link_info - Show the steps for linking a program. This option can be used to see what options and libraries are used by mpicxx. -. -profile=name - Use the MPI profiling given by name. See below for +. \-profile=name - Use the MPI profiling given by name. See below for details -. -echo - Show exactly what this program is doing. +. \-echo - Show exactly what this program is doing. This option should normally not be used. -- others - are passed to the compiler or linker. For example, '-c' - causes files to be compiled, '-g' selects compilation with - debugging on most systems, and '-o name' causes linking +- others - are passed to the compiler or linker. For example, '\-c' + causes files to be compiled, '\-g' selects compilation with + debugging on most systems, and '\-o name' causes linking with the output executable given the name 'name'. Environment Variables: @@ -42,8 +42,8 @@ code compiled with the different compilers. The environment variable 'MPICC_PROFILE' specifies a profile library - and has the same effect as if '-profile=$MPICC_PROFILE' were used as - an argument to 'mpicc'. See the discussion of '-profile' below for more + and has the same effect as if '\-profile=$MPICC_PROFILE' were used as + an argument to 'mpicc'. See the discussion of '\-profile' below for more details. Compatible Compilers: @@ -52,7 +52,7 @@ uses compatible run-time libraries. On many systems, the various compilers are compatible and may be used interchangably. There are exceptions; if you use the 'MPICH_CXX' environment variable or the - '-cxx=name' command-line argument to override the choice of compiler + '\-cxx=name' command-line argument to override the choice of compiler and encounter problems, try reconfiguring MPICH with the new compiler, and installing MPICH in a separate location. See the installation manual for more details. @@ -60,21 +60,21 @@ Examples: To compile a single file 'foo.c', use .vb - mpicxx -c foo.cxx + mpicxx \-c foo.cxx .ve To link the output and make an executable, use .vb - mpicxx -o foo foo.o + mpicxx \-o foo foo.o .ve Combining compilation and linking in a single command .vb - mpicxx -o foo foo.cxx + mpicxx \-o foo foo.cxx .ve is a convenient way to build simple programs. Selecting a Profiling Library: - The '-profile=name' argument allows you to specify an MPI profiling + The '\-profile=name' argument allows you to specify an MPI profiling library to be used. 'name' can have two forms\: .n A library in the same directory as the MPI library @@ -95,12 +95,12 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" - PROFILE_INCPATHS="-I/usr/local/myprof/include" + PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" + PROFILE_INCPATHS="\-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line - argument '-profile=myprof' will cause these + argument '\-profile=myprof' will cause these definitions to be added to the relevant compile commands. .seealso: mpif77, mpicc, mpif90, mpiexec diff --git a/src/env/mpiexec.txt b/src/env/mpiexec.txt index f23d493..d3ca8e2 100644 --- a/src/env/mpiexec.txt +++ b/src/env/mpiexec.txt @@ -11,23 +11,23 @@ Multiple Data applications). For example, the following command will run the MPI program 'a.out' on 4 processes\: .vb - mpiexec -n 4 a.out + mpiexec \-n 4 a.out .ve The MPI standard specifies the following arguments and their meanings\: -+ -n <np> - Specify the number of processes to use -. -host <hostname> - Name of host on which to run processes -. -arch <architecture name> - Pick hosts with this architecture type -. -wdir <working directory> - cd to this one `before` running executable -. -path <pathlist> - use this to find the executable -. -soft <triplets> - comma separated triplets that specify requested numbers ++ \-n <np> - Specify the number of processes to use +. \-host <hostname> - Name of host on which to run processes +. \-arch <architecture name> - Pick hosts with this architecture type +. \-wdir <working directory> - cd to this one `before` running executable +. \-path <pathlist> - use this to find the executable +. \-soft <triplets> - comma separated triplets that specify requested numbers of processes (see the MPI-2 specification for more details) -. -file <name> - implementation-defined specification file -- -configfile <name> - file containing specifications of host/program, +. \-file <name> - implementation-defined specification file +- \-configfile <name> - file containing specifications of host/program, one per line, with # as a comment indicator, e.g., the usual mpiexec input, but with ":" replaced with a newline. That is, - the configfile contains lines with -soft, -n etc. + the configfile contains lines with \-soft, \-n etc. Additional arguments that are specific to the MPICH implementation are discussed below. @@ -35,14 +35,14 @@ The MPI standard specifies the following arguments and their meanings\: Note that not all of these parameters are meaningful for all systems. For example, the 'gforker' version of 'mpiexec' creates all processes on the same system on which it is running; in that case, the - '-arch' and '-host' options are ignored. + '\-arch' and '\-host' options are ignored. The colon character (':') may be used to separate different executables for MPMD (multiple program multiple data) programming. For example, to run the program 'ocean' on 4 processes and 'air' on 8 processes, use\: .vb - mpiexec -n 4 ocean : -n 8 air + mpiexec \-n 4 ocean : \-n 8 air .ve @@ -51,29 +51,29 @@ The MPI standard specifies the following arguments and their meanings\: Many of the implementations of process managers in MPICH support the following arguments to 'mpiexec'\: -+ -np <num> - A synonym for the standard '-n' argument -. -env <name> <value> - Set the environment variable '<name>' to '<value>' for ++ \-np <num> - A synonym for the standard '\-n' argument +. \-env <name> <value> - Set the environment variable '<name>' to '<value>' for the processes being run by 'mpiexec' -. -envnone - Pass no environment variables (other than ones specified with - other '-env' or '-genv' arguments) to the processes being run by 'mpiexec'. +. \-envnone - Pass no environment variables (other than ones specified with + other '\-env' or '\-genv' arguments) to the processes being run by 'mpiexec'. By default, all environment variables are provided to each MPI process (rationale: principle of least surprise for the user) -. -envlist <list> - Pass the listed environment variables (names separated +. \-envlist <list> - Pass the listed environment variables (names separated by commas), with their current values, to the processes being run by 'mpiexec'. -. -genv <name> <value> - The '-genv' options have the same meaning as their - corresponding '-env' version, except they apply to all executables, not just +. \-genv <name> <value> - The '\-genv' options have the same meaning as their + corresponding '\-env' version, except they apply to all executables, not just the current executable (in the case that the colon syntax is used to specify multiple execuables). -. -genvnone - Like '-envnone', but for all executables -. -genvlist <list> - Like '-envlist', but for all executables -. -usize <n> - Specify the value returned for the value of the attribute +. \-genvnone - Like '\-envnone', but for all executables +. \-genvlist <list> - Like '\-envlist', but for all executables +. \-usize <n> - Specify the value returned for the value of the attribute 'MPI_UNIVERSE_SIZE'. -. -l - Label standard out and standard error ('stdout' and 'stderr') with +. \-l - Label standard out and standard error ('stdout' and 'stderr') with the rank of the process -. -maxtime <n> - Set a timelimit of '<n>' seconds. -- -exitinfo - Provide more information on the reason each process exited if +. \-maxtime <n> - Set a timelimit of '<n>' seconds. +- \-exitinfo - Provide more information on the reason each process exited if there is an abnormal exit Environment variables for mpiexec: diff --git a/src/env/mpif77.txt b/src/env/mpif77.txt index c55f26e..639dcf0 100644 --- a/src/env/mpif77.txt +++ b/src/env/mpif77.txt @@ -10,28 +10,28 @@ as it provides the necessary libraries. Command line arguments: -+ -show - Show the commands that would be used without ++ \-show - Show the commands that would be used without running them -. -help - Give short help -. -f77=name - Use compiler 'name' instead of the default choice. Use +. \-help - Give short help +. \-f77=name - Use compiler 'name' instead of the default choice. Use this only if the compiler is compatible with the MPICH library (see below) -. -config=name - Load a configuration file for a particular compiler. +. \-config=name - Load a configuration file for a particular compiler. This allows a single 'mpif77' command to be used with multiple compilers. -. -compile_info - Show the steps for compiling a program. This option +. \-compile_info - Show the steps for compiling a program. This option can be used to see what options and include paths are used by mpif77. -. -link_info - Show the steps for linking a program. This optoin +. \-link_info - Show the steps for linking a program. This option can be used to see what options and libraries are used by mpif77. -. -profile=name - Use the MPI profiling given by name. See below for +. \-profile=name - Use the MPI profiling given by name. See below for details -. -echo - Show exactly what this program is doing. +. \-echo - Show exactly what this program is doing. This option should normally not be used. -- others - are passed to the compiler or linker. For example, '-c' - causes files to be compiled, '-g' selects compilation with - debugging on most systems, and '-o name' causes linking +- others - are passed to the compiler or linker. For example, '\-c' + causes files to be compiled, '\-g' selects compilation with + debugging on most systems, and '\-o name' causes linking with the output executable given the name 'name'. Environment Variables: @@ -47,7 +47,7 @@ uses compatible run-time libraries. On many systems, the various compilers are compatible and may be used interchangably. There are exceptions; if you use the 'MPICH_F77' environment variable or the - '-f77=name' command-line argument to override the choice of compiler + '\-f77=name' command-line argument to override the choice of compiler and encounter problems, try reconfiguring MPICH with the new compiler and installing MPICH in a separate location. See the installation manual for more details. @@ -55,21 +55,21 @@ Examples: To compile a single file 'foo.f', use .vb - mpif77 -c foo.f + mpif77 \-c foo.f .ve To link the output and make an executable, use .vb - mpif77 -o foo foo.o + mpif77 \-o foo foo.o .ve Combining compilation and linking in a single command .vb - mpif77 -o foo foo.f + mpif77 \-o foo foo.f .ve is a convenient way to build simple programs. Selecting a Profiling Library: - The '-profile=name' argument allows you to specify an MPI profiling + The '\-profile=name' argument allows you to specify an MPI profiling library to be used. 'name' can have two forms\: .n A library in the same directory as the MPI library @@ -90,12 +90,12 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" - PROFILE_INCPATHS="-I/usr/local/myprof/include" + PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" + PROFILE_INCPATHS="\-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line - argument '-profile=myprof' will cause these + argument '\-profile=myprof' will cause these definitions to be added to the relevant compile commands. .seealso: mpicc, mpicxx, mpif90, mpiexec diff --git a/src/env/mpif90.txt b/src/env/mpif90.txt index efedc29..fe7cf5f 100644 --- a/src/env/mpif90.txt +++ b/src/env/mpif90.txt @@ -10,28 +10,28 @@ as it provides the necessary libraries. Command line arguments: -+ -show - Show the commands that would be used without ++ \-show - Show the commands that would be used without running them -. -help - Give short help -. -f90=name - Use compiler 'name' instead of the default choice. Use +. \-help - Give short help +. \-f90=name - Use compiler 'name' instead of the default choice. Use this only if the compiler is compatible with the MPICH library (see below) -. -config=name - Load a configuration file for a particular compiler. +. \-config=name - Load a configuration file for a particular compiler. This allows a single 'mpif90' command to be used with multiple compilers. -. -compile_info - Show the steps for compiling a program. This option +. \-compile_info - Show the steps for compiling a program. This option can be used to see what options and include paths are used by mpif90. -. -link_info - Show the steps for linking a program. This optoin +. \-link_info - Show the steps for linking a program. This option can be used to see what options and libraries are used by mpif90. -. -profile=name - Use the MPI profiling given by name. See below for +. \-profile=name - Use the MPI profiling given by name. See below for details -. -echo - Show exactly what this program is doing. +. \-echo - Show exactly what this program is doing. This option should normally not be used. -- others - are passed to the compiler or linker. For example, '-c' - causes files to be compiled, '-g' selects compilation with - debugging on most systems, and '-o name' causes linking +- others - are passed to the compiler or linker. For example, '\-c' + causes files to be compiled, '\-g' selects compilation with + debugging on most systems, and '\-o name' causes linking with the output executable given the name 'name'. Environment Variables: @@ -47,7 +47,7 @@ uses compatible run-time libraries. On many systems, the various compilers are compatible and may be used interchangably. There are exceptions; if you use the 'MPICH_F90' environment variable or the - '-f90=name' command-line argument to override the choice of compiler + '\-f90=name' command-line argument to override the choice of compiler and encounter problems, try reconfiguring MPICH with the new compiler and installing MPICH in a separate location. See the installation manual for more details. @@ -55,21 +55,21 @@ Examples: To compile a single file 'foo.f', use .vb - mpif90 -c foo.f + mpif90 \-c foo.f .ve To link the output and make an executable, use .vb - mpif90 -o foo foo.o + mpif90 \-o foo foo.o .ve Combining compilation and linking in a single command .vb - mpif90 -o foo foo.f + mpif90 \-o foo foo.f .ve is a convenient way to build simple programs. Selecting a Profiling Library: - The '-profile=name' argument allows you to specify an MPI profiling + The '\-profile=name' argument allows you to specify an MPI profiling library to be used. 'name' can have two forms\: .n A library in the same directory as the MPI library @@ -90,12 +90,12 @@ is a convenient way to build simple programs. you could create the file 'myprof.conf' with the lines .vb - PROFILE_PRELIB="-L/usr/local/myprof/lib -lmyprof" - PROFILE_INCPATHS="-I/usr/local/myprof/include" + PROFILE_PRELIB="\-L/usr/local/myprof/lib \-lmyprof" + PROFILE_INCPATHS="\-I/usr/local/myprof/include" .ve and place it in the sysconfdir directory (this directory is set at configure time when MPICH is built). Then using the command-line - argument '-profile=myprof' will cause these + argument '\-profile=myprof' will cause these definitions to be added to the relevant compile commands. .seealso: mpicc, mpicxx, mpif90, mpiexec ----------------------------------------------------------------------- Summary of changes: src/env/mpicc.txt | 42 +++++++++++++++++++++--------------------- src/env/mpicxx.txt | 42 +++++++++++++++++++++--------------------- src/env/mpiexec.txt | 50 +++++++++++++++++++++++++------------------------- src/env/mpif77.txt | 38 +++++++++++++++++++------------------- src/env/mpif90.txt | 38 +++++++++++++++++++------------------- 5 files changed, 105 insertions(+), 105 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

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

07 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f77aacb88230a2197fbfd0e50fe4a05ea2013056 (commit) via e58125493f6a85321f8863b7263dd3729ff4f9c1 (commit) from cd5b43b2323661a6f25d29647784b66fb152a723 (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/f77aacb88230a2197fbfd0e50fe4a05ea… commit f77aacb88230a2197fbfd0e50fe4a05ea2013056 Author: William Gropp <wgropp(a)illinois.edu> Date: Sun Jul 7 15:00:15 2013 -0500 Added a test for an invalid, size 0, determination of the sizeof a Fortran integer diff --git a/configure.ac b/configure.ac index 21f174e..4910610 100644 --- a/configure.ac +++ b/configure.ac @@ -1894,12 +1894,7 @@ if test -n "$F90" -o -n "$F90FLAGS" ; then fi # ---------------------------------------------------------------------------- # Handle default choices for the Fortran compilers -if test "$enable_f77" = "yes" ; then - # Check for a Fortran compiler - # FIXME already done earlier - dnl PAC_PROG_F77 - : -fi +# Note that these have already been set above if test "$enable_f77" = "yes" -a "$F77" = "" ; then # No Fortran 77 compiler found; abort @@ -3484,7 +3479,8 @@ if test "$enable_f77" = yes ; then MPI_CHARACTER=0x4c00011a AC_SUBST(MPI_CHARACTER) - if test -z "$pac_cv_f77_sizeof_integer" ; then + if test -z "$pac_cv_f77_sizeof_integer" -o \ + "X$pac_cv_f77_sizeof_integer" = "X0" ; then AC_MSG_ERROR([Unable to configure with Fortran support because configure could not determine the size of a Fortran INTEGER. Consider setting CROSS_F77_SIZEOF_INTEGER to the length in bytes of a Fortran INTEGER]) fi len_integer=$pac_cv_f77_sizeof_integer http://git.mpich.org/mpich.git/commitdiff/e58125493f6a85321f8863b7263dd3729… commit e58125493f6a85321f8863b7263dd3729ff4f9c1 Author: William Gropp <wgropp(a)illinois.edu> Date: Sun Jul 7 14:57:43 2013 -0500 Added missing delete of the created keyval diff --git a/test/mpi/attr/attrdeleteget.c b/test/mpi/attr/attrdeleteget.c index 362287c..f709579 100644 --- a/test/mpi/attr/attrdeleteget.c +++ b/test/mpi/attr/attrdeleteget.c @@ -24,6 +24,7 @@ int main(int argc,char **argv) MPI_Comm_create_keyval(MPI_NULL_COPY_FN, delete_fn, &key, &errs); MPI_Comm_set_attr(scomm, key, a); MPI_Comm_free(&scomm); + MPI_Comm_free_keyval( &key ); MTest_Finalize(errs); MPI_Finalize(); return 0; ----------------------------------------------------------------------- Summary of changes: configure.ac | 10 +++------- test/mpi/attr/attrdeleteget.c | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0