[MOAB-dev] r3255 - in MOAB/trunk: . m4 parallel refiner tools tools/iMesh tools/mbcoupler tools/mbzoltan
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Mon Nov 2 13:55:20 CST 2009
Author: kraftche
Date: 2009-11-02 13:55:16 -0600 (Mon, 02 Nov 2009)
New Revision: 3255
Added:
MOAB/trunk/m4/mpi.m4
MOAB/trunk/parallel/MBmpi.h
MOAB/trunk/parallel/MBmpi_config.h.in
Modified:
MOAB/trunk/MBCore.cpp
MOAB/trunk/ReadHDF5.hpp
MOAB/trunk/Tqdcfr.cpp
MOAB/trunk/configure.ac
MOAB/trunk/parallel/MBParallelComm.cpp
MOAB/trunk/parallel/MBParallelComm.hpp
MOAB/trunk/parallel/MBProcConfig.hpp
MOAB/trunk/parallel/WriteHDF5Parallel.cpp
MOAB/trunk/parallel/WriteHDF5Parallel.hpp
MOAB/trunk/parallel/crystal.c
MOAB/trunk/parallel/fcrystal.c
MOAB/trunk/parallel/gs.c
MOAB/trunk/parallel/mbparallelcomm_test.cpp
MOAB/trunk/parallel/parallel_hdf5_test.cc
MOAB/trunk/parallel/parallel_unit_tests.cpp
MOAB/trunk/parallel/parallel_write_test.cc
MOAB/trunk/parallel/pcomm_unit.cpp
MOAB/trunk/parallel/transfer.c
MOAB/trunk/parallel/uber_parallel_test.cpp
MOAB/trunk/refiner/MBMeshRefiner.cpp
MOAB/trunk/refiner/test_mesh_refiner.cpp
MOAB/trunk/tools/Makefile.am
MOAB/trunk/tools/convert.cpp
MOAB/trunk/tools/iMesh/iMeshP.h
MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp
MOAB/trunk/tools/iMesh/iMeshP_unit_tests.cpp
MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
MOAB/trunk/tools/iMesh/partest.cpp
MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
Log:
o Move MPI configuration macros to a separate file
o Change all #includes of mpi.h to include MBmpi.h instead
o Put better configure logic about handling of conflicts between symbols
in the MPI C++ API and the standard C IO headers into MBmpi.h:
- If not C++, just include mpi.h
- If it works, just include mpi.h
- Otherwise define MPICH_CXX_IGNORE_SEEK, if that helps
- Otherwise do old #undef games so that at least the C
API is usable.
Modified: MOAB/trunk/MBCore.cpp
===================================================================
--- MOAB/trunk/MBCore.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/MBCore.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -47,7 +47,7 @@
* because its C++ headers do not like SEEK_* macros.
*/
#include "MBParallelComm.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#include "ReadParallel.hpp"
#endif
Modified: MOAB/trunk/ReadHDF5.hpp
===================================================================
--- MOAB/trunk/ReadHDF5.hpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/ReadHDF5.hpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -25,6 +25,9 @@
#include <stdlib.h>
#include <list>
+#ifdef USE_MPI
+# include "MBmpi.h"
+#endif
#include "mhdf.h"
#include "MBForward.hpp"
#include "MBReadUtilIface.hpp"
Modified: MOAB/trunk/Tqdcfr.cpp
===================================================================
--- MOAB/trunk/Tqdcfr.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/Tqdcfr.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -26,7 +26,7 @@
#include "exodus_order.h"
#ifdef USE_MPI
-#include "mpi.h"
+#include "MBmpi.h"
#endif
#include <iostream>
Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/configure.ac 2009-11-02 19:55:16 UTC (rev 3255)
@@ -158,42 +158,15 @@
# MPI OPTIONS
################################################################################
-AC_ARG_VAR(MPIEXEC,[Program to use to run parallel tests (default: mpiexec or mpirun)])
-AC_ARG_VAR(MPIEXEC_NP,[Command line flag to specify number of processors to use (default: -np)])
-AC_ARG_VAR(NP,[Number of processors to on which to run parallel tests (default: 2)])
-if test "x$WITH_MPI" != "xno"; then
- DEFINES="$DEFINES -DUSE_MPI"
- AC_CHECK_HEADER([mpi.h],[],[AC_MSG_ERROR([mpi.h not found or not working])])
- AC_MSG_CHECKING([If -DMPICH_IGNORE_CXX_SEEK is necessary])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM( [[#include <stdio.h>
- #include <mpi.h>]],[])],
- [AC_MSG_RESULT([no])],
- [save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -DMPICH_IGNORE_CXX_SEEK"
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM( [[#include <stdio.h>
- #include <mpi.h>]],[])],
- [AC_MSG_RESULT([yes]); AM_CPPFLAGS="$AM_CPPLFLAGS -DMPICH_IGNORE_CXX_SEEK" ],
- [AC_MSG_ERROR([mpi.h is not usable])]),
- CPPFLAGS="$save_CPPFLAGS"])
- AC_LANG_RESTORE
- if test "x$MPIEXEC" = "x"; then
- if test "x$WITH_MPI" != "xyes"; then
- AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true],[${WITH_MPI}:${WITH_MPI}/bin])
- else
- AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true])
- fi
- fi
- if test "x$MPIEXEC_NP" = "x"; then
- MPIEXEC_NP="-np"
- fi
- if test "x$NP" = "x"; then
- NP=2
- fi
-fi
+FATHOM_CHECK_MPI
+FATHOM_CONFIG_MPI_EXEC
+test "xyes" != "x$WITH_MPI" || DEFINES="$DEFINES -DUSE_MPI"
AM_CONDITIONAL(USE_MPI, [test "xno" != "x$WITH_MPI"])
-AM_CONDITIONAL(USE_MPIEXEC, [test "x$MPIEXEC" != "xtrue"])
+# Used to generate MBmpi.h
+if test "xyes" = "x$MPI_CXX_HELP_NEEDED"; then
+ AC_DEFINE( [MB_MPI_CXX_CONFLICT], [1],
+ [MPICH_IGNORE_CXX_SEEK is not sufficient to avoid conflicts] )
+fi
################################################################################
# Python
@@ -1047,8 +1020,7 @@
AC_ARG_VAR([FC], [FORTRAN compiler command])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([MBVersion.h])
-AC_CONFIG_HEADERS([MBEntityHandle.h])
+AC_CONFIG_HEADERS([MBVersion.h MBEntityHandle.h parallel/MBmpi_config.h])
AC_CONFIG_HEADERS([iBase_FCDefs.h])
AC_CONFIG_FILES([Makefile
moab.make
Added: MOAB/trunk/m4/mpi.m4
===================================================================
--- MOAB/trunk/m4/mpi.m4 (rev 0)
+++ MOAB/trunk/m4/mpi.m4 2009-11-02 19:55:16 UTC (rev 3255)
@@ -0,0 +1,65 @@
+# Macros for MPI configuration.
+
+# NOTE: The macro to enable/disable MPI support entirely is
+# in compilers.m4, as it also affects the choice of compiler.
+# That code is expected to have set WITH_MPI to either 'yes',
+# 'no' or the directory where MPI is installed BEFORE these
+# macros are called.
+
+# Options and configuration for mpiexec. Sets
+# the following variables:
+# USE_MPIEXEC - AM_CONDITIONAL, true if MPIEXEC is valid
+# MPIEXEC - mpiexec binary
+# MPIEXEC_NP - mpiexec CLI flag to specify number of procs (e.g. '-np')
+# NP - number of procs to use during testing
+AC_DEFUN([FATHOM_CONFIG_MPI_EXEC],[
+ AC_ARG_VAR(MPIEXEC,[Program to use to run parallel tests (default: mpiexec or mpirun)])
+ AC_ARG_VAR(MPIEXEC_NP,[Command line flag to specify number of processors to use (default: -np)])
+ AC_ARG_VAR(NP,[Number of processors to on which to run parallel tests (default: 2)])
+ if test "x$WITH_MPI" != "xno"; then
+ if test "x$MPIEXEC" = "x"; then
+ if test "x$WITH_MPI" != "xyes"; then
+ AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true],[${WITH_MPI}:${WITH_MPI}/bin])
+ else
+ AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true])
+ fi
+ fi
+ if test "x$MPIEXEC_NP" = "x"; then
+ MPIEXEC_NP="-np"
+ fi
+ if test "x$NP" = "x"; then
+ NP=2
+ fi
+ fi
+ AM_CONDITIONAL(USE_MPIEXEC, [test "xtrue" != "x$MPIEXEC"])
+])
+
+# Check for MPI library and MPI.h
+# Error if not found.
+# Defines MPI_CXX_HELP_NEEDED to yes if, when parsed with a c++ compiler,
+# mpi.h conflicts with the C standard library for the definition of SEEK_SET,
+# etc. and defining MPICH_IGNORE_CXX_SEEK is not sufficient to work around
+# the problem.
+AC_DEFUN([FATHOM_CHECK_MPI], [
+ if test "x$WITH_MPI" != "xno"; then
+ AC_LANG_PUSH([C])
+ AC_CHECK_HEADER([mpi.h],[],[AC_MSG_ERROR([mpi.h not found or not working])])
+ AC_LANG_POP([C])
+
+ AC_MSG_CHECKING([If mpi.h conflicts with C headers in C++])
+ AC_LANG_PUSH([C++])
+ AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <stdio.h>
+ #include <mpi.h>],[])],
+ [MPI_CXX_HELP_NEEDED=no; AC_MSG_RESULT([no])],
+ [AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <stdio.h>
+ #define MPICH_IGNORE_CXX_SEEK
+ #include <mpi.h>],[])],
+ [MPI_CXX_HELP_NEEDED=no; AC_MSG_RESULT([MPICH_IGNORE_CXX_SEEK])],
+ [MPI_CXX_HELP_NEEDED=yes; AC_MSG_RESULT([yes])])
+ ])
+ AC_LANG_POP([C++])
+ fi
+])
+
Modified: MOAB/trunk/parallel/MBParallelComm.cpp
===================================================================
--- MOAB/trunk/parallel/MBParallelComm.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/MBParallelComm.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -40,7 +40,7 @@
}
#ifdef USE_MPI
-#include "mpi.h"
+#include "MBmpi.h"
#endif
const unsigned int INITIAL_BUFF_SIZE = 1024;
Modified: MOAB/trunk/parallel/MBParallelComm.hpp
===================================================================
--- MOAB/trunk/parallel/MBParallelComm.hpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/MBParallelComm.hpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -33,37 +33,8 @@
#include <set>
#include <vector>
#include "math.h"
+#include "MBmpi.h"
-#ifdef SEEK_SET
-# define SEEK_SET_OLD SEEK_SET
-# undef SEEK_SET
-#endif
-#ifdef SEEK_CUR
-# define SEEK_CUR_OLD SEEK_CUR
-# undef SEEK_CUR
-#endif
-#ifdef SEEK_END
-# define SEEK_END_OLD SEEK_END
-# undef SEEK_END
-#endif
-#include "mpi.h"
-#ifdef SEEK_SET_OLD
-# undef SEEK_SET
-# define SEEK_SET SEEK_SET_OLD
-# undef SEEK_SET_OLD
-#endif
-#ifdef SEEK_CUR_OLD
-# undef SEEK_CUR
-# define SEEK_CUR SEEK_CUR_OLD
-# undef SEEK_CUR_OLD
-#endif
-#ifdef SEEK_END_OLD
-# undef SEEK_END
-# define SEEK_END SEEK_END_OLD
-# undef SEEK_END_OLD
-#endif
-
-
extern "C" {
struct tuple_list;
}
Modified: MOAB/trunk/parallel/MBProcConfig.hpp
===================================================================
--- MOAB/trunk/parallel/MBProcConfig.hpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/MBProcConfig.hpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -23,28 +23,7 @@
#ifdef USE_MPI
-/* MPICH2 will fail if SEEK_* macros are defined
- * because they are also C++ enums. Undefine them
- * when including mpi.h and then redefine them
- * for sanity.
- */
-# ifdef SEEK_SET
-# define MB_SEEK_SET SEEK_SET
-# define MB_SEEK_CUR SEEK_CUR
-# define MB_SEEK_END SEEK_END
-# undef SEEK_SET
-# undef SEEK_CUR
-# undef SEEK_END
-# endif
-#include "mpi.h"
-# ifdef MB_SEEK_SET
-# define SEEK_SET MB_SEEK_SET
-# define SEEK_CUR MB_SEEK_CUR
-# define SEEK_END MB_SEEK_END
-# undef MB_SEEK_SET
-# undef MB_SEEK_CUR
-# undef MB_SEEK_END
-# endif
+#include "MBmpi.h"
extern "C"
{
#include "types.h"
Added: MOAB/trunk/parallel/MBmpi.h
===================================================================
--- MOAB/trunk/parallel/MBmpi.h (rev 0)
+++ MOAB/trunk/parallel/MBmpi.h 2009-11-02 19:55:16 UTC (rev 3255)
@@ -0,0 +1,35 @@
+/* MBmpi.h. Generated from MBmpi.h.in by configure. */
+#ifndef MB_MPI_H
+#define MB_MPI_H
+#include "MBmpi_config.h"
+
+#ifndef __cplusplus
+# include <mpi.h>
+#elif !defined(MB_MPI_CXX_CONFLICT)
+# ifndef MPICH_IGNORE_CXX_SEEK
+# define MPICH_IGNORE_CXX_SEEK
+# endif
+# include <mpi.h>
+#else
+# include <stdio.h>
+# ifdef SEEK_SET
+# define MB_SEEK_SET SEEK_SET
+# define MB_SEEK_CUR SEEK_CUR
+# define MB_SEEK_END SEEK_END
+# undef SEEK_SET
+# undef SEEK_CUR
+# undef SEEK_END
+# endif
+# include <mpi.h>
+# ifdef MB_SEEK_SET
+# define SEEK_SET MB_SEEK_SET
+# define SEEK_CUR MB_SEEK_CUR
+# define SEEK_END MB_SEEK_END
+# undef MB_SEEK_SET
+# undef MB_SEEK_CUR
+# undef MB_SEEK_END
+# endif
+#endif
+
+
+#endif
Added: MOAB/trunk/parallel/MBmpi_config.h.in
===================================================================
--- MOAB/trunk/parallel/MBmpi_config.h.in (rev 0)
+++ MOAB/trunk/parallel/MBmpi_config.h.in 2009-11-02 19:55:16 UTC (rev 3255)
@@ -0,0 +1,2 @@
+/* MPICH_IGNORE_CXX_SEEK is not sufficient to avoid conflicts */
+#undef MB_MPI_CXX_CONFLICT
Modified: MOAB/trunk/parallel/WriteHDF5Parallel.cpp
===================================================================
--- MOAB/trunk/parallel/WriteHDF5Parallel.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/WriteHDF5Parallel.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -22,7 +22,7 @@
#include <iostream>
#include <sstream>
-#include <mpi.h>
+#include "MBmpi.h"
#include <H5Tpublic.h>
#include <H5Ppublic.h>
Modified: MOAB/trunk/parallel/WriteHDF5Parallel.hpp
===================================================================
--- MOAB/trunk/parallel/WriteHDF5Parallel.hpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/WriteHDF5Parallel.hpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -9,7 +9,7 @@
#define WRITE_HDF5_PARALLEL_HPP
#include "WriteHDF5.hpp"
-#include <mpi.h>
+#include "MBmpi.h"
#include <map>
struct RemoteSetData;
Modified: MOAB/trunk/parallel/crystal.c
===================================================================
--- MOAB/trunk/parallel/crystal.c 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/crystal.c 2009-11-02 19:55:16 UTC (rev 3255)
@@ -48,7 +48,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
-#include <mpi.h>
+#include "MBmpi.h"
#include "errmem.h"
#include "types.h"
Modified: MOAB/trunk/parallel/fcrystal.c
===================================================================
--- MOAB/trunk/parallel/fcrystal.c 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/fcrystal.c 2009-11-02 19:55:16 UTC (rev 3255)
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <stdarg.h>
#ifdef MPI
-# include <mpi.h>
+# include "MBmpi.h"
#endif
#include "fname.h"
Modified: MOAB/trunk/parallel/gs.c
===================================================================
--- MOAB/trunk/parallel/gs.c 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/gs.c 2009-11-02 19:55:16 UTC (rev 3255)
@@ -71,7 +71,7 @@
#include <string.h>
#include <math.h>
#ifdef USE_MPI
-# include <mpi.h>
+# include "MBmpi.h"
#endif
#include "errmem.h"
Modified: MOAB/trunk/parallel/mbparallelcomm_test.cpp
===================================================================
--- MOAB/trunk/parallel/mbparallelcomm_test.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/mbparallelcomm_test.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -16,7 +16,7 @@
#include "StructuredElementSeq.hpp"
#include "SequenceManager.hpp"
#include "MBError.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#include <iostream>
#include <sstream>
#include <assert.h>
Modified: MOAB/trunk/parallel/parallel_hdf5_test.cc
===================================================================
--- MOAB/trunk/parallel/parallel_hdf5_test.cc 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/parallel_hdf5_test.cc 2009-11-02 19:55:16 UTC (rev 3255)
@@ -10,7 +10,7 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include <mpi.h>
+#include "MBmpi.h"
#include <unistd.h>
#include <float.h>
#include <stdio.h>
Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp
===================================================================
--- MOAB/trunk/parallel/parallel_unit_tests.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/parallel_unit_tests.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -4,7 +4,7 @@
#include "FileOptions.hpp"
#include "MBTagConventions.hpp"
#include "MBCore.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#include <iostream>
#include <algorithm>
#include <sstream>
Modified: MOAB/trunk/parallel/parallel_write_test.cc
===================================================================
--- MOAB/trunk/parallel/parallel_write_test.cc 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/parallel_write_test.cc 2009-11-02 19:55:16 UTC (rev 3255)
@@ -1,7 +1,7 @@
#include "MBCore.hpp"
#include "MBParallelComm.hpp"
#include "MBTagConventions.hpp"
-#include <mpi.h>
+#include "MBmpi.h"
#include <stdlib.h>
#include <iostream>
#include <time.h>
Modified: MOAB/trunk/parallel/pcomm_unit.cpp
===================================================================
--- MOAB/trunk/parallel/pcomm_unit.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/pcomm_unit.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -12,7 +12,7 @@
#include <sstream>
#ifdef USE_MPI
-# include <mpi.h>
+# include "MBmpi.h"
#endif
#define STRINGIFY_(X) #X
Modified: MOAB/trunk/parallel/transfer.c
===================================================================
--- MOAB/trunk/parallel/transfer.c 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/transfer.c 2009-11-02 19:55:16 UTC (rev 3255)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <math.h>
-#include <mpi.h>
+#include "MBmpi.h"
#include "errmem.h"
#include "types.h"
#include "minmax.h"
Modified: MOAB/trunk/parallel/uber_parallel_test.cpp
===================================================================
--- MOAB/trunk/parallel/uber_parallel_test.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/parallel/uber_parallel_test.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -4,7 +4,7 @@
#include "FileOptions.hpp"
#include "MBTagConventions.hpp"
#include "MBCore.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#include <iostream>
#include <algorithm>
#include <sstream>
Modified: MOAB/trunk/refiner/MBMeshRefiner.cpp
===================================================================
--- MOAB/trunk/refiner/MBMeshRefiner.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/refiner/MBMeshRefiner.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -8,7 +8,7 @@
#ifdef USE_MPI
#include "MBParallelComm.hpp"
-#include <mpi.h>
+#include "MBmpi.h"
#else // USE_MPI
typedef int MPI_Comm;
#endif // USE_MPI
Modified: MOAB/trunk/refiner/test_mesh_refiner.cpp
===================================================================
--- MOAB/trunk/refiner/test_mesh_refiner.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/refiner/test_mesh_refiner.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -9,7 +9,7 @@
#include "MBParallelComm.hpp"
#include "ReadParallel.hpp"
#include "FileOptions.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#endif // USE_MPI
#include <iostream>
Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/Makefile.am 2009-11-02 19:55:16 UTC (rev 3255)
@@ -1,6 +1,9 @@
AUTOMAKE_OPTIONS = foreign
DEFS = $(DEFINES)
-INCLUDES += -I$(top_srcdir) -I$(top_builddir)
+INCLUDES += -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/parallel \
+ -I$(top_builddir)/parallel
LDADD = $(top_builddir)/libMOAB.la
# For old (pre 1.10.x) versions of Automake
Modified: MOAB/trunk/tools/convert.cpp
===================================================================
--- MOAB/trunk/tools/convert.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/convert.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -36,7 +36,7 @@
#endif
#include <time.h>
#ifdef USE_MPI
-# include <mpi.h>
+# include "MBmpi.h"
#endif
#include <stdio.h>
Modified: MOAB/trunk/tools/iMesh/iMeshP.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMeshP.h 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/iMesh/iMeshP.h 2009-11-02 19:55:16 UTC (rev 3255)
@@ -4,7 +4,7 @@
#include "iMesh.h"
#include "iMeshP_protos.h"
-#include <mpi.h>
+#include "MBmpi.h"
#ifdef __cplusplus
extern "C" {
Modified: MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -16,7 +16,7 @@
#include <sstream>
#ifdef USE_MPI
-#include "mpi.h"
+#include "MBmpi.h"
#endif
/********************* Error Handling **************************/
Modified: MOAB/trunk/tools/iMesh/iMeshP_unit_tests.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMeshP_unit_tests.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/iMesh/iMeshP_unit_tests.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -1,5 +1,5 @@
#include "iMeshP.h"
-#include <mpi.h>
+#include "MBmpi.h"
#include <iostream>
#include <algorithm>
#include <vector>
Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -10,7 +10,7 @@
#undef IS_BUILDING_MB
#ifdef USE_MPI
-#include "mpi.h"
+#include "MBmpi.h"
#endif
#include <iostream>
Modified: MOAB/trunk/tools/iMesh/partest.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/partest.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/iMesh/partest.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -1,7 +1,7 @@
#include <iostream>
#include <stdio.h>
#include <string.h>
-#include "mpi.h"
+#include "MBmpi.h"
#include "iMesh.h"
Modified: MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -4,7 +4,7 @@
#include "FileOptions.hpp"
#include "ReadParallel.hpp"
#include "MBCoupler.hpp"
-#include "mpi.h"
+#include "MBmpi.h"
#include <iostream>
#include <sstream>
#include <assert.h>
Modified: MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/MBZoltan.hpp 2009-10-30 07:09:30 UTC (rev 3254)
+++ MOAB/trunk/tools/mbzoltan/MBZoltan.hpp 2009-11-02 19:55:16 UTC (rev 3255)
@@ -23,6 +23,7 @@
#define MB_ZOLTAN_HPP
#include <stdlib.h>
+#include "MBmpi.h"
#include "zoltan_cpp.h"
extern "C"
More information about the moab-dev
mailing list