From 3039b7b2388d2d1794bd7894e18ea024aa59c1ca Mon Sep 17 00:00:00 2001
From: goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Tue, 20 Jul 1999 23:10:05 +0000
Subject: Added MPI=<type> configuration option.

Current types are

CUSTOM
   - must define, either in the environment or on the command line
     MPI_LIBS
     MPI_LIB_DIRS
     MPI_INC_DIRS

NATIVE
   - use the 'native' MPI for the machine;  this must be checked for and setup
     in the known-architecture file.

MPICH
   - use MPICH.  This is controlled by
     MPICH_DIR     - the MPICH installation directory
                     will search a few places for this if not defined.
     MPICH_DEVICE  - the MPICH device
                     again will search.
     If MPICH_DEVICE=globus you must set GLOBUS_DIR.

LAM
   - use LAM.  This is controlled by
     LAM_DIR       - the LAM installation directory
                     will search a few places.

This should still be treated as experimental, but it works on my laptop for MPICH and LAM.

I've updated the known-architectures/irix file for this, plus fixed the IRIX IRIX64 problem
(I think), but haven't tested the change yet.

Have fun,

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@748 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/make/known-architectures/irix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'lib/make/known-architectures/irix')

diff --git a/lib/make/known-architectures/irix b/lib/make/known-architectures/irix
index ef4b5078..f275f4b9 100644
--- a/lib/make/known-architectures/irix
+++ b/lib/make/known-architectures/irix
@@ -6,22 +6,18 @@
 #    @desc 
 #   
 #    @enddesc 
-#    @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.8 1999-07-06 16:08:21 goodale Exp $
+#    @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.9 1999-07-20 23:10:05 goodale Exp $
 #  @@*/
 
 # extract the CPU type from hinv output
 # (assumes all processors are of equal type :-)
 IRIX_CPU="`hinv -t cpu | tail -n 1 | sed 's/^[^R]*R\([01-9]*\).*$/\1/'`"
 
-case $IRIX_CPU in
-    10000)
-    IRIX_BITS=64 
-    ;;
-    *)
-    IRIX_BITS=32
-    ;;
-esac
-
+if test -n "`uname | grep 64`" ; then
+   IRIX_BITS=64
+else
+   IRIX_BITS=32
+fi
 
 case "$IRIX_BITS:$CC" in
     64:gcc)
@@ -84,3 +80,12 @@ case $IRIX_BITS in
     *)
     ;;
 esac
+
+# MPI stuff
+
+if test -n "$with_mpi" ; then
+    if test "$with_mpi" = "NATIVE" ; then
+       MPI_LIBS="mpi"
+    fi
+fi
+
-- 
cgit v1.2.3