[svn-r16897] Description:

	Add basic support for using 'aprun' to run parallel commands, when on
a Cray.

Tested on:
	Cray @ LBL (franklin)

2 files changed, 22 insertions, 0 deletions

diff --git a/configure b/configure
index eb6449f..444329c 100755
--- a/configure
+++ b/configure
@@ -48681,6 +48681,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
     fi
 
+    if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
+      for path in `echo $PATH | ${TR} ":" " "`; do
+        if test -x $path/aprun; then
+          RUNPARALLEL="aprun -q -n \$\${NPROCS:=3}"
+          break;
+        fi
+      done
+    fi
+
         if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
       RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
     fi
diff --git a/configure.in b/configure.in
index 47d167f..e0e6a91 100644
--- a/configure.in
+++ b/configure.in
@@ -2468,6 +2468,19 @@ case "X-$enable_parallel" in
     fi
 
     dnl Set RUNPARALLEL to mpirun if not set yet.
+    dnl Check for building on Cray if RUNPARALLEL is not yet set by checking
+    dnl for 'aprun' command (which is the parallel job launcher, like mpirun).
+    if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
+        dnl Find the path where aprun is located.
+  	for path in `echo $PATH | ${TR} ":" " "`; do
+  	  if test -x $path/aprun; then
+            RUNPARALLEL="aprun -q -n \$\${NPROCS:=3}"
+  	    break;
+  	  fi
+	done
+    fi
+
+    dnl Set RUNPARALLEL to mpirun if not set yet.
     if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
       RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
     fi