Index: /mpich2/trunk/src/env/mpif90.bash.in =================================================================== --- /mpich2/trunk/src/env/mpif90.bash.in (revision 4441) +++ /mpich2/trunk/src/env/mpif90.bash.in (revision 4856) @@ -341,8 +341,8 @@ mpilibs="$F90_LINKPATH_SHL$libdir $mpilibs" fi - $Show $F90 $F90FLAGS $LDFLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS -L$libdir -L$opalibdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS + $Show $F90 $MPICH2_MPIF90_FLAGS $F90FLAGS $LDFLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS -L$libdir -L$opalibdir $MPICH2_LDFLAGS $F90MODLIBS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $F90 $F90FLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS + $Show $F90 $MPICH2_MPIF90_FLAGS $F90FLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS rc=$? fi Index: /mpich2/trunk/src/env/mpicxx.bash.in =================================================================== --- /mpich2/trunk/src/env/mpicxx.bash.in (revision 4441) +++ /mpich2/trunk/src/env/mpicxx.bash.in (revision 4856) @@ -246,8 +246,8 @@ shllibpath="$CXX_LINKPATH_SHL$libdir" fi - $Show $CXX $CXXFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS + $Show $CXX $MPICH2_MPICXX_FLAGS $CXXFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $shllibpath $MPICH2_LDFLAGS $cxxlibs $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $CXX $CXXFLAGS "${allargs[@]}" -I$includedir + $Show $CXX $MPICH2_MPICXX_FLAGS $CXXFLAGS "${allargs[@]}" -I$includedir rc=$? fi Index: /mpich2/trunk/src/env/mpif77.bash.in =================================================================== --- /mpich2/trunk/src/env/mpif77.bash.in (revision 4441) +++ /mpich2/trunk/src/env/mpif77.bash.in (revision 4856) @@ -294,8 +294,8 @@ mpilibs="$FC_LINKPATH_SHL$libdir $mpilibs" fi - $Show $FC $FFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS + $Show $FC $MPICH2_MPIF77_FLAGS $FFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $MPICH2_LDFLAGS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $FC $FFLAGS "${allargs[@]}" -I$includedir + $Show $FC $MPICH2_MPIF77_FLAGS $FFLAGS "${allargs[@]}" -I$includedir rc=$? fi Index: /mpich2/trunk/src/env/mpicc.in =================================================================== --- /mpich2/trunk/src/env/mpicc.in (revision 4441) +++ /mpich2/trunk/src/env/mpicc.in (revision 4856) @@ -255,8 +255,8 @@ mpilibs="$C_LINKPATH_SHL$libdir $mpilibs" fi - $Show $CC $CFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS + $Show $CC $MPICH2_MPICC_FLAGS $CFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $MPICH2_LDFLAGS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $CC $CFLAGS $allargs -I$includedir + $Show $CC $MPICH2_MPICC_FLAGS $CFLAGS $allargs -I$includedir rc=$? fi Index: /mpich2/trunk/src/env/mpif90.in =================================================================== --- /mpich2/trunk/src/env/mpif90.in (revision 4441) +++ /mpich2/trunk/src/env/mpif90.in (revision 4856) @@ -363,8 +363,8 @@ mpilibs="$F90_LINKPATH_SHL$libdir $mpilibs" fi - $Show $F90 $F90FLAGS $LDFLAGS $allargs $F90INCDIRS $F90MODDIRS -L$libdir -L$opalibdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS + $Show $F90 $MPICH2_MPIF90_FLAGS $F90FLAGS $LDFLAGS $allargs $F90INCDIRS $F90MODDIRS -L$libdir -L$opalibdir $MPICH2_LDFLAGS $F90MODLIBS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $F90 $F90FLAGS $allargs $F90INCDIRS $F90MODDIRS + $Show $F90 $MPICH2_MPIF90_FLAGS $F90FLAGS $allargs $F90INCDIRS $F90MODDIRS rc=$? fi Index: /mpich2/trunk/src/env/mpicc.bash.in =================================================================== --- /mpich2/trunk/src/env/mpicc.bash.in (revision 4441) +++ /mpich2/trunk/src/env/mpicc.bash.in (revision 4856) @@ -246,8 +246,8 @@ mpilibs="$C_LINKPATH_SHL$libdir $mpilibs" fi - $Show $CC $CFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS + $Show $CC $MPICH2_MPICC_FLAGS $CFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir -L$opalibdir $MPICH2_LDFLAGS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $CC $CFLAGS "${allargs[@]}" -I$includedir + $Show $CC $MPICH2_MPICC_FLAGS $CFLAGS "${allargs[@]}" -I$includedir rc=$? fi Index: /mpich2/trunk/src/env/mpicxx.in =================================================================== --- /mpich2/trunk/src/env/mpicxx.in (revision 4441) +++ /mpich2/trunk/src/env/mpicxx.in (revision 4856) @@ -255,8 +255,8 @@ shllibpath="$CXX_LINKPATH_SHL$libdir" fi - $Show $CXX $CXXFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS + $Show $CXX $MPICH2_MPICXX_FLAGS $CXXFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $shllibpath $MPICH2_LDFLAGS $cxxlibs $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $CXX $CXXFLAGS $allargs -I$includedir + $Show $CXX $MPICH2_MPICXX_FLAGS $CXXFLAGS $allargs -I$includedir rc=$? fi Index: /mpich2/trunk/src/env/mpif77.in =================================================================== --- /mpich2/trunk/src/env/mpif77.in (revision 4441) +++ /mpich2/trunk/src/env/mpif77.in (revision 4856) @@ -316,8 +316,8 @@ mpilibs="$FC_LINKPATH_SHL$libdir $mpilibs" fi - $Show $FC $FFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS + $Show $FC $MPICH2_MPIF77_FLAGS $FFLAGS $LDFLAGS $allargs -I$includedir -L$libdir -L$opalibdir $MPICH2_LDFLAGS $mpilibs $MPI_OTHERLIBS rc=$? else - $Show $FC $FFLAGS $allargs -I$includedir + $Show $FC $MPICH2_MPIF77_FLAGS $FFLAGS $allargs -I$includedir rc=$? fi Index: /mpich2/trunk/README.vin =================================================================== --- /mpich2/trunk/README.vin (revision 4669) +++ /mpich2/trunk/README.vin (revision 4856) @@ -381,36 +381,101 @@ =================== -MPICH2 can be configured with two sets of compiler flags: CFLAGS, -CXXFLAGS, FFLAGS, F90FLAGS (abbreviated as xFLAGS) and -MPICH2LIB_CFLAGS, MPICH2LIB_CXXFLAGS, MPICH2LIB_FFLAGS, -MPICH2LIB_F90FLAGS (abbreviated as MPICH2LIB_xFLAGS) for compilation; -LDFLAGS and MPICH2LIB_LDFLAGS for linking. All these flags can be set -as part of configure command or through environment variables. -(CPPFLAGS stands for C preprocessor flags, which should NOT be set) - -Both xFLAGS and MPICH2LIB_xFLAGS affect the compilation of the MPICH2 -libraries. However, only xFLAGS are appended to MPI wrapper scripts, -mpicc and friends. - -MPICH2 libraries are built with default compiler optimization, -O2, -which can be modified by --enable-fast configure option. For -instance, --disable-fast disables the default optimization option. ---enable-fast=O sets default compiler optimization as -O. For -more details of --enable-fast, see the output of "configure --help". -Any other complicated optimization flags for MPICH2 libraries have to -be set throught MPICH2LIB_xFLAGS. CFLAGS and friends are empty by -default. - -For example, to build a "production" MPICH2 environment with -O3 for all -language bindings, one can simply do +MPICH2 allows several sets of compiler flags to be used. The first +three sets are configure-time options for MPICH2, while the fourth is +only relevant when compiling applications with mpicc and friends. + +1. CFLAGS, CXXFLAGS, FFLAGS, F90FLAGS and LDFLAGS (abbreviated as +xFLAGS): Setting these flags would result in the MPICH2 library being +compiled/linked with these flags and the flags internally being used +in mpicc and friends. + +2. MPICH2LIB_CFLAGS, MPICH2LIB_CXXFLAGS, MPICH2LIB_FFLAGS, +MPICH2LIB_F90FLAGS and MPICH2LIB_LDFLAGS (abbreviated as +MPICH2LIB_xFLAGS): Setting these flags would result in the MPICH2 +library being compiled/linked with these flags. However, these flags +will *not* be used by mpicc and friends. + +3. MPICH2_MAKE_CFLAGS: Setting these flags would result in MPICH2's +configure tests to not use these flags, but the makefile's to use +them. This is a temporary hack for certain cases that advanced +developers might be interested in which break existing configure tests +(e.g., -Werror) and are not recommended for regular users. + +4. MPICH2_MPICC_FLAGS, MPICH2_MPICXX_FLAGS, MPICH2_MPIF77_FLAGS, +MPICH2_MPIF90_FLAGS and MPICH2_LDFLAGS (abbreviated as +MPICH2_MPIX_FLAGS): These flags do *not* affect the compilation of the +MPICH2 library itself, but will be internally used by mpicc and +friends. + + + +--------------------------------------------------------------------+ + | | | | + | | MPICH2 library | mpicc and friends | + | | | | + +--------------------+----------------------+------------------------+ + | | | | + | xFLAGS | Yes | Yes | + | | | | + +--------------------+----------------------+------------------------+ + | | | | + | MPICH2LIB_xFLAGS | Yes | No | + | | | | + +--------------------+----------------------+------------------------+ + | | | | + | MPICH2_MAKE_xFLAGS | Yes | No | + | | | | + +--------------------+----------------------+------------------------+ + | | | | + | MPICH2_MPIX_FLAGS | No | Yes | + | | | | + +--------------------+----------------------+------------------------+ + + +All these flags can be set as part of configure command or through +environment variables. (CPPFLAGS stands for C preprocessor flags, +which should NOT be set) + + +Default flags +-------------- +By default, MPICH2 automatically adds certain compiler optimizations +to MPICH2LIB_CFLAGS. The currently used optimization level is -O2. + +** IMPORTANT NOTE: Remember that this only affects the compilation of +the MPICH2 library and is not used in the wrappers (mpicc and friends) +that are used to compile your applications or other libraries. + +This optimization level can be changed with the --enable-fast option +passed to configure. For example, to build an MPICH2 environment with +-O3 for all language bindings, one can simply do: ./configure --enable-fast=O3 -or +Or to disable all compiler optimizations, one can do: + + ./configure --disable-fast + +For more details of --enable-fast, see the output of "configure +--help". + + +Examples +-------- + +Example 1: ./configure --disable-fast MPICH2LIB_CFLAGS=-O3 MPICH2LIB_FFLAGS=-O3 MPICH2LIB_CXXFLAGS=-O3 MPICH2LIB_F90FLAGS=-O3 -This will cause the MPICH2 libraries to be built with -O3, and -O3 will -not be included in the mpicc and other MPI wrapper script. +This will cause the MPICH2 libraries to be built with -O3, and -O3 +will *not* be included in the mpicc and other MPI wrapper script. + +Example 2: + + ./configure --disable-fast CFLAGS=-O3 FFLAGS=-O3 CXXFLAGS=-O3 F90FLAGS=-O3 + +This will cause the MPICH2 libraries to be built with -O3, and -O3 +will be included in the mpicc and other MPI wrapper script. + +Example 3: There are certain compiler flags that should not be used with MPICH2's @@ -421,8 +486,8 @@ MPICH2_MAKE_CFLAGS as follows: - make VERBOSE=1 MPICH2_MAKE_CFLAGS="-Wall -Werror" - -(assuming CC is set to gcc). The content of MPICH2_MAKE_CFLAGS is -appended to the CFLAGS in almost all Makefiles. + make MPICH2_MAKE_CFLAGS="-Wall -Werror" + +The content of MPICH2_MAKE_CFLAGS is appended to the CFLAGS in all +relevant Makefiles. -------------------------------------------------------------------------