diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-08-27 16:22:11 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-08-27 16:22:11 +0000 |
| commit | 80fe37c6474db51eb2285a3383f4f053ae4d0984 (patch) | |
| tree | ab21bb06c8a696ebe0bd698dd2a76afa1d48c5c1 /lib/make/extras | |
| parent | b04b18ed163c62fea284ca0e550f63457b7eac6b (diff) | |
Define CCTK_MPI to be the MPI version used (eg. NATIVE, MPICH_ch_p4, MPICH_globus etc.).
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2318 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras')
| -rw-r--r-- | lib/make/extras/MPI/MPICH | 5 | ||||
| -rwxr-xr-x | lib/make/extras/MPI/setup.sh | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH index 7f0ae8b8..59f15989 100644 --- a/lib/make/extras/MPI/MPICH +++ b/lib/make/extras/MPI/MPICH @@ -6,7 +6,7 @@ # @desc # # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.12 2001-01-19 13:30:05 tradke Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.13 2001-08-27 16:22:11 tradke Exp $ # @@*/ @@ -132,6 +132,9 @@ else MPICH_LIB=mpich fi +# Set the MPI version name +MPI_VERSION="MPICH_$MPICH_DEVICE" + # Finally set the library lines. MPI_LIBS="$MPICH_LIB $MPICH_DEVICE_LIBS" diff --git a/lib/make/extras/MPI/setup.sh b/lib/make/extras/MPI/setup.sh index 5429a360..fe0ae1f3 100755 --- a/lib/make/extras/MPI/setup.sh +++ b/lib/make/extras/MPI/setup.sh @@ -13,8 +13,6 @@ if test -n "$MPI" ; then echo "Configuring with MPI" -CCTK_WriteLine cctk_Extradefs.h "#define CCTK_MPI CCTK_MPI" - # Work out which variation of MPI is installed if test -r $srcdir/extras/MPI/$MPI ; then @@ -26,6 +24,12 @@ fi # Write the data out to the header and make files. +if test -n "$MPI_VERSION" ; then + CCTK_WriteLine cctk_Extradefs.h "#define CCTK_MPI $MPI_VERSION" +else + CCTK_WriteLine cctk_Extradefs.h "#define CCTK_MPI $MPI" +fi + CCTK_WriteLine make.extra.defn "MPI_LIBS = $MPI_LIBS" CCTK_WriteLine make.extra.defn "MPI_LIB_DIRS = $MPI_LIB_DIRS" CCTK_WriteLine make.extra.defn "MPI_INC_DIRS = $MPI_INC_DIRS" |