Changeset 5688

Timestamp:

11/04/09 14:48:36 (3 weeks ago)

Author:

chan

Message:

added count=0 case for both C and forttran version of reduce_local test.

Location:

mpich2/trunk/test/mpi

Files:

• coll/reduce_local.c (modified) (2 diffs)
• f77/coll/reducelocalf.f (modified) (3 diffs)

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

@@ -52 +52 @@
     inoutbuf = malloc(sizeof(int) * MAX_BUF_ELEMENTS);
 
-
-    for (count = 1; count < MAX_BUF_ELEMENTS; count *= 2) {
+    for (count = 0; count < MAX_BUF_ELEMENTS; count > 0 ? count*=2 : count++) {
         for (i = 0; i < count; ++i) {
             inbuf[i] = i;
@@ -69 +68 @@
     /* make sure that user-define ops work too */
     MPI_Op_create(&user_op, 0/*!commute*/, &uop);
-    for (count = 1; count < MAX_BUF_ELEMENTS; count *= 2) {
+    for (count = 0; count < MAX_BUF_ELEMENTS; count > 0 ? count*=2 : count++) {
         for (i = 0; i < count; ++i) {
             inbuf[i] = i;

mpich2/trunk/test/mpi/f77/coll/reducelocalf.f

@@ -40 +40 @@
       call mtest_init(ierr)
 
-      count = 1
+      count = 0
       do while (count .le. max_buf_size )
          do ii = 1,count
@@ -57 +57 @@
             endif
          enddo 
-         count = count + count
+         if ( count .gt. 0 ) then
+            count = count + count
+         else
+            count = 1
+         endif
       enddo
 
       call mpi_op_create( user_op, .false., myop, ierr )
 
-      count = 1
+      count = 0
       do while (count .le. max_buf_size) 
          do ii = 1, count
@@ -79 +83 @@
             endif
          enddo
-         count = count + count
+         if ( count .gt. 0 ) then
+            count = count + count
+         else
+            count = 1
+         endif
       enddo