[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-26-gb1820e5
Service Account
noreply at mpich.org
Thu Apr 30 12:22:26 CDT 2015
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 b1820e5527045e5ea9c2b11d088615bdbf87dcfa (commit)
via 8f1763f994443106397ec72dc74195d61e03103d (commit)
from 66b5407abfad38afd96cb3c71c1c99aaad2bd648 (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/b1820e5527045e5ea9c2b11d088615bdbf87dcfa
commit b1820e5527045e5ea9c2b11d088615bdbf87dcfa
Author: Jeff Hammond <jeff.science at gmail.com>
Date: Wed Apr 22 09:12:48 2015 -0700
add comments and double precision cases
Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>
diff --git a/test/mpi/f90/f90types/createf90types.c b/test/mpi/f90/f90types/createf90types.c
index 641b63a..7fdf1ab 100644
--- a/test/mpi/f90/f90types/createf90types.c
+++ b/test/mpi/f90/f90types/createf90types.c
@@ -11,7 +11,8 @@
#include <string.h>
#include "mpitest.h"
-static int cases[3][2] = {{3,10},{3,MPI_UNDEFINED},{MPI_UNDEFINED,10}};
+static int cases[6][2] = {{3,10},{3,MPI_UNDEFINED},{MPI_UNDEFINED,10},
+ {7,30},{7,MPI_UNDEFINED},{MPI_UNDEFINED,30}};
/*
static char MTEST_Descrip[] = "Test the routines to access the Fortran 90 datatypes from C";
@@ -149,16 +150,16 @@ int main( int argc, char *argv[] )
for (i=0; i<nLoop; i++) {
- /* These should be a valid type similar to MPI_REAL */
- for (j=0; j<3; j++) {
+ /* These should be a valid type similar to MPI_REAL and MPI_REAL8 */
+ for (j=0; j<6; j++) {
p = cases[j][0];
r = cases[j][1];
err = MPI_Type_create_f90_real( p, r, &newtype );
errs += checkType( "REAL", p, r, MPI_COMBINER_F90_REAL, err, newtype );
}
- /* These should be a valid type similar to MPI_COMPLEX */
- for (j=0; j<3; j++) {
+ /* These should be a valid type similar to MPI_COMPLEX and MPI_COMPLEX8 */
+ for (j=0; j<6; j++) {
p = cases[j][0];
r = cases[j][1];
err = MPI_Type_create_f90_complex( p, r, &newtype );
http://git.mpich.org/mpich.git/commitdiff/8f1763f994443106397ec72dc74195d61e03103d
commit 8f1763f994443106397ec72dc74195d61e03103d
Author: Jeff Hammond <jeff.science at gmail.com>
Date: Wed Apr 22 09:09:53 2015 -0700
compress test cases with loop
Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>
diff --git a/test/mpi/f90/f90types/createf90types.c b/test/mpi/f90/f90types/createf90types.c
index 864e40f..641b63a 100644
--- a/test/mpi/f90/f90types/createf90types.c
+++ b/test/mpi/f90/f90types/createf90types.c
@@ -11,6 +11,8 @@
#include <string.h>
#include "mpitest.h"
+static int cases[3][2] = {{3,10},{3,MPI_UNDEFINED},{MPI_UNDEFINED,10}};
+
/*
static char MTEST_Descrip[] = "Test the routines to access the Fortran 90 datatypes from C";
*/
@@ -132,7 +134,7 @@ int main( int argc, char *argv[] )
int p, r;
int errs = 0;
int err;
- int i, nLoop = 1;
+ int i, j, nLoop = 1;
MPI_Datatype newtype;
MTest_Init(0,0);
@@ -146,42 +148,27 @@ int main( int argc, char *argv[] )
MPI_Comm_set_errhandler( MPI_COMM_WORLD, MPI_ERRORS_RETURN );
for (i=0; i<nLoop; i++) {
- /* printf( "+" );fflush(stdout); */
- /* This should be a valid type similar to MPI_REAL */
- p = 3;
- r = 10;
- err = MPI_Type_create_f90_real( p, r, &newtype );
- errs += checkType( "REAL", p, r, MPI_COMBINER_F90_REAL, err, newtype );
-
- r = MPI_UNDEFINED;
- err = MPI_Type_create_f90_real( p, r, &newtype );
- errs += checkType( "REAL", p, r, MPI_COMBINER_F90_REAL, err, newtype );
-
- p = MPI_UNDEFINED;
- r = 10;
- err = MPI_Type_create_f90_real( p, r, &newtype );
- errs += checkType( "REAL", p, r, MPI_COMBINER_F90_REAL, err, newtype );
+
+ /* These should be a valid type similar to MPI_REAL */
+ for (j=0; j<3; j++) {
+ p = cases[j][0];
+ r = cases[j][1];
+ err = MPI_Type_create_f90_real( p, r, &newtype );
+ errs += checkType( "REAL", p, r, MPI_COMBINER_F90_REAL, err, newtype );
+ }
- /* This should be a valid type similar to MPI_COMPLEX */
- p = 3;
- r = 10;
- err = MPI_Type_create_f90_complex( p, r, &newtype );
- errs += checkType( "COMPLEX", p, r, MPI_COMBINER_F90_COMPLEX,
- err, newtype );
-
- r = MPI_UNDEFINED;
- err = MPI_Type_create_f90_complex( p, r, &newtype );
- errs += checkType( "COMPLEX", p, r, MPI_COMBINER_F90_COMPLEX,
- err, newtype );
-
- p = MPI_UNDEFINED;
- r = 10;
- err = MPI_Type_create_f90_complex( p, r, &newtype );
- errs += checkType( "COMPLEX", p, r, MPI_COMBINER_F90_COMPLEX,
- err, newtype );
+ /* These should be a valid type similar to MPI_COMPLEX */
+ for (j=0; j<3; j++) {
+ p = cases[j][0];
+ r = cases[j][1];
+ err = MPI_Type_create_f90_complex( p, r, &newtype );
+ errs += checkType( "COMPLEX", p, r, MPI_COMBINER_F90_COMPLEX,
+ err, newtype );
+ }
/* This should be a valid type similar to MPI_INTEGER */
p = 3;
+ r = 10;
err = MPI_Type_create_f90_integer( p, &newtype );
errs += checkType( "INTEGER", p, r, MPI_COMBINER_F90_INTEGER,
err, newtype );
-----------------------------------------------------------------------
Summary of changes:
test/mpi/f90/f90types/createf90types.c | 54 ++++++++++++-------------------
1 files changed, 21 insertions(+), 33 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list