The '_r' compilers are apparently needed when compiling with OpenMP on rzdawndev.
This commit is contained in:
falgout
parent
6fb04067d3
commit
5520cfc8c5
@ -261,7 +261,6 @@ else
|
||||
hypre_user_chose_cflags=yes
|
||||
fi
|
||||
|
||||
|
||||
dnl *********************************************************************
|
||||
dnl * Determine if user provided CXX compiler or flags
|
||||
dnl *********************************************************************
|
||||
@ -279,7 +278,6 @@ else
|
||||
hypre_user_chose_cxxflags=yes
|
||||
fi
|
||||
|
||||
|
||||
dnl *********************************************************************
|
||||
dnl * Determine if user provided fortran compiler or flags
|
||||
dnl *********************************************************************
|
||||
@ -676,9 +674,19 @@ if test "$hypre_user_chose_ccompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
AC_CHECK_PROGS(CC, [xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(CC, [xlc_r xlC_r icc icpc gcc g++ pgcc pgCC cc CC kcc KCC])
|
||||
else
|
||||
AC_CHECK_PROGS(CC, [xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC])
|
||||
fi
|
||||
else
|
||||
AC_CHECK_PROGS(CC, [mpxlc mpixlc mpiicc mpicc mpipgcc], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(CC, [mpxlc mpixlc_r mpiicc mpicc mpipgcc])
|
||||
else
|
||||
AC_CHECK_PROGS(CC, [mpxlc mpixlc mpiicc mpicc mpipgcc])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$CC" = "x"
|
||||
@ -691,9 +699,19 @@ if test "$hypre_user_chose_cxxcompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
AC_CHECK_PROGS(CXX, [xlC xlc icpc icc g++ gcc pgCC pgcc CC cc KCC kcc], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(CXX, [xlC_r xlc_r icpc icc g++ gcc pgCC pgcc CC cc KCC kcc])
|
||||
else
|
||||
AC_CHECK_PROGS(CXX, [xlC xlc icpc icc g++ gcc pgCC pgcc CC cc KCC kcc])
|
||||
fi
|
||||
else
|
||||
AC_CHECK_PROGS(CXX, [mpxlC mpixlcxx mpiicpc mpiCC mpicxx mpipgCC], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(CXX, [mpxlC mpixlcxx_r mpiicpc mpiCC mpicxx mpipgCC])
|
||||
else
|
||||
AC_CHECK_PROGS(CXX, [mpxlC mpixlcxx mpiicpc mpiCC mpicxx mpipgCC])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$CXX" = "x"
|
||||
@ -706,9 +724,19 @@ if test "$hypre_using_fortran" = "yes" -a "$hypre_user_chose_fcompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
AC_CHECK_PROGS(F77, [xlf ifort gfortran g77 g95 pgf77 f77], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(F77, [xlf_r ifort gfortran g77 g95 pgf77 f77])
|
||||
else
|
||||
AC_CHECK_PROGS(F77, [xlf ifort gfortran g77 g95 pgf77 f77])
|
||||
fi
|
||||
else
|
||||
AC_CHECK_PROGS(F77, [mpxlf mpixlf77 mpiifort mpif77 mpipgf77], [""])
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
AC_CHECK_PROGS(F77, [mpxlf mpixlf77_r mpiifort mpif77 mpipgf77])
|
||||
else
|
||||
AC_CHECK_PROGS(F77, [mpxlf mpixlf77 mpiifort mpif77 mpipgf77])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$F77" = "x"
|
||||
|
||||
290
configure
vendored
290
configure
vendored
@ -1674,7 +1674,6 @@ else
|
||||
hypre_user_chose_cflags=yes
|
||||
fi
|
||||
|
||||
|
||||
if test "x$CXX" = "x"
|
||||
then
|
||||
hypre_user_chose_cxxcompilers=no
|
||||
@ -1689,7 +1688,6 @@ else
|
||||
hypre_user_chose_cxxflags=yes
|
||||
fi
|
||||
|
||||
|
||||
if test "x$F77" = "x"
|
||||
then
|
||||
hypre_user_chose_fcompilers=no
|
||||
@ -2259,7 +2257,9 @@ if test "$hypre_user_chose_ccompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
for ac_prog in xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in xlc_r xlC_r icc icpc gcc g++ pgcc pgCC cc CC kcc KCC
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2298,10 +2298,53 @@ fi
|
||||
|
||||
test -n "$CC" && break
|
||||
done
|
||||
test -n "$CC" || CC=""""
|
||||
|
||||
else
|
||||
for ac_prog in xlc xlC icc icpc gcc g++ pgcc pgCC cc CC kcc KCC
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CC="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
CC=$ac_cv_prog_CC
|
||||
if test -n "$CC"; then
|
||||
echo "$as_me:$LINENO: result: $CC" >&5
|
||||
echo "${ECHO_T}$CC" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$CC" && break
|
||||
done
|
||||
|
||||
fi
|
||||
else
|
||||
for ac_prog in mpxlc mpixlc mpiicc mpicc mpipgcc
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in mpxlc mpixlc_r mpiicc mpicc mpipgcc
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2340,8 +2383,49 @@ fi
|
||||
|
||||
test -n "$CC" && break
|
||||
done
|
||||
test -n "$CC" || CC=""""
|
||||
|
||||
else
|
||||
for ac_prog in mpxlc mpixlc mpiicc mpicc mpipgcc
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CC="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
CC=$ac_cv_prog_CC
|
||||
if test -n "$CC"; then
|
||||
echo "$as_me:$LINENO: result: $CC" >&5
|
||||
echo "${ECHO_T}$CC" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$CC" && break
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$CC" = "x"
|
||||
@ -2354,7 +2438,9 @@ if test "$hypre_user_chose_cxxcompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
for ac_prog in xlC xlc icpc icc g++ gcc pgCC pgcc CC cc KCC kcc
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in xlC_r xlc_r icpc icc g++ gcc pgCC pgcc CC cc KCC kcc
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2395,8 +2481,53 @@ fi
|
||||
done
|
||||
test -n "$CXX" || CXX=""""
|
||||
|
||||
else
|
||||
for ac_prog in xlC xlc icpc icc g++ gcc pgCC pgcc CC cc KCC kcc
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_CXX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$CXX"; then
|
||||
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CXX="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
CXX=$ac_cv_prog_CXX
|
||||
if test -n "$CXX"; then
|
||||
echo "$as_me:$LINENO: result: $CXX" >&5
|
||||
echo "${ECHO_T}$CXX" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$CXX" && break
|
||||
done
|
||||
test -n "$CXX" || CXX=""""
|
||||
|
||||
fi
|
||||
else
|
||||
for ac_prog in mpxlC mpixlcxx mpiicpc mpiCC mpicxx mpipgCC
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in mpxlC mpixlcxx_r mpiicpc mpiCC mpicxx mpipgCC
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2437,6 +2568,49 @@ fi
|
||||
done
|
||||
test -n "$CXX" || CXX=""""
|
||||
|
||||
else
|
||||
for ac_prog in mpxlC mpixlcxx mpiicpc mpiCC mpicxx mpipgCC
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_CXX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$CXX"; then
|
||||
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CXX="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
CXX=$ac_cv_prog_CXX
|
||||
if test -n "$CXX"; then
|
||||
echo "$as_me:$LINENO: result: $CXX" >&5
|
||||
echo "${ECHO_T}$CXX" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$CXX" && break
|
||||
done
|
||||
test -n "$CXX" || CXX=""""
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$CXX" = "x"
|
||||
@ -2449,7 +2623,9 @@ if test "$hypre_using_fortran" = "yes" -a "$hypre_user_chose_fcompilers" = "no"
|
||||
then
|
||||
if test "$hypre_using_mpi" = "no"
|
||||
then
|
||||
for ac_prog in xlf ifort gfortran g77 g95 pgf77 f77
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in xlf_r ifort gfortran g77 g95 pgf77 f77
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2490,8 +2666,53 @@ fi
|
||||
done
|
||||
test -n "$F77" || F77=""""
|
||||
|
||||
else
|
||||
for ac_prog in xlf ifort gfortran g77 g95 pgf77 f77
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_F77+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$F77"; then
|
||||
ac_cv_prog_F77="$F77" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_F77="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
F77=$ac_cv_prog_F77
|
||||
if test -n "$F77"; then
|
||||
echo "$as_me:$LINENO: result: $F77" >&5
|
||||
echo "${ECHO_T}$F77" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$F77" && break
|
||||
done
|
||||
test -n "$F77" || F77=""""
|
||||
|
||||
fi
|
||||
else
|
||||
for ac_prog in mpxlf mpixlf77 mpiifort mpif77 mpipgf77
|
||||
if test "$hypre_using_openmp" = "yes"
|
||||
then
|
||||
for ac_prog in mpxlf mpixlf77_r mpiifort mpif77 mpipgf77
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -2532,6 +2753,49 @@ fi
|
||||
done
|
||||
test -n "$F77" || F77=""""
|
||||
|
||||
else
|
||||
for ac_prog in mpxlf mpixlf77 mpiifort mpif77 mpipgf77
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_F77+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$F77"; then
|
||||
ac_cv_prog_F77="$F77" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_F77="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
F77=$ac_cv_prog_F77
|
||||
if test -n "$F77"; then
|
||||
echo "$as_me:$LINENO: result: $F77" >&5
|
||||
echo "${ECHO_T}$F77" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$F77" && break
|
||||
done
|
||||
test -n "$F77" || F77=""""
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$F77" = "x"
|
||||
@ -4037,7 +4301,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:4040:" \
|
||||
echo "$as_me:4304:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -4233,7 +4497,7 @@ _ACEOF
|
||||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_verb"
|
||||
(eval echo $as_me:4236: \"$ac_link\") >&5
|
||||
(eval echo $as_me:4500: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
@ -4311,7 +4575,7 @@ _ACEOF
|
||||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
|
||||
(eval echo $as_me:4314: \"$ac_link\") >&5
|
||||
(eval echo $as_me:4578: \"$ac_link\") >&5
|
||||
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$ac_f77_v_output" >&5
|
||||
FFLAGS=$ac_save_FFLAGS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user