[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-303-g86bb002

[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  86bb0020b7e66b75cf0370d2dbe31bd31b3bb287 (commit)
       via  b752654a5e441b12d2f8ec3b5b2dcd1e45ded389 (commit)
      from  0ad10e8000a033d1836ceb493be234773db143f4 (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/86bb0020b7e66b75cf0370d2dbe31bd31b3bb287

commit 86bb0020b7e66b75cf0370d2dbe31bd31b3bb287
Author: Charles J Archer <charles.j.archer at intel.com>
Date:   Fri May 13 15:41:10 2016 -0500

    mpi/coll: add op create/destroy hooks
    
    Adds MPI layer Op hooks for symmetry with datatypes and future support
    of OFI op types.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c
index e90d9a1..cd2cae5 100644
--- a/src/mpi/coll/op_create.c
+++ b/src/mpi/coll/op_create.c
@@ -130,6 +130,10 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op)
     MPIR_Object_set_ref(op_ptr,1);
 
     MPIR_OBJ_PUBLISH_HANDLE(*op, op_ptr->handle);
+
+#ifdef MPID_Dev_op_commit_hook
+    MPID_Dev_op_commit_hook(op_ptr);
+#endif
     /* ... end of body of routine ... */
 
   fn_exit:
diff --git a/src/mpi/coll/op_free.c b/src/mpi/coll/op_free.c
index c0c16af..2d013ab 100644
--- a/src/mpi/coll/op_free.c
+++ b/src/mpi/coll/op_free.c
@@ -91,6 +91,9 @@ int MPI_Op_free(MPI_Op *op)
     MPIR_Op_release_ref( op_ptr, &in_use);
     if (!in_use) {
 	MPIR_Handle_obj_free( &MPIR_Op_mem, op_ptr );
+#ifdef MPID_Dev_op_destroy_hook
+        MPID_Dev_op_destroy_hook(op_ptr);
+#endif
     }
     *op = MPI_OP_NULL;
     

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

commit b752654a5e441b12d2f8ec3b5b2dcd1e45ded389
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Fri May 13 15:33:30 2016 -0500

    mpid/common/datatype: hook changes
    
    1. Defines the ADI consistently for datatype hooks. Pass MPIR_Datatype
       in all cases.
    2. Call MPID_ datatype hook functions. These were accidentally changed
       to MPIDU_ prefixes in [74bb0bd8a05d].
    3. Remove dup hook and call commit hook when duplicated datatype is
       already committed. In practice, this was already the case. If a
       compelling use case for a dup hook surfaces, we can add it back.
    
    Based on an earlier patch contributed by Charles Archer
    <charles.j.archer at intel.com>.
    
    Signed-off-by: Yanfei Guo <yguo at anl.gov>

diff --git a/src/mpid/common/datatype/mpidu_datatype_free.c b/src/mpid/common/datatype/mpidu_datatype_free.c
index 4a25dea..362973d 100644
--- a/src/mpid/common/datatype/mpidu_datatype_free.c
+++ b/src/mpid/common/datatype/mpidu_datatype_free.c
@@ -37,9 +37,9 @@ void MPIDU_Datatype_free(MPIDU_Datatype *ptr)
 {
     MPL_DBG_MSG_P(MPIR_DBG_DATATYPE,VERBOSE,"type %x freed.", ptr->handle);
 
-#ifdef MPIDU_Dev_datatype_destroy_hook
-       MPIDU_Dev_datatype_destroy_hook(ptr);
-#endif /* MPIDU_Dev_datatype_destroy_hook */
+#ifdef MPID_Dev_datatype_destroy_hook
+       MPID_Dev_datatype_destroy_hook(ptr);
+#endif /* MPID_Dev_datatype_destroy_hook */
 
     /* before freeing the contents, check whether the pointer is not
        null because it is null in the case of a datatype shipped to the target
diff --git a/src/mpid/common/datatype/mpidu_type_commit.c b/src/mpid/common/datatype/mpidu_type_commit.c
index dd02fce..407ecd7 100644
--- a/src/mpid/common/datatype/mpidu_type_commit.c
+++ b/src/mpid/common/datatype/mpidu_type_commit.c
@@ -62,9 +62,9 @@ int MPIDU_Type_commit(MPI_Datatype *datatype_p)
         MPIDI_Dataloop_dot_printf(datatype_ptr->dataloop, 0, 1);
 #endif
 
-#ifdef MPIDU_Dev_datatype_commit_hook
-       MPIDU_Dev_datatype_commit_hook(datatype_p);
-#endif /* MPIDU_Dev_datatype_commit_hook */
+#ifdef MPID_Dev_datatype_commit_hook
+       MPID_Dev_datatype_commit_hook(datatype_ptr);
+#endif /* MPID_Dev_datatype_commit_hook */
 
     }
     return mpi_errno;
diff --git a/src/mpid/common/datatype/mpidu_type_dup.c b/src/mpid/common/datatype/mpidu_type_dup.c
index ed683f6..55e5155 100644
--- a/src/mpid/common/datatype/mpidu_type_dup.c
+++ b/src/mpid/common/datatype/mpidu_type_dup.c
@@ -98,9 +98,9 @@ int MPIDU_Type_dup(MPI_Datatype oldtype,
 				  &new_dtp->hetero_dloop);
 	    }
 
-#ifdef MPIDU_Dev_datatype_commit_hook
-            MPIDU_Dev_datatype_dup_hook(new_dtp);
-#endif /* MPIDU_Dev_datatype_commit_hook */
+#ifdef MPID_Dev_datatype_commit_hook
+            MPID_Dev_datatype_commit_hook(new_dtp);
+#endif /* MPID_Dev_datatype_commit_hook */
       }
     }
 

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

Summary of changes:
 src/mpi/coll/op_create.c                       |    4 ++++
 src/mpi/coll/op_free.c                         |    3 +++
 src/mpid/common/datatype/mpidu_datatype_free.c |    6 +++---
 src/mpid/common/datatype/mpidu_type_commit.c   |    6 +++---
 src/mpid/common/datatype/mpidu_type_dup.c      |    6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
MPICH primary repository