mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
[svn-r3663] Purpose:
Improvement Description: Changed the default value of $NPROCS from 2 to 3. This is the value libSAF uses since 3 processes have a much bigger chance catching parallel errors than just 2 processes. Platforms tested: Modi4 (IRIX64) both serial and parallel modes.
This commit is contained in:
parent
2aefa8a0a4
commit
d178c72f9c
@ -69,7 +69,7 @@ Cray T3E
|
|||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
RUNPARALLEL="mpirun -np 2"
|
RUNPARALLEL="mpirun -np 3"
|
||||||
export RUNPARALLEL
|
export RUNPARALLEL
|
||||||
LIBS="-lmpi"
|
LIBS="-lmpi"
|
||||||
export LIBS
|
export LIBS
|
||||||
@ -100,7 +100,7 @@ CPPFLAGS=$MPI_INC
|
|||||||
export CPPFLAGS
|
export CPPFLAGS
|
||||||
LDFLAGS=$MPI_LIB
|
LDFLAGS=$MPI_LIB
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
RUNPARALLEL="mpirun -np 2"
|
RUNPARALLEL="mpirun -np 3"
|
||||||
export RUNPARALLEL
|
export RUNPARALLEL
|
||||||
LIBS="-lmpio -lmpi"
|
LIBS="-lmpio -lmpi"
|
||||||
export LIBS
|
export LIBS
|
||||||
@ -145,8 +145,8 @@ RUNPARALLEL then configure chooses `mpirun' from the same
|
|||||||
directory as `mpicc':
|
directory as `mpicc':
|
||||||
|
|
||||||
RUNSERIAL: /usr/local/mpi/bin/mpirun -np 1
|
RUNSERIAL: /usr/local/mpi/bin/mpirun -np 1
|
||||||
RUNPARALLEL: /usr/local/mpi/bin/mpirun -np $${NPROCS:=2}
|
RUNPARALLEL: /usr/local/mpi/bin/mpirun -np $${NPROCS:=3}
|
||||||
|
|
||||||
The `$${NPROCS:=2}' will be substituted with the value of the
|
The `$${NPROCS:=3}' will be substituted with the value of the
|
||||||
NPROCS environment variable at the time `make check' is run
|
NPROCS environment variable at the time `make check' is run
|
||||||
(or the value 2).
|
(or the value 3).
|
||||||
|
6
configure
vendored
6
configure
vendored
@ -9279,7 +9279,7 @@ echo "configure:9266: checking for mpirun" >&5
|
|||||||
echo "$ac_t""$path/mpirun" 1>&6
|
echo "$ac_t""$path/mpirun" 1>&6
|
||||||
RUNSERIAL="${RUNSERIAL:-none}"
|
RUNSERIAL="${RUNSERIAL:-none}"
|
||||||
if test -z "$RUNPARALLEL"; then
|
if test -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}"
|
RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "$ac_t""none" 1>&6
|
echo "$ac_t""none" 1>&6
|
||||||
@ -9311,7 +9311,7 @@ echo "configure:9293: checking for mpirun_lam or mpirun" >&5
|
|||||||
echo "$ac_t""$path/$cmd" 1>&6;
|
echo "$ac_t""$path/$cmd" 1>&6;
|
||||||
RUNSERIAL="${RUNSERIAL:-none}"
|
RUNSERIAL="${RUNSERIAL:-none}"
|
||||||
if test -z "$RUNPARALLEL"; then
|
if test -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=2}"
|
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "$ac_t""none" 1>&6
|
echo "$ac_t""none" 1>&6
|
||||||
@ -9477,7 +9477,7 @@ rm -f conftest*
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
|
if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="mpirun -np \$\${NPROCS:=2}"
|
RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -1220,7 +1220,7 @@ case "$CC_BASENAME" in
|
|||||||
AC_MSG_RESULT($path/mpirun)
|
AC_MSG_RESULT($path/mpirun)
|
||||||
RUNSERIAL="${RUNSERIAL:-none}"
|
RUNSERIAL="${RUNSERIAL:-none}"
|
||||||
if test -z "$RUNPARALLEL"; then
|
if test -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}"
|
RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(none)
|
AC_MSG_RESULT(none)
|
||||||
@ -1255,7 +1255,7 @@ case "$CC_BASENAME" in
|
|||||||
AC_MSG_RESULT($path/$cmd);
|
AC_MSG_RESULT($path/$cmd);
|
||||||
RUNSERIAL="${RUNSERIAL:-none}"
|
RUNSERIAL="${RUNSERIAL:-none}"
|
||||||
if test -z "$RUNPARALLEL"; then
|
if test -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=2}"
|
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(none)
|
AC_MSG_RESULT(none)
|
||||||
@ -1311,7 +1311,7 @@ case "X-$enable_parallel" in
|
|||||||
|
|
||||||
dnl Set RUNPARALLEL to mpirun if not set yet.
|
dnl Set RUNPARALLEL to mpirun if not set yet.
|
||||||
if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
|
if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
|
||||||
RUNPARALLEL="mpirun -np \$\${NPROCS:=2}"
|
RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user