[mpich2-commits] r3942 - mpich2/trunk/test/mpi/datatype

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-03-05 14:38:38 -0600 (Thu, 05 Mar 2009)
New Revision: 3942

Added:
   mpich2/trunk/test/mpi/datatype/struct-derived-zeros.c
Removed:
   mpich2/trunk/test/mpi/datatype/hvector-zeros.c
Modified:
   mpich2/trunk/test/mpi/datatype/Makefile.sm
   mpich2/trunk/test/mpi/datatype/testlist
Log:
Rename "hvector-zeros" test to "struct-derived-zeros".

No reviewer.


Modified: mpich2/trunk/test/mpi/datatype/Makefile.sm
===================================================================
--- mpich2/trunk/test/mpi/datatype/Makefile.sm	2009-03-05 20:02:28 UTC (rev 3941)
+++ mpich2/trunk/test/mpi/datatype/Makefile.sm	2009-03-05 20:38:38 UTC (rev 3942)
@@ -64,7 +64,7 @@
 
 pairtype-size-extent_SOURCES = pairtype-size-extent.c
 
-hvector-zeros_SOURCES = hvector-zeros.c
+struct-derived-zeros_SOURCES = struct-derived-zeros.c
 
 localpack_SOURCES = localpack.c
 

Deleted: mpich2/trunk/test/mpi/datatype/hvector-zeros.c
===================================================================
--- mpich2/trunk/test/mpi/datatype/hvector-zeros.c	2009-03-05 20:02:28 UTC (rev 3941)
+++ mpich2/trunk/test/mpi/datatype/hvector-zeros.c	2009-03-05 20:38:38 UTC (rev 3942)
@@ -1,60 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- *  (C) 2001 by Argonne National Laboratory.
- *      See COPYRIGHT in top-level directory.
- */
-/* Based on code from Jeff Parker at IBM. */
-
-#include <stdio.h>
-
-#include <mpi.h>
-
-int main(int argc, char *argv[])
-{
-    MPI_Datatype mystruct, vecs[3];
-    MPI_Aint stride = 5, displs[3];
-    int i=0, blockcount[3];
-
-    MPI_Init(&argc, &argv);
-
-    for(i = 0; i < 3; i++)
-    {
-        MPI_Type_hvector(i, 1, stride, MPI_INT, &vecs[i]);
-        MPI_Type_commit(&vecs[i]);
-        blockcount[i]=1;
-    }
-    displs[0]=0; displs[1]=-100; displs[2]=-200; /* irrelevant */
-
-    MPI_Type_struct(3, blockcount, displs, vecs, &mystruct);
-    MPI_Type_commit(&mystruct);
-
-    MPI_Type_free(&mystruct);
-    for(i = 0; i < 3; i++)
-    {
-        MPI_Type_free(&vecs[i]);
-    }
-
-    /* this time with the first argument always 0 */
-    for(i = 0; i < 3; i++)
-    {
-        MPI_Type_hvector(0, 1, stride, MPI_INT, &vecs[i]);
-        MPI_Type_commit(&vecs[i]);
-        blockcount[i]=1;
-    }
-    displs[0]=0; displs[1]=-100; displs[2]=-200; /* irrelevant */
-
-    MPI_Type_struct(3, blockcount, displs, vecs, &mystruct);
-    MPI_Type_commit(&mystruct);
-
-    MPI_Type_free(&mystruct);
-    for(i = 0; i < 3; i++)
-    {
-        MPI_Type_free(&vecs[i]);
-    }
-    printf(" No Errors\n");
-
-    MPI_Finalize();
-
-    return 0;
-}
-

Copied: mpich2/trunk/test/mpi/datatype/struct-derived-zeros.c (from rev 3941, mpich2/trunk/test/mpi/datatype/hvector-zeros.c)
===================================================================
--- mpich2/trunk/test/mpi/datatype/struct-derived-zeros.c	                        (rev 0)
+++ mpich2/trunk/test/mpi/datatype/struct-derived-zeros.c	2009-03-05 20:38:38 UTC (rev 3942)
@@ -0,0 +1,60 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ *  (C) 2001 by Argonne National Laboratory.
+ *      See COPYRIGHT in top-level directory.
+ */
+/* Based on code from Jeff Parker at IBM. */
+
+#include <stdio.h>
+
+#include <mpi.h>
+
+int main(int argc, char *argv[])
+{
+    MPI_Datatype mystruct, vecs[3];
+    MPI_Aint stride = 5, displs[3];
+    int i=0, blockcount[3];
+
+    MPI_Init(&argc, &argv);
+
+    for(i = 0; i < 3; i++)
+    {
+        MPI_Type_hvector(i, 1, stride, MPI_INT, &vecs[i]);
+        MPI_Type_commit(&vecs[i]);
+        blockcount[i]=1;
+    }
+    displs[0]=0; displs[1]=-100; displs[2]=-200; /* irrelevant */
+
+    MPI_Type_struct(3, blockcount, displs, vecs, &mystruct);
+    MPI_Type_commit(&mystruct);
+
+    MPI_Type_free(&mystruct);
+    for(i = 0; i < 3; i++)
+    {
+        MPI_Type_free(&vecs[i]);
+    }
+
+    /* this time with the first argument always 0 */
+    for(i = 0; i < 3; i++)
+    {
+        MPI_Type_hvector(0, 1, stride, MPI_INT, &vecs[i]);
+        MPI_Type_commit(&vecs[i]);
+        blockcount[i]=1;
+    }
+    displs[0]=0; displs[1]=-100; displs[2]=-200; /* irrelevant */
+
+    MPI_Type_struct(3, blockcount, displs, vecs, &mystruct);
+    MPI_Type_commit(&mystruct);
+
+    MPI_Type_free(&mystruct);
+    for(i = 0; i < 3; i++)
+    {
+        MPI_Type_free(&vecs[i]);
+    }
+    printf(" No Errors\n");
+
+    MPI_Finalize();
+
+    return 0;
+}
+

Modified: mpich2/trunk/test/mpi/datatype/testlist
===================================================================
--- mpich2/trunk/test/mpi/datatype/testlist	2009-03-05 20:02:28 UTC (rev 3941)
+++ mpich2/trunk/test/mpi/datatype/testlist	2009-03-05 20:38:38 UTC (rev 3942)
@@ -37,4 +37,4 @@
 unpack 1
 struct-ezhov 1
 zeroblks 1
-hvector-zeros 1
+struct-derived-zeros 1