Changeset 5675

Timestamp:

11/03/09 13:26:50 (3 weeks ago)

Author:

goodell

Message:

Fixes for MPI_Reduce_local and the reduce_local test.

Anthony noticed multiple serious problems in the reduce_local test. The
most important was that it wasn't even being built and run!

No reviewer.

Location:

mpich2/trunk

Files:

• src/mpi/coll/reduce_local.c (modified) (1 diff)
• test/mpi/coll/reduce_local.c (modified) (3 diffs)
• test/mpi/coll/testlist (modified) (1 diff)

mpich2/trunk/src/mpi/coll/reduce_local.c

@@ -138 +138 @@
         (*uop)(inbuf, inoutbuf, &count, &datatype);
     }
+
+    /* --BEGIN ERROR HANDLING-- */
+    if (MPIU_THREADPRIV_FIELD(op_errno))
+        mpi_errno = MPIU_THREADPRIV_FIELD(op_errno);
+    /* --END ERROR HANDLING-- */
+
     /* ... end of body of routine ... */
 
   fn_exit:
-    if (MPIU_THREADPRIV_FIELD(op_errno))
-        mpi_errno = MPIU_THREADPRIV_FIELD(op_errno);
-
     MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_REDUCE_LOCAL);
     MPIU_THREAD_CS_EXIT(ALLFUNC,);

mpich2/trunk/test/mpi/coll/reduce_local.c

@@ -53 +53 @@
 
 
-    for (count = 0; count < MAX_BUF_ELEMENTS; count *= 2) {
+    for (count = 0; count < MAX_BUF_ELEMENTS; count = (count*2)+1) {
         for (i = 0; i < count; ++i) {
-            inbuf = i;
+            inbuf[i] = i;
             inoutbuf[i] = i;
         }
-        MPI_Reduce_local(inbuf, inoutbuf, count, MPI_INT, MPI_OP_SUM);
+        MPI_Reduce_local(inbuf, inoutbuf, count, MPI_INT, MPI_SUM);
         for (i = 0; i < count; ++i)
             if (inbuf[i] != i) {
@@ -69 +69 @@
     /* make sure that user-define ops work too */
     MPI_Op_create(&user_op, 0/*!commute*/, &uop);
-    for (count = 0; count < MAX_BUF_ELEMENTS; count *= 2) {
+    for (count = 0; count < MAX_BUF_ELEMENTS; count = (count*2)+1) {
         for (i = 0; i < count; ++i) {
-            inbuf = i;
+            inbuf[i] = i;
             inoutbuf[i] = i;
         }
@@ -83 +83 @@
         }
     }
-    MPI_Op_free(&user_op);
+    MPI_Op_free(&uop);
 
     free(inbuf);

mpich2/trunk/test/mpi/coll/testlist

@@ -8 +8 @@
 red3 10
 red4 10
+reduce_local 1
 alltoall1 8
 alltoallv 10