mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
[svn-r19068] Bug fix: ID 1921 change mpirun to mpiexec
Removed the recognition of parallel compilers of LAM (hcc) and ChMPIon (cmpicc) since we have no access to these two MPI implementations and decided not to support them any more. Test: Jam using parallel tests: 1. use CC=mpicc and confirmed it is recognized as a parallel compiler; 2. use CC=hcc and confirmed it is NOT recognized as a parallel compiler any more.
This commit is contained in:
Albert Cheng
parent
3d3d95db07
commit
eea98ac8cb
107
configure
vendored
107
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 19059 2010-07-09 02:52:14Z lrknox .
|
||||
# From configure.in Id: configure.in 19064 2010-07-11 17:06:05Z hdftest .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65 for HDF5 1.9.74.
|
||||
#
|
||||
@ -7427,63 +7427,10 @@ $as_echo "none" >&6; }
|
||||
fi
|
||||
;;
|
||||
|
||||
hcc)
|
||||
PARALLEL=hcc
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpirun_lam or mpirun" >&5
|
||||
$as_echo_n "checking for mpirun_lam or mpirun... " >&6; }
|
||||
|
||||
cmd="`echo $CC | cut -f1 -d' '`"
|
||||
if (echo $cmd | grep / >/dev/null); then
|
||||
path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
|
||||
else
|
||||
for path in `echo $PATH | ${TR} ":" " "`; do
|
||||
if test -x $path/$cmd; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if test -x $path/mpirun_lam -o -x $path/mpirun; then
|
||||
if test -x $path/mpirun_lam; then
|
||||
cmd=mpirun_lam
|
||||
else
|
||||
cmd=mpirun
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $path/$cmd" >&5
|
||||
$as_echo "$path/$cmd" >&6; }
|
||||
RUNSERIAL="${RUNSERIAL:-none}"
|
||||
if test -z "$RUNPARALLEL"; then
|
||||
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=3}"
|
||||
fi
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
|
||||
$as_echo "none" >&6; }
|
||||
fi
|
||||
;;
|
||||
|
||||
mpcc|mpcc_r)
|
||||
PARALLEL="$CC_BASENAME"
|
||||
;;
|
||||
|
||||
cmpicc)
|
||||
PARALLEL=cmpicc
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmpirun" >&5
|
||||
$as_echo_n "checking for cmpirun... " >&6; }
|
||||
|
||||
if test -x cmpirun; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cmpirun" >&5
|
||||
$as_echo "cmpirun" >&6; }
|
||||
RUNSERIAL="${RUNSERIAL:-none}"
|
||||
|
||||
if test -z "$RUNPARALLEL"; then
|
||||
RUNPARALLEL="cmpirun -np \$\${NPROCS:=3}"
|
||||
fi
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
|
||||
$as_echo "none" >&6; }
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
@ -8249,13 +8196,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
(eval echo "\"\$as_me:8252: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8199: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:8255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:8202: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:8258: output\"" >&5)
|
||||
(eval echo "\"\$as_me:8205: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@ -9460,7 +9407,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 9463 "configure"' > conftest.$ac_ext
|
||||
echo '#line 9410 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -11779,11 +11726,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11782: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11729: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11786: \$? = $ac_status" >&5
|
||||
echo "$as_me:11733: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -12118,11 +12065,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12121: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12068: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12125: \$? = $ac_status" >&5
|
||||
echo "$as_me:12072: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -12223,11 +12170,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12226: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12173: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12230: \$? = $ac_status" >&5
|
||||
echo "$as_me:12177: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -12278,11 +12225,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12281: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12228: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12285: \$? = $ac_status" >&5
|
||||
echo "$as_me:12232: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14709,7 +14656,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 14712 "configure"
|
||||
#line 14659 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -14805,7 +14752,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 14808 "configure"
|
||||
#line 14755 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -16777,11 +16724,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16780: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16727: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16784: \$? = $ac_status" >&5
|
||||
echo "$as_me:16731: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -16876,11 +16823,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16879: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16826: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16883: \$? = $ac_status" >&5
|
||||
echo "$as_me:16830: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -16928,11 +16875,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16931: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16878: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16935: \$? = $ac_status" >&5
|
||||
echo "$as_me:16882: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -18445,11 +18392,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18448: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18395: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18452: \$? = $ac_status" >&5
|
||||
echo "$as_me:18399: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -18544,11 +18491,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18547: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18494: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18551: \$? = $ac_status" >&5
|
||||
echo "$as_me:18498: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -18596,11 +18543,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18599: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18546: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18603: \$? = $ac_status" >&5
|
||||
echo "$as_me:18550: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
||||
54
configure.in
54
configure.in
@ -741,65 +741,11 @@ case "$CC_BASENAME" in
|
||||
fi
|
||||
;;
|
||||
|
||||
hcc)
|
||||
dnl The LAM compiler. Use mpirun_lam or mpirun from the same directory
|
||||
dnl if it exists.
|
||||
PARALLEL=hcc
|
||||
AC_MSG_CHECKING([for mpirun_lam or mpirun])
|
||||
|
||||
dnl Find the path where hcc is located
|
||||
cmd="`echo $CC | cut -f1 -d' '`"
|
||||
if (echo $cmd | grep / >/dev/null); then
|
||||
path="`echo $cmd | sed 's/\(.*\)\/.*$/\1/'`"
|
||||
else
|
||||
for path in `echo $PATH | ${TR} ":" " "`; do
|
||||
if test -x $path/$cmd; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dnl Is there an mpirun_lam or mpirun at that path?
|
||||
if test -x $path/mpirun_lam -o -x $path/mpirun; then
|
||||
if test -x $path/mpirun_lam; then
|
||||
cmd=mpirun_lam
|
||||
else
|
||||
cmd=mpirun
|
||||
fi
|
||||
AC_MSG_RESULT([$path/$cmd])
|
||||
RUNSERIAL="${RUNSERIAL:-none}"
|
||||
if test -z "$RUNPARALLEL"; then
|
||||
RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=3}"
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([none])
|
||||
fi
|
||||
;;
|
||||
|
||||
mpcc|mpcc_r)
|
||||
dnl The IBM compiler
|
||||
PARALLEL="$CC_BASENAME"
|
||||
;;
|
||||
|
||||
cmpicc)
|
||||
dnl The ChaMPIon compiler on NCSA tungsten. The cmpirun command on tungsten
|
||||
dnl isn't in the same path as cmpicc.
|
||||
PARALLEL=cmpicc
|
||||
AC_MSG_CHECKING([for cmpirun])
|
||||
|
||||
dnl Is there an cmpirun?
|
||||
if test -x cmpirun; then
|
||||
AC_MSG_RESULT([cmpirun])
|
||||
RUNSERIAL="${RUNSERIAL:-none}"
|
||||
|
||||
if test -z "$RUNPARALLEL"; then
|
||||
RUNPARALLEL="cmpirun -np \$\${NPROCS:=3}"
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([none])
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
dnl Probably not a parallel compiler, but if `--enable-parallel'
|
||||
dnl is defined below then we're still building a parallel hdf5.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user