diff options
author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-24 09:12:21 +0000 |
---|---|---|
committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-24 09:12:21 +0000 |
commit | 9f8245728e5967f6bd1df5b215783b8133b52273 (patch) | |
tree | 34e7a4143042790d370a261d9f49637ad400f7b6 /lib/make/extras | |
parent | 5ce65bdec5c39c8fade0154a7f44801488a03b93 (diff) |
Undo my last commit to check if a user-set MPICH_DEVICE matches
$MPICH_DIR/bin/tdevice. Unfortunately the tdevice command is broken, even for a
'ch_shmem' device it reports 'ch_p4'.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4187 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras')
-rw-r--r-- | lib/make/extras/MPI/MPICH | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/make/extras/MPI/MPICH b/lib/make/extras/MPI/MPICH index 05d1b588..fcdbe8b0 100644 --- a/lib/make/extras/MPI/MPICH +++ b/lib/make/extras/MPI/MPICH @@ -6,7 +6,7 @@ # @desc # Configuration options for MPI=MPICH # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.24 2005-10-18 15:41:32 tradke Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/MPICH,v 1.25 2005-10-24 09:12:21 tradke Exp $ # @@*/ @@ -64,13 +64,13 @@ if test -d "$MPICH_DIR/build/$MPICH_ARCH" ; then fi echo " MPICH device is $MPICH_DEVICE" fi -elif test -n "$MPICH_DEVICE" -a "$MPICH_DEVICE" != 'globus'; then - found_device=`$MPICH_DIR/bin/tdevice` - echo " MPICH device is $found_device" - if test "$MPICH_DEVICE" != "$found_device"; then - echo " Your setting of MPICH_DEVICE = '$MPICH_DEVICE' is inconsistent with the device found in MPICH_DIR = $MPICH_DIR/. Please fix !" - exit 2 - fi +#elif test -n "$MPICH_DEVICE" -a "$MPICH_DEVICE" != 'globus'; then +# found_device=`$MPICH_DIR/bin/tdevice` +# echo " MPICH device is $found_device" +# if test "$MPICH_DEVICE" != "$found_device"; then +# echo " Your setting of MPICH_DEVICE = '$MPICH_DEVICE' is inconsistent with the device found in MPICH_DIR = $MPICH_DIR/. Please fix !" +# exit 2 +# fi fi # Work out MPICH version |