|
From: <sv...@va...> - 2007-01-06 05:28:32
|
Author: sewardj
Date: 2007-01-06 05:28:27 +0000 (Sat, 06 Jan 2007)
New Revision: 6477
Log:
Fixes for MPICH on amd64-linux.
Modified:
trunk/auxprogs/libmpiwrap.c
Modified: trunk/auxprogs/libmpiwrap.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/libmpiwrap.c 2007-01-06 00:13:43 UTC (rev 6476)
+++ trunk/auxprogs/libmpiwrap.c 2007-01-06 05:28:27 UTC (rev 6477)
@@ -83,11 +83,14 @@
#include "mpi.h"
=20
/* Where are API symbols?
- Open MPI lib/libmpi.so, soname =3D libmpi.so.0
+ Open MPI lib/libmpi.so, soname =3D libmpi.so.0
+ Quadrics MPI lib/libmpi.so, soname =3D libmpi.so.0
+ MPICH libmpich.so.1.0, soname =3D libmpich.so.1.0
AIX: in /usr/lpp/ppe.poe/lib/libmpi_r.a(mpicore*_r.o)
- ditto Quadrics MPI
+
+ For the non-AIX targets, a suitable soname to match with
+ is "libmpi*.so*".
*/
-/* ifdef OpenMPI ... */
#if defined(_AIX)
# define I_WRAP_FNNAME_U(_name) \
I_WRAP_SONAME_FNNAME_ZU(libmpiZurZdaZLmpicoreZaZurZdoZR,_name)
@@ -95,7 +98,7 @@
libmpiwrap.exp. */
#else
# define I_WRAP_FNNAME_U(_name) \
- I_WRAP_SONAME_FNNAME_ZU(libmpiZdsoZa,_name)
+ I_WRAP_SONAME_FNNAME_ZU(libmpiZaZdsoZa,_name)
=20
#endif
=20
@@ -521,7 +524,7 @@
MPI_Datatype* dtys =3D NULL;
=20
if (0)
- printf("walk_type %p\n", (void*)ty);
+ printf("walk_type %p\n", (void*)(unsigned long)ty);
=20
r =3D PMPI_Type_get_envelope( ty, &n_ints, &n_addrs, &n_dtys, &tycon =
);
assert(r =3D=3D MPI_SUCCESS);
|