[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.3-14-g34095c3

mysql vizuser noreply at mpich.org
Sun Apr 7 21:19:08 CDT 2013


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  34095c397c692cc1705cc005fe4ccc92dd263634 (commit)
       via  dd76a0f2f90bf4d79ac75a5d4419e498f9770c30 (commit)
       via  8fb17a1dc7a48d9695cf21aedf4f54b00da465e2 (commit)
      from  3f38e1b9ff5ecc9a916aec41fb964c1cec2e3622 (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/34095c397c692cc1705cc005fe4ccc92dd263634

commit 34095c397c692cc1705cc005fe4ccc92dd263634
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sun Apr 7 10:12:41 2013 -0500

    Fix English typos caught by the Debian lintian checks.
    
    Reviewed by dinan.

diff --git a/src/env/mpicc.txt b/src/env/mpicc.txt
index 9ffaee4..2bff06c 100644
--- a/src/env/mpicc.txt
+++ b/src/env/mpicc.txt
@@ -11,7 +11,7 @@
 
     Command line arguments:
 +  -show      - Show the commands that would be used without
-             runnning them
+                running them
 .  -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
diff --git a/src/env/mpicxx.txt b/src/env/mpicxx.txt
index b83be4c..d3388e0 100644
--- a/src/env/mpicxx.txt
+++ b/src/env/mpicxx.txt
@@ -11,7 +11,7 @@
 
     Command line arguments:
 +  -show      - Show the commands that would be used without
-             runnning them
+                running them
 .  -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
diff --git a/src/env/mpif77.txt b/src/env/mpif77.txt
index e00c586..c55f26e 100644
--- a/src/env/mpif77.txt
+++ b/src/env/mpif77.txt
@@ -11,7 +11,7 @@
 
     Command line arguments:
 +  -show      - Show the commands that would be used without
-             runnning them
+                running them
 .  -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
diff --git a/src/env/mpif90.txt b/src/env/mpif90.txt
index dd603c3..efedc29 100644
--- a/src/env/mpif90.txt
+++ b/src/env/mpif90.txt
@@ -11,7 +11,7 @@
 
     Command line arguments:
 +  -show      - Show the commands that would be used without
-             runnning them
+                running them
 .  -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
diff --git a/src/mpi/attr/attr_get.c b/src/mpi/attr/attr_get.c
index f1ad255..122ed46 100644
--- a/src/mpi/attr/attr_get.c
+++ b/src/mpi/attr/attr_get.c
@@ -46,7 +46,7 @@ Notes:
     in with 'MPI_ATTR_PUT'.  The notes for C and Fortran below explain why.
 
 Notes for C:
-    Even though the 'attribute_val' arguement is declared as 'void *', it is
+    Even though the 'attribute_val' argument is declared as 'void *', it is
     really the address of a void pointer (i.e., a 'void **').  Using
     a 'void *', however, is more in keeping with C idiom and allows the
     pointer to be passed without additional casts.
diff --git a/src/mpi/attr/comm_create_keyval.c b/src/mpi/attr/comm_create_keyval.c
index 604b6a6..f145189 100644
--- a/src/mpi/attr/comm_create_keyval.c
+++ b/src/mpi/attr/comm_create_keyval.c
@@ -103,7 +103,7 @@ Default copy and delete functions are available.  These are
 There are subtle differences between C and Fortran that require that the
 copy_fn be written in the same language from which 'MPI_Comm_create_keyval'
 is called.
-This should not be a problem for most users; only programers using both 
+This should not be a problem for most users; only programmers using both
 Fortran and C in the same program need to be sure that they follow this rule.
 
 .N AttrErrReturn
diff --git a/src/mpi/attr/comm_get_attr.c b/src/mpi/attr/comm_get_attr.c
index 87ca505..e998200 100644
--- a/src/mpi/attr/comm_get_attr.c
+++ b/src/mpi/attr/comm_get_attr.c
@@ -332,7 +332,7 @@ Output Parameters:
     why. 
 
 Notes for C:
-    Even though the 'attr_value' arguement is declared as 'void *', it is
+    Even though the 'attr_value' argument is declared as 'void *', it is
     really the address of a void pointer.  See the rationale in the 
     standard for more details. 
 
diff --git a/src/mpi/attr/keyval_create.c b/src/mpi/attr/keyval_create.c
index ac69c3e..a65fc1a 100644
--- a/src/mpi/attr/keyval_create.c
+++ b/src/mpi/attr/keyval_create.c
@@ -46,7 +46,7 @@ Key values are global (available for any and all communicators).
 There are subtle differences between C and Fortran that require that the
 copy_fn be written in the same language that 'MPI_Keyval_create'
 is called from.
-This should not be a problem for most users; only programers using both 
+This should not be a problem for most users; only programmers using both
 Fortran and C in the same program need to be sure that they follow this rule.
 
 .N ThreadSafe
diff --git a/src/mpi/attr/type_get_attr.c b/src/mpi/attr/type_get_attr.c
index 1748e03..3d6a44f 100644
--- a/src/mpi/attr/type_get_attr.c
+++ b/src/mpi/attr/type_get_attr.c
@@ -170,7 +170,7 @@ Output Parameters:
     why. 
 
 Notes for C:
-    Even though the 'attr_value' arguement is declared as 'void *', it is
+    Even though the 'attr_value' argument is declared as 'void *', it is
     really the address of a void pointer.  See the rationale in the 
     standard for more details. 
 
diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c
index 1283227..d5f90da 100644
--- a/src/mpi/comm/comm_split.c
+++ b/src/mpi/comm/comm_split.c
@@ -381,7 +381,7 @@ Input Parameters:
 + comm - communicator (handle) 
 . color - control of subset assignment (nonnegative integer).  Processes 
   with the same color are in the same new communicator 
-- key - control of rank assigment (integer)
+- key - control of rank assignment (integer)
 
 Output Parameters:
 . newcomm - new communicator (handle) 
diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c
index aa5045e..47ca3fc 100644
--- a/src/mpi/comm/comm_split_type.c
+++ b/src/mpi/comm/comm_split_type.c
@@ -70,7 +70,7 @@ MPI_Comm_split_type - Creates new communicators based on split types and keys
 Input Parameters:
 + comm - communicator (handle)
 . split_type - type of processes to be grouped together (nonnegative integer).
-. key - control of rank assigment (integer)
+. key - control of rank assignment (integer)
 - info - hints to improve communicator creation (handle)
 
 Output Parameters:
diff --git a/src/mpi/errhan/errnames.txt b/src/mpi/errhan/errnames.txt
index 8e78c48..0633d3a 100644
--- a/src/mpi/errhan/errnames.txt
+++ b/src/mpi/errhan/errnames.txt
@@ -152,7 +152,7 @@ MPI_TYPECLASS_INTEGER, or MPI_TYPECLASS_COMPLEX
 (precision=%d, range=%d) failed
 **f90typetoomany:Too many requests for unnamed, predefined f90 types
 **f90typeintnone: No integer type with the requested range is available
-**f90typeintnone %d: No integer type with %d digits of range is avaiable
+**f90typeintnone %d: No integer type with %d digits of range is available
 **f90typerealnone: No real type with the requested range and/or precision \
  is available
 **f90typerealnone %d %d: No real type with both %d digits of precision \
diff --git a/src/mpi/pt2pt/startall.c b/src/mpi/pt2pt/startall.c
index 9763268..734f032 100644
--- a/src/mpi/pt2pt/startall.c
+++ b/src/mpi/pt2pt/startall.c
@@ -43,7 +43,7 @@ Input Parameters:
 
    Unlike 'MPI_Waitall', 'MPI_Startall' does not provide a mechanism for
    returning multiple errors nor pinpointing the request(s) involved.
-   Futhermore, the behavior of 'MPI_Startall' after an error occurs is not
+   Furthermore, the behavior of 'MPI_Startall' after an error occurs is not
    defined by the MPI standard.  If well-defined error reporting and behavior
    are required, multiple calls to 'MPI_Start' should be used instead.
 
diff --git a/src/mpi/romio/mpi-io/iread_at.c b/src/mpi/romio/mpi-io/iread_at.c
index 1837b4f..8e9b0b2 100644
--- a/src/mpi/romio/mpi-io/iread_at.c
+++ b/src/mpi/romio/mpi-io/iread_at.c
@@ -28,7 +28,7 @@
 #endif
 
 /*@
-    MPI_File_iread_at - Nonblocking read using explict offset
+    MPI_File_iread_at - Nonblocking read using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/iwrite_at.c b/src/mpi/romio/mpi-io/iwrite_at.c
index 6cd0eeb..6974ed5 100644
--- a/src/mpi/romio/mpi-io/iwrite_at.c
+++ b/src/mpi/romio/mpi-io/iwrite_at.c
@@ -24,7 +24,7 @@
 #endif
 
 /*@
-    MPI_File_iwrite_at - Nonblocking write using explict offset
+    MPI_File_iwrite_at - Nonblocking write using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/rd_atallb.c b/src/mpi/romio/mpi-io/rd_atallb.c
index aefea0e..44f54e4 100644
--- a/src/mpi/romio/mpi-io/rd_atallb.c
+++ b/src/mpi/romio/mpi-io/rd_atallb.c
@@ -24,7 +24,7 @@
 #endif
 
 /*@
-    MPI_File_read_at_all_begin - Begin a split collective read using explict offset
+    MPI_File_read_at_all_begin - Begin a split collective read using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/rd_atalle.c b/src/mpi/romio/mpi-io/rd_atalle.c
index 5341327..0715e6a 100644
--- a/src/mpi/romio/mpi-io/rd_atalle.c
+++ b/src/mpi/romio/mpi-io/rd_atalle.c
@@ -25,7 +25,7 @@
 
 /*@
     MPI_File_read_at_all_end - Complete a split collective read using
-    explict offset
+    explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/read_at.c b/src/mpi/romio/mpi-io/read_at.c
index 2fad79d..72e593d 100644
--- a/src/mpi/romio/mpi-io/read_at.c
+++ b/src/mpi/romio/mpi-io/read_at.c
@@ -25,7 +25,7 @@
 /* status object not filled currently */
 
 /*@
-    MPI_File_read_at - Read using explict offset
+    MPI_File_read_at - Read using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/read_atall.c b/src/mpi/romio/mpi-io/read_atall.c
index 4763b1a..13932b1 100644
--- a/src/mpi/romio/mpi-io/read_atall.c
+++ b/src/mpi/romio/mpi-io/read_atall.c
@@ -26,7 +26,7 @@
 /* status object not filled currently */
 
 /*@
-    MPI_File_read_at_all - Collective read using explict offset
+    MPI_File_read_at_all - Collective read using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/wr_atallb.c b/src/mpi/romio/mpi-io/wr_atallb.c
index cf1b3ba..07fe989 100644
--- a/src/mpi/romio/mpi-io/wr_atallb.c
+++ b/src/mpi/romio/mpi-io/wr_atallb.c
@@ -25,7 +25,7 @@
 
 /*@
     MPI_File_write_at_all_begin - Begin a split collective write using
-    explict offset
+    explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/wr_atalle.c b/src/mpi/romio/mpi-io/wr_atalle.c
index 430945e..dc41651 100644
--- a/src/mpi/romio/mpi-io/wr_atalle.c
+++ b/src/mpi/romio/mpi-io/wr_atalle.c
@@ -24,7 +24,7 @@
 #endif
 
 /*@
-    MPI_File_write_at_all_end - Complete a split collective write using explict offset
+    MPI_File_write_at_all_end - Complete a split collective write using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/write_at.c b/src/mpi/romio/mpi-io/write_at.c
index 63f3065..16980ff 100644
--- a/src/mpi/romio/mpi-io/write_at.c
+++ b/src/mpi/romio/mpi-io/write_at.c
@@ -25,7 +25,7 @@
 /* status object not filled currently */
 
 /*@
-    MPI_File_write_at - Write using explict offset
+    MPI_File_write_at - Write using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpi/romio/mpi-io/write_atall.c b/src/mpi/romio/mpi-io/write_atall.c
index 82e207b..fda31ee 100644
--- a/src/mpi/romio/mpi-io/write_atall.c
+++ b/src/mpi/romio/mpi-io/write_atall.c
@@ -26,7 +26,7 @@
 /* status object not filled currently */
 
 /*@
-    MPI_File_write_at_all - Collective write using explict offset
+    MPI_File_write_at_all - Collective write using explicit offset
 
 Input Parameters:
 . fh - file handle (handle)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c
index 7ab4615..d66bfa8 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c
@@ -407,7 +407,7 @@ int MPID_nem_scif_poll_send(int ep, shmchan_t * csend)
 
     avail = csend->buflen - (csend->curp - csend->bufp) - sizeof(uint64_t);
     if (avail >= SMALLMSG)
-        goto fn_exit;   /* room for a messsage */
+        goto fn_exit;   /* room for a message */
     lseqno = *csend->lseqno;
     if (lseqno == csend->seqno)
         goto fn_exit;   /* remote side has consumed everything */
diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c
index 01e3dcb..501edd4 100644
--- a/src/mpid/ch3/src/ch3u_recvq.c
+++ b/src/mpid/ch3/src/ch3u_recvq.c
@@ -139,7 +139,7 @@ int MPIDI_CH3U_Recvq_init(void)
                                 MPI_T_PVAR_CLASS_LEVEL,
                                 MPI_UNSIGNED,
                                 MPI_T_ENUM_NULL,
-                                "length of the unexpected messsage receive queue",
+                                "length of the unexpected message receive queue",
                                 MPI_T_BIND_NO_OBJECT,
                                 /*readonly=*/TRUE,
                                 /*continuous=*/TRUE,
@@ -156,7 +156,7 @@ int MPIDI_CH3U_Recvq_init(void)
                                 MPI_T_PVAR_CLASS_COUNTER,
                                 MPI_AINT,
                                 MPI_T_ENUM_NULL,
-                                "number of search passes on the messsage receive queue",
+                                "number of search passes on the message receive queue",
                                 MPI_T_BIND_NO_OBJECT,
                                 /*readonly=*/FALSE,
                                 /*continuous=*/TRUE,
@@ -173,7 +173,7 @@ int MPIDI_CH3U_Recvq_init(void)
                                 MPI_T_PVAR_CLASS_COUNTER,
                                 MPI_AINT,
                                 MPI_T_ENUM_NULL,
-                                "number of search passes on the messsage receive queue",
+                                "number of search passes on the message receive queue",
                                 MPI_T_BIND_NO_OBJECT,
                                 /*readonly=*/FALSE,
                                 /*continuous=*/TRUE,
@@ -246,7 +246,7 @@ fn_fail:
  * MPIDI_CH3U_Recvq_FU()
  *
  * Search for a matching request in the unexpected receive queue.  Return 
- * true if one is found, false otherwise.  If the status arguement is
+ * true if one is found, false otherwise.  If the status argument is
  * not MPI_STATUS_IGNORE, return information about the request in that
  * parameter.  This routine is used by mpid_probe and mpid_iprobe.
  *
diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c
index ae932a6..2aaadeb 100644
--- a/src/mpid/ch3/src/mpid_isend.c
+++ b/src/mpid/ch3/src/mpid_isend.c
@@ -122,7 +122,7 @@ int MPID_Isend(const void * buf, int count, MPI_Datatype datatype, int rank,
 
     MPIDI_CH3_GET_EAGER_THRESHOLD(&eager_threshold, comm, vc);
 
-    /* FIXME: flow control: limit number of outstanding eager messsages 
+    /* FIXME: flow control: limit number of outstanding eager messages
        containing data and need to be buffered by the receiver */
     if (data_sz + sizeof(MPIDI_CH3_Pkt_eager_send_t) <= eager_threshold)
     {
diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c
index 90dd507..0328b0c 100644
--- a/src/mpid/ch3/src/mpid_send.c
+++ b/src/mpid/ch3/src/mpid_send.c
@@ -116,7 +116,7 @@ int MPID_Send(const void * buf, int count, MPI_Datatype datatype, int rank,
 
     MPIDI_CH3_GET_EAGER_THRESHOLD(&eager_threshold, comm, vc);
 
-    /* FIXME: flow control: limit number of outstanding eager messsages 
+    /* FIXME: flow control: limit number of outstanding eager messages
        containing data and need to be buffered by the receiver */
 #ifdef USE_EAGER_SHORT
     if (dt_contig && data_sz <= MPIDI_EAGER_SHORT_SIZE) {

http://git.mpich.org/mpich.git/commitdiff/dd76a0f2f90bf4d79ac75a5d4419e498f9770c30

commit dd76a0f2f90bf4d79ac75a5d4419e498f9770c30
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sun Apr 7 09:37:21 2013 -0500

    Fix typo -- the performance tests were not correctly disabled in
    released versions.
    
    Reviewed by dinan.

diff --git a/maint/release.pl b/maint/release.pl
index 353a5bf..2cf3ab4 100755
--- a/maint/release.pl
+++ b/maint/release.pl
@@ -254,7 +254,7 @@ print("done\n");
 # Disable unnecessary tests in the release tarball
 print("===> Disabling unnecessary tests in the main package... ");
 chdir($expdir);
-run_cmd("perl -p -i -e 's/^perf\$/#perf/' test/mpi/testlist.in");
+run_cmd("perl -p -i -e 's/^@perfdir@\$/#@perfdir@/' test/mpi/testlist.in");
 run_cmd("perl -p -i -e 's/^large_message /#large_message /' test/mpi/pt2pt/testlist");
 run_cmd("perl -p -i -e 's/^large-count /#large-count /' test/mpi/datatype/testlist");
 print("done\n");

http://git.mpich.org/mpich.git/commitdiff/8fb17a1dc7a48d9695cf21aedf4f54b00da465e2

commit 8fb17a1dc7a48d9695cf21aedf4f54b00da465e2
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sun Mar 24 12:34:55 2013 -0500

    Bug-fix: We should use HYDU_FUNC instead of __func__ directly.  We
    already checked for this, but accidentally used __func__ directly
    after the check.
    
    Reviewed by dinan.

diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h
index de7fcbb..3689417 100644
--- a/src/pm/hydra/include/hydra.h
+++ b/src/pm/hydra/include/hydra.h
@@ -374,7 +374,7 @@ struct HYD_user_global {
 #define HYDU_error_printf(...)                                          \
     {                                                                   \
         HYDU_dump_prefix(stderr);                                       \
-        HYDU_dump_noprefix(stderr, "%s (%s:%d): ", __func__, __FILE__, __LINE__); \
+        HYDU_dump_noprefix(stderr, "%s (%s:%d): ", HYDU_FUNC, __FILE__, __LINE__); \
         HYDU_dump_noprefix(stderr, __VA_ARGS__);                        \
     }
 #elif defined __FILE__

-----------------------------------------------------------------------

Summary of changes:
 maint/release.pl                                   |    2 +-
 src/env/mpicc.txt                                  |    2 +-
 src/env/mpicxx.txt                                 |    2 +-
 src/env/mpif77.txt                                 |    2 +-
 src/env/mpif90.txt                                 |    2 +-
 src/mpi/attr/attr_get.c                            |    2 +-
 src/mpi/attr/comm_create_keyval.c                  |    2 +-
 src/mpi/attr/comm_get_attr.c                       |    2 +-
 src/mpi/attr/keyval_create.c                       |    2 +-
 src/mpi/attr/type_get_attr.c                       |    2 +-
 src/mpi/comm/comm_split.c                          |    2 +-
 src/mpi/comm/comm_split_type.c                     |    2 +-
 src/mpi/errhan/errnames.txt                        |    2 +-
 src/mpi/pt2pt/startall.c                           |    2 +-
 src/mpi/romio/mpi-io/iread_at.c                    |    2 +-
 src/mpi/romio/mpi-io/iwrite_at.c                   |    2 +-
 src/mpi/romio/mpi-io/rd_atallb.c                   |    2 +-
 src/mpi/romio/mpi-io/rd_atalle.c                   |    2 +-
 src/mpi/romio/mpi-io/read_at.c                     |    2 +-
 src/mpi/romio/mpi-io/read_atall.c                  |    2 +-
 src/mpi/romio/mpi-io/wr_atallb.c                   |    2 +-
 src/mpi/romio/mpi-io/wr_atalle.c                   |    2 +-
 src/mpi/romio/mpi-io/write_at.c                    |    2 +-
 src/mpi/romio/mpi-io/write_atall.c                 |    2 +-
 src/mpid/ch3/channels/nemesis/netmod/scif/scifrw.c |    2 +-
 src/mpid/ch3/src/ch3u_recvq.c                      |    8 ++++----
 src/mpid/ch3/src/mpid_isend.c                      |    2 +-
 src/mpid/ch3/src/mpid_send.c                       |    2 +-
 src/pm/hydra/include/hydra.h                       |    2 +-
 29 files changed, 32 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list