[mpich2-commits] r7992 - in mpich2/trunk/test/mpi/f77: coll ext info init
gropp at mcs.anl.gov
gropp at mcs.anl.gov
Sun Feb 20 17:50:10 CST 2011
Author: gropp
Date: 2011-02-20 17:50:10 -0600 (Sun, 20 Feb 2011)
New Revision: 7992
Modified:
mpich2/trunk/test/mpi/f77/coll/reducelocalf.f
mpich2/trunk/test/mpi/f77/ext/Makefile.sm
mpich2/trunk/test/mpi/f77/ext/c2f2c.c
mpich2/trunk/test/mpi/f77/info/Makefile.sm
mpich2/trunk/test/mpi/f77/init/Makefile.sm
Log:
Fixes for the case where MPI_Fint is not the same as int, for the test suite only
Modified: mpich2/trunk/test/mpi/f77/coll/reducelocalf.f
===================================================================
--- mpich2/trunk/test/mpi/f77/coll/reducelocalf.f 2011-02-18 21:57:23 UTC (rev 7991)
+++ mpich2/trunk/test/mpi/f77/coll/reducelocalf.f 2011-02-20 23:50:10 UTC (rev 7992)
@@ -71,7 +71,7 @@
vin(ii) = ii
vout(ii) = ii
enddo
- call mpi_reduce_Local( vin, vout, count,
+ call mpi_reduce_local( vin, vout, count,
& MPI_INTEGER, myop, ierr )
C Check if the result is correct
do ii = 1, count
Modified: mpich2/trunk/test/mpi/f77/ext/Makefile.sm
===================================================================
--- mpich2/trunk/test/mpi/f77/ext/Makefile.sm 2011-02-18 21:57:23 UTC (rev 7991)
+++ mpich2/trunk/test/mpi/f77/ext/Makefile.sm 2011-02-20 23:50:10 UTC (rev 7992)
@@ -23,6 +23,11 @@
# need to add this to get it to appear in ../../f90/ext/Makefile.sm
c2f90mult_LDADD = ../../util/mtest.o
+testing:
+ ../../runtests -srcdir=$(srcdir) -tests=testlist \
+ -mpiexec=$(bindir)/mpiexec \
+ -xmlfile=summary.xml
+
../util/mtestf.o:
(cd ../util && $(MAKE) mtestf.o)
Modified: mpich2/trunk/test/mpi/f77/ext/c2f2c.c
===================================================================
--- mpich2/trunk/test/mpi/f77/ext/c2f2c.c 2011-02-18 21:57:23 UTC (rev 7991)
+++ mpich2/trunk/test/mpi/f77/ext/c2f2c.c 2011-02-20 23:50:10 UTC (rev 7992)
@@ -83,24 +83,24 @@
#endif
/* Prototypes to keep compilers happy */
-int c2fcomm_( int * );
-int c2fgroup_( int * );
-int c2finfo_( int * );
-int c2frequest_( int * );
-int c2ftype_( int * );
-int c2fop_( int * );
-int c2ferrhandler_( int * );
+MPI_Fint c2fcomm_( MPI_Fint * );
+MPI_Fint c2fgroup_( MPI_Fint * );
+MPI_Fint c2finfo_( MPI_Fint * );
+MPI_Fint c2frequest_( MPI_Fint * );
+MPI_Fint c2ftype_( MPI_Fint * );
+MPI_Fint c2fop_( MPI_Fint * );
+MPI_Fint c2ferrhandler_( MPI_Fint * );
-void f2ccomm_( int * );
-void f2cgroup_( int * );
-void f2cinfo_( int * );
-void f2crequest_( int * );
-void f2ctype_( int * );
-void f2cop_( int * );
-void f2cerrhandler_( int * );
+void f2ccomm_( MPI_Fint * );
+void f2cgroup_( MPI_Fint * );
+void f2cinfo_( MPI_Fint * );
+void f2crequest_( MPI_Fint * );
+void f2ctype_( MPI_Fint * );
+void f2cop_( MPI_Fint * );
+void f2cerrhandler_( MPI_Fint * );
-int c2fcomm_ (int *comm)
+MPI_Fint c2fcomm_ (MPI_Fint *comm)
{
MPI_Comm cComm = MPI_Comm_f2c(*comm);
int cSize, wSize, cRank, wRank;
@@ -118,7 +118,7 @@
return 0;
}
-int c2fgroup_ (int *group)
+MPI_Fint c2fgroup_ (MPI_Fint *group)
{
MPI_Group cGroup = MPI_Group_f2c(*group);
int cSize, wSize, cRank, wRank;
@@ -137,7 +137,7 @@
return 0;
}
-int c2ftype_ ( int *type )
+MPI_Fint c2ftype_ ( MPI_Fint *type )
{
MPI_Datatype dtype = MPI_Type_f2c( *type );
@@ -148,12 +148,12 @@
return 0;
}
-int c2finfo_ ( int *info )
+MPI_Fint c2finfo_ ( MPI_Fint *info )
{
MPI_Info cInfo = MPI_Info_f2c( *info );
int flag;
char value[100];
- int errs = 0;
+ MPI_Fint errs = 0;
MPI_Info_get( cInfo, "host", sizeof(value), value, &flag );
if (!flag || strcmp(value,"myname") != 0) {
@@ -169,7 +169,7 @@
return errs;
}
-int c2frequest_ ( int *request )
+MPI_Fint c2frequest_ ( MPI_Fint *request )
{
MPI_Request req = MPI_Request_f2c( *request );
MPI_Status status;
@@ -186,7 +186,7 @@
return 0;
}
-int c2fop_ ( int *op )
+MPI_Fint c2fop_ ( MPI_Fint *op )
{
MPI_Op cOp = MPI_Op_f2c( *op );
@@ -197,7 +197,7 @@
return 0;
}
-int c2ferrhandler_ ( int *errh )
+MPI_Fint c2ferrhandler_ ( MPI_Fint *errh )
{
MPI_Errhandler errhand = MPI_Errhandler_f2c( *errh );
@@ -212,24 +212,24 @@
/*
* The following routines provide handles to the calling Fortran program
*/
-void f2ccomm_( int * comm )
+void f2ccomm_( MPI_Fint * comm )
{
*comm = MPI_Comm_c2f( MPI_COMM_WORLD );
}
-void f2cgroup_( int * group )
+void f2cgroup_( MPI_Fint * group )
{
MPI_Group wgroup;
MPI_Comm_group( MPI_COMM_WORLD, &wgroup );
*group = MPI_Group_c2f( wgroup );
}
-void f2ctype_( int * type )
+void f2ctype_( MPI_Fint * type )
{
*type = MPI_Type_c2f( MPI_INTEGER );
}
-void f2cinfo_( int * info )
+void f2cinfo_( MPI_Fint * info )
{
MPI_Info cinfo;
@@ -240,7 +240,7 @@
*info = MPI_Info_c2f( cinfo );
}
-void f2crequest_( int * req )
+void f2crequest_( MPI_Fint * req )
{
MPI_Request cReq;
@@ -251,12 +251,12 @@
}
-void f2cop_( int * op )
+void f2cop_( MPI_Fint * op )
{
*op = MPI_Op_c2f( MPI_SUM );
}
-void f2cerrhandler_( int *errh )
+void f2cerrhandler_( MPI_Fint *errh )
{
*errh = MPI_Errhandler_c2f( MPI_ERRORS_RETURN );
}
Modified: mpich2/trunk/test/mpi/f77/info/Makefile.sm
===================================================================
--- mpich2/trunk/test/mpi/f77/info/Makefile.sm 2011-02-18 21:57:23 UTC (rev 7991)
+++ mpich2/trunk/test/mpi/f77/info/Makefile.sm 2011-02-20 23:50:10 UTC (rev 7992)
@@ -5,5 +5,10 @@
infotestf_SOURCES = infotestf.f
infotest2f_SOURCES = infotest2f.f
+testing:
+ ../../runtests -srcdir=$(srcdir) -tests=testlist \
+ -mpiexec=$(bindir)/mpiexec \
+ -xmlfile=summary.xml
+
../util/mtestf.o:
(cd ../util && $(MAKE) mtestf.o)
Modified: mpich2/trunk/test/mpi/f77/init/Makefile.sm
===================================================================
--- mpich2/trunk/test/mpi/f77/init/Makefile.sm 2011-02-18 21:57:23 UTC (rev 7991)
+++ mpich2/trunk/test/mpi/f77/init/Makefile.sm 2011-02-20 23:50:10 UTC (rev 7992)
@@ -10,5 +10,10 @@
checksizes_SOURCES = checksizes.c
checksizes_LDADD =
+testing:
+ ../../runtests -srcdir=$(srcdir) -tests=testlist \
+ -mpiexec=$(bindir)/mpiexec \
+ -xmlfile=summary.xml
+
../util/mtestf.o:
(cd ../util && $(MAKE) mtestf.o)
More information about the mpich2-commits
mailing list