[mpich2-commits] r4153 - mpich2/trunk/src/mpi/coll

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-03-20 17:24:07 -0500 (Fri, 20 Mar 2009)
New Revision: 4153

Modified:
   mpich2/trunk/src/mpi/coll/opland.c
   mpich2/trunk/src/mpi/coll/oplor.c
   mpich2/trunk/src/mpi/coll/oplxor.c
Log:
Add LOGICAL_EXTRA groups to l{and,or,xor} reduction operations.

This group is currently empty, but for completeness it should have been
included in the first place.

No reviewer.

Modified: mpich2/trunk/src/mpi/coll/opland.c
===================================================================
--- mpich2/trunk/src/mpi/coll/opland.c	2009-03-20 22:17:29 UTC (rev 4152)
+++ mpich2/trunk/src/mpi/coll/opland.c	2009-03-20 22:24:07 UTC (rev 4153)
@@ -51,6 +51,7 @@
     }
         /* expand logicals (which may include MPI_C_BOOL, a non-Fortran type) */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
         /* now revert _HAVE_FORTRAN macro to default */
 #  undef MPIR_OP_TYPE_MACRO_HAVE_FORTRAN
 #  define MPIR_OP_TYPE_MACRO_HAVE_FORTRAN(mpi_type_, c_type_) MPIR_OP_TYPE_MACRO(mpi_type_, c_type_)
@@ -58,6 +59,7 @@
         /* if we don't have Fortran support then we don't have to jump through
            any hoops, simply expand the group */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 #endif
 
         /* extra types that are not required to be supported by the MPI Standard */
@@ -92,6 +94,7 @@
 #define MPIR_OP_TYPE_MACRO(mpi_type_, c_type_) case (mpi_type_):
         MPIR_OP_TYPE_GROUP(C_INTEGER)
         MPIR_OP_TYPE_GROUP(LOGICAL) /* no special handling needed in check_dtype code */
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 
         /* extra types that are not required to be supported by the MPI Standard */
         MPIR_OP_TYPE_GROUP(C_INTEGER_EXTRA)

Modified: mpich2/trunk/src/mpi/coll/oplor.c
===================================================================
--- mpich2/trunk/src/mpi/coll/oplor.c	2009-03-20 22:17:29 UTC (rev 4152)
+++ mpich2/trunk/src/mpi/coll/oplor.c	2009-03-20 22:24:07 UTC (rev 4153)
@@ -51,6 +51,7 @@
         }
         /* expand logicals (which may include MPI_C_BOOL, a non-Fortran type) */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
         /* now revert _HAVE_FORTRAN macro to default */
 #  undef MPIR_OP_TYPE_MACRO_HAVE_FORTRAN
 #  define MPIR_OP_TYPE_MACRO_HAVE_FORTRAN(mpi_type_, c_type_) MPIR_OP_TYPE_MACRO(mpi_type_, c_type_)
@@ -58,6 +59,7 @@
         /* if we don't have Fortran support then we don't have to jump through
            any hoops, simply expand the group */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 #endif
 
         /* extra types that are not required to be supported by the MPI Standard */
@@ -92,6 +94,7 @@
 #define MPIR_OP_TYPE_MACRO(mpi_type_, c_type_) case (mpi_type_):
         MPIR_OP_TYPE_GROUP(C_INTEGER)
         MPIR_OP_TYPE_GROUP(LOGICAL) /* no special handling needed in check_dtype code */
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 
         /* extra types that are not required to be supported by the MPI Standard */
         MPIR_OP_TYPE_GROUP(C_INTEGER_EXTRA)

Modified: mpich2/trunk/src/mpi/coll/oplxor.c
===================================================================
--- mpich2/trunk/src/mpi/coll/oplxor.c	2009-03-20 22:17:29 UTC (rev 4152)
+++ mpich2/trunk/src/mpi/coll/oplxor.c	2009-03-20 22:24:07 UTC (rev 4153)
@@ -51,6 +51,7 @@
         }
         /* expand logicals (which may include MPI_C_BOOL, a non-Fortran type) */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
         /* now revert _HAVE_FORTRAN macro to default */
 #  undef MPIR_OP_TYPE_MACRO_HAVE_FORTRAN
 #  define MPIR_OP_TYPE_MACRO_HAVE_FORTRAN(mpi_type_, c_type_) MPIR_OP_TYPE_MACRO(mpi_type_, c_type_)
@@ -58,6 +59,7 @@
         /* if we don't have Fortran support then we don't have to jump through
            any hoops, simply expand the group */
         MPIR_OP_TYPE_GROUP(LOGICAL)
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 #endif
 
         /* extra types that are not required to be supported by the MPI Standard */
@@ -92,6 +94,7 @@
 #define MPIR_OP_TYPE_MACRO(mpi_type_, c_type_) case (mpi_type_):
         MPIR_OP_TYPE_GROUP(C_INTEGER)
         MPIR_OP_TYPE_GROUP(LOGICAL) /* no special handling needed in check_dtype code */
+        MPIR_OP_TYPE_GROUP(LOGICAL_EXTRA)
 
         /* extra types that are not required to be supported by the MPI Standard */
         MPIR_OP_TYPE_GROUP(C_INTEGER_EXTRA)