Changeset 2f6525

Timestamp:

May 24, 2008, 12:32:32 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

35051f

Parents:

44fa6a

Message:

new MPI autoconf macro installed and changed lines in configure.ac

MPICC was set to CC which caused trouble, when different gcc version had to be used (core2 optimization). As standard mpicc is just a link to gcc with mpi headers included, in the new manner, this can easily be acounted for

Location:

pcp

Files:

• configure.ac (modified) (1 diff)
• m4/acx_mpi.m4 (modified) (5 diffs)

pcp/configure.ac

@@ -21 +21 @@
 dnl Check for MPI-Routines
 AC_ARG_ENABLE([mpi],
-              AS_HELP_STRING([--enable-mpi],[build MPI parallel version (default is yes if MPI code can be compiled)]),
-              [enable_mpi=$enableval], [enable_mpi=maybe])
+              AC_HELP_STRING([--enable-mpi],
+                             [build MPI parallel version
+                              (default is yes if MPI code can be compiled)]),
+              [enable_mpi=$enableval], [enable_mpi=maybe])
 disabled_msg="MPI version disabled."
 if test x"$enable_mpi" = xyes -o x"$enable_mpi" = xmaybe
 then
-        AC_MSG_NOTICE([checking for MPI features])
-        ACX_MPI([enable_mpi=yes
-                 CC=mpicc
-                 CXX=mpicxx],
-                [err_msg="cannot find out how to compile MPI code."
-                 if test x"$enable_mpi" = xyes
-                 then
-                         AC_MSG_ERROR([$err_msg])
-                 else
-                         AC_MSG_WARN([$err_msg $disabled_msg])
-                         enable_mpi=no
-                 fi])
+        AC_MSG_NOTICE([checking for MPI features])
+        ACX_MPI([enable_mpi=yes],
+                [err_msg="cannot find out how to compile MPI code."
+                 if test x"$enable_mpi" = xyes
+                 then
+                         AC_MSG_ERROR([$err_msg])
+                 else
+                         AC_MSG_WARN([$err_msg $disabled_msg])
+                         enable_mpi=no
+                 fi])
 else
-        AC_MSG_NOTICE([$disabled_msg])
+        AC_MSG_NOTICE([$disabled_msg])
 fi
-#AC_ARG_VAR([MPILIBS],[necessary libraries to link MPI C code])
+AC_ARG_VAR([MPILIBS],[necessary libraries to link MPI C code])
+AC_ARG_VAR([MPICC],[necessary comnpiler for MPI C code])
 AM_CONDITIONAL([MPIVER], [test x"$enable_mpi" = xyes])
 

pcp/m4/acx_mpi.m4

@@ -25 +25 @@
 dnl the default action will define HAVE_MPI.
 dnl
-dnl @version $Id: acx_mpi.m4,v 1.1.1.1 2007-09-03 16:17:11 heber Exp $
-dnl @author Steven G. Johnson <address@hidden>
+dnl @version $Id: acx_mpi.m4,v 1.2 2004-01-02 14:51:12 wildenhu Exp $
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
 
 AC_DEFUN([ACX_MPI], [
@@ -34 +34 @@
         AC_REQUIRE([AC_PROG_CC])
         AC_ARG_VAR(MPICC,[MPI C compiler command])
-        AC_CHECK_PROGS(MPICC, mpicc hcc mpcc mpcc_r mpxlc cmpicc, $CC)
+        AC_CHECK_PROGS(MPICC, mpicc hcc mpcc mpcc_r mpxlc, $CC)
         acx_mpi_save_CC="$CC"
         CC="$MPICC"
@@ -42 +42 @@
         AC_REQUIRE([AC_PROG_CXX])
         AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
-        AC_CHECK_PROGS(MPICXX, mpic++ mpiCC mpCC hcp mpxlC mpxlC_r cmpic++, $CXX)
+        AC_CHECK_PROGS(MPICXX, mpiCC mpCC hcp mpic++, $CXX)
         acx_mpi_save_CXX="$CXX"
         CXX="$MPICXX"
@@ -50 +50 @@
         AC_REQUIRE([AC_PROG_F77])
         AC_ARG_VAR(MPIF77,[MPI Fortran compiler command])
-        AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c, $F77)
+        AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r, $F77)
         acx_mpi_save_F77="$F77"
         F77="$MPIF77"
@@ -82 +82 @@
                 AC_MSG_RESULT(no)])
 fi])
+dnl There are b0rked implementations that '#define main mpi_main' in their mpi.h
+dnl which will cause all tests above to fail miserably (e.g. MPICH-SCore).
+dnl TODO: prototype checking, exit instead of return from main, test C++, implement F77.
+dnl TODO: use the information already gathered...
+if test x = x"$MPILIBS"; then
+        AC_MSG_CHECKING([for last resort: compile and link a small MPI test program])
+        AC_LANG_CASE([C], [AC_LINK_IFELSE([#include <mpi.h>
+int main(int argc, char **argv)
+{
+  MPI_Init(&argc, &argv);
+  return 0;
+}
+                        ], [MPILIBS=" "
+                AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])],
+                [C++], [AC_LINK_IFELSE([#include <mpi.h>
+int main(int argc, char **argv)
+{
+  MPI_Init(&argc, &argv);
+  return 0;
+}
+                        ], [MPILIBS=" "
+                AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])],
+                [Fortran 77], [])
+fi
 
 AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"],