[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-247-g1aec69b

[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  1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7 (commit)
      from  bdd471a1dfbb0c3aa883e4cad011e2125c602706 (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/1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7

commit 1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Apr 11 13:38:13 2016 -0500

    mpid/common/sched: use MPID_Datatype abstraction
    
    In order to maintain abstractions, MPID_Datatype functionality is
    exposed by the device layer. This commit fixes a breakage where the
    sched code directly called into another MPIDU component, instead of
    using what the device exposes.
    
    Signed-off-by: Lena Oden <loden at anl.gov>

diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c
index f95d1c7..5af6535 100644
--- a/src/mpid/common/sched/mpidu_sched.c
+++ b/src/mpid/common/sched/mpidu_sched.c
@@ -26,9 +26,9 @@
         if ((datatype_) != MPI_DATATYPE_NULL &&                    \
             HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN)   \
         {                                                          \
-            MPIDU_Datatype *dtp_ = NULL;                            \
-            MPIDU_Datatype_get_ptr((datatype_), dtp_);              \
-            MPIDU_Datatype_add_ref(dtp_);                           \
+            MPID_Datatype *dtp_ = NULL;                            \
+            MPID_Datatype_get_ptr((datatype_), dtp_);              \
+            MPID_Datatype_add_ref(dtp_);                           \
         }                                                          \
     } while (0)
 #define dtype_release_if_not_builtin(datatype_)                    \
@@ -36,9 +36,9 @@
         if ((datatype_) != MPI_DATATYPE_NULL &&                    \
             HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN)   \
         {                                                          \
-            MPIDU_Datatype *dtp_ = NULL;                            \
-            MPIDU_Datatype_get_ptr((datatype_), dtp_);              \
-            MPIDU_Datatype_release(dtp_);                           \
+            MPID_Datatype *dtp_ = NULL;                            \
+            MPID_Datatype_get_ptr((datatype_), dtp_);              \
+            MPID_Datatype_release(dtp_);                           \
         }                                                          \
     } while (0)
 
@@ -763,8 +763,8 @@ int MPIDU_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype,
 #if defined(HAVE_ERROR_CHECKING) && !defined(NDEBUG)
     {
         MPI_Aint intype_size, outtype_size;
-        MPIDU_Datatype_get_size_macro(intype, intype_size);
-        MPIDU_Datatype_get_size_macro(outtype, outtype_size);
+        MPID_Datatype_get_size_macro(intype, intype_size);
+        MPID_Datatype_get_size_macro(outtype, outtype_size);
         if (incount * intype_size > outcount * outtype_size) {
             MPL_error_printf("truncation: intype=%#x, intype_size=" MPI_AINT_FMT_DEC_SPEC ", incount=" MPI_AINT_FMT_DEC_SPEC ", outtype=%#x, outtype_size=" MPI_AINT_FMT_DEC_SPEC " outcount=" MPI_AINT_FMT_DEC_SPEC "\n",
                               intype, intype_size,

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

Summary of changes:
 src/mpid/common/sched/mpidu_sched.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
MPICH primary repository