[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-5-gcc4b095

[Service Account]

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  cc4b0952a7b8503e2340938ce11092aa5784305a (commit)
      from  f38b5131d934987f139e5cf704cdf067d212ca21 (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/cc4b0952a7b8503e2340938ce11092aa5784305a

commit cc4b0952a7b8503e2340938ce11092aa5784305a
Author: Igor Ivanov <Igor.Ivanov at itseez.com>
Date:   Fri Oct 10 14:33:37 2014 +0200

    mpi/coll: Fix incorrect parameter check
    
    Fixed wrong parameter check condition for MPI_Iallgather and MPI_Iallgatherv
    -1 is valid value for sendcount in case MPI_IN_PLACE
    MPI spec says:
    The in place option for intracommunicators is specified by passing the value
    MPI_IN_PLACE to the argument sendbuf at all processes. In such a case, sendcount and
    sendtype are ignored, and the input data of each process is assumed to be in the area where
    that process would receive its own contribution to the receive buffer.
    
    Signed-off-by: Igor Ivanov <Igor.Ivanov at itseez.com>
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c
index 18d798c..1e0eb10 100644
--- a/src/mpi/coll/iallgather.c
+++ b/src/mpi/coll/iallgather.c
@@ -675,9 +675,10 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
     {
         MPID_BEGIN_ERROR_CHECKS
         {
-            if (sendbuf != MPI_IN_PLACE)
+            if (sendbuf != MPI_IN_PLACE) {
                 MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno);
-            MPIR_ERRTEST_COUNT(sendcount, mpi_errno);
+                MPIR_ERRTEST_COUNT(sendcount, mpi_errno);
+            }
             MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno);
             MPIR_ERRTEST_COMM(comm, mpi_errno);
 
diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c
index 5d5fd15..39b88d6 100644
--- a/src/mpi/coll/iallgatherv.c
+++ b/src/mpi/coll/iallgatherv.c
@@ -779,8 +779,10 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v
     {
         MPID_BEGIN_ERROR_CHECKS
         {
-            if (sendbuf != MPI_IN_PLACE)
+            if (sendbuf != MPI_IN_PLACE) {
                 MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno);
+                MPIR_ERRTEST_COUNT(sendcount, mpi_errno);
+            }
             MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno);
             MPIR_ERRTEST_COMM(comm, mpi_errno);
 

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

Summary of changes:
 src/mpi/coll/iallgather.c  |    5 +++--
 src/mpi/coll/iallgatherv.c |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository