added support for g95+mkl (second try)

plus some editing to final messages [Gerardo]


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@2238 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
ballabio 2005-09-27 11:07:33 +00:00
parent 1d1662c84b
commit 5c4650d89d
4 changed files with 144 additions and 244 deletions

97
configure vendored
View File

@ -3567,7 +3567,7 @@ echo "$as_me:$LINENO: result: $ac_cv_search_dgemm" >&5
echo "${ECHO_T}$ac_cv_search_dgemm" >&6
if test "$ac_cv_search_dgemm" != no; then
test "$ac_cv_search_dgemm" = "none required" || LIBS="$ac_cv_search_dgemm $LIBS"
have_blas=1
have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS"
fi
@ -3688,7 +3688,7 @@ echo "$as_me:$LINENO: result: $ac_cv_search_dgemm" >&5
echo "${ECHO_T}$ac_cv_search_dgemm" >&6
if test "$ac_cv_search_dgemm" != no; then
test "$ac_cv_search_dgemm" = "none required" || LIBS="$ac_cv_search_dgemm $LIBS"
have_blas=1
have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS"
fi
@ -4456,28 +4456,13 @@ then
# search
case "$arch:$f90_id" in
linux64:ifort | linux64:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/64
/opt/intel/mkl701/lib/64
/opt/intel/mkl70/lib/64
/opt/intel/mkl/mkl61/lib/64
/opt/intel/mkl/lib/64
/opt/intel/mkl61/lib/64"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux64:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
echo "$as_me:$LINENO: checking for library containing zggev" >&5
echo $ECHO_N "checking for library containing zggev... $ECHO_C" >&6
@ -4567,37 +4552,19 @@ echo "${ECHO_T}$ac_cv_search_zggev" >&6
if test "$ac_cv_search_zggev" != no; then
test "$ac_cv_search_zggev" = "none required" || LIBS="$ac_cv_search_zggev $LIBS"
have_lapack=1
lapack_libs="$try_loption -lmkl_lapack"
lapack_libs="-lmkl_lapack"
fi
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
fi
;;
linux32:ifort | linux32:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/32
/opt/intel/mkl701/lib/32
/opt/intel/mkl70/lib/32
/opt/intel/mkl/mkl61/lib/32
/opt/intel/mkl/lib/32
/opt/intel/mkl61/lib/32
/cineca/prod/intel/lib"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux32:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
echo "$as_me:$LINENO: checking for library containing zggev" >&5
echo $ECHO_N "checking for library containing zggev... $ECHO_C" >&6
@ -4687,12 +4654,10 @@ echo "${ECHO_T}$ac_cv_search_zggev" >&6
if test "$ac_cv_search_zggev" != no; then
test "$ac_cv_search_zggev" = "none required" || LIBS="$ac_cv_search_zggev $LIBS"
have_lapack=1
lapack_libs="$try_loption -lmkl_lapack"
lapack_libs="-lmkl_lapack"
fi
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
fi
;;
sparc:* )
@ -8017,19 +7982,29 @@ fi
if test "$mpi_libs" != "" ; then echo " MPI_LIBS=$mpi_libs" ; fi
if test "$arch" = "aix" ; then echo " MASS_LIBS=$mass_libs" ; fi
echo Please check if that is correct.
echo
echo If any libraries are missing, you may specify a list of directories
echo to search and retry, as follows:
echo " ./configure LIBDIRS=\"list of directories, separated by spaces\""
echo
if test "$use_parallel" -ne 0 && test "$parallel" -eq 0
then
echo "A parallel environment was not detected"
echo "this program will run in single-processor mode"
echo
fi
echo For more information, read the ESPRESSO User\'s Guide \
\(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo "configure: success"
if test "$use_parallel" -ne 0
then
if test "$parallel" -ne 0
then
echo Parallel environment detected successfully.
echo This program will run in multi-processor mode.
else
echo Parallel environment not detected \
\(is this a parallel machine?\).
echo This program will run in single-processor mode.
fi
else
echo This program will run in single-processor mode.
fi
echo
echo For more info, read the ESPRESSO User\'s Guide \(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo configure: success

View File

@ -695,7 +695,7 @@ then
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LIBS="-lguide"
AC_SEARCH_LIBS(dgemm, mkl_ipf, have_blas=1
AC_SEARCH_LIBS(dgemm, mkl_ipf, have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS")
if test "$ac_cv_search_dgemm" != "no"
then break ; fi
@ -727,7 +727,7 @@ then
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LIBS="-lguide -lpthread"
AC_SEARCH_LIBS(dgemm, mkl_ia32, have_blas=1
AC_SEARCH_LIBS(dgemm, mkl_ia32, have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS")
if test "$ac_cv_search_dgemm" != "no"
then break ; fi
@ -870,65 +870,30 @@ then
# search
case "$arch:$f90_id" in
linux64:ifort | linux64:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/64
/opt/intel/mkl701/lib/64
/opt/intel/mkl70/lib/64
/opt/intel/mkl/mkl61/lib/64
/opt/intel/mkl/lib/64
/opt/intel/mkl61/lib/64"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux64:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
AC_SEARCH_LIBS(zggev, mkl_lapack, have_lapack=1
lapack_libs="$try_loption -lmkl_lapack")
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
lapack_libs="-lmkl_lapack")
fi
;;
linux32:ifort | linux32:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/32
/opt/intel/mkl701/lib/32
/opt/intel/mkl70/lib/32
/opt/intel/mkl/mkl61/lib/32
/opt/intel/mkl/lib/32
/opt/intel/mkl61/lib/32
/cineca/prod/intel/lib"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux32:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
AC_SEARCH_LIBS(zggev, mkl_lapack, have_lapack=1
lapack_libs="$try_loption -lmkl_lapack")
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
lapack_libs="-lmkl_lapack")
fi
;;
sparc:* )
@ -1320,19 +1285,29 @@ fi
if test "$mpi_libs" != "" ; then echo " MPI_LIBS=$mpi_libs" ; fi
if test "$arch" = "aix" ; then echo " MASS_LIBS=$mass_libs" ; fi
echo Please check if that is correct.
echo
echo If any libraries are missing, you may specify a list of directories
echo to search and retry, as follows:
echo " ./configure LIBDIRS=\"list of directories, separated by spaces\""
echo
if test "$use_parallel" -ne 0 && test "$parallel" -eq 0
then
echo "A parallel environment was not detected"
echo "this program will run in single-processor mode"
echo
fi
echo For more information, read the ESPRESSO User\'s Guide \
\(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo "configure: success"
if test "$use_parallel" -ne 0
then
if test "$parallel" -ne 0
then
echo Parallel environment detected successfully.
echo This program will run in multi-processor mode.
else
echo Parallel environment not detected \
\(is this a parallel machine?\).
echo This program will run in single-processor mode.
fi
else
echo This program will run in single-processor mode.
fi
echo
echo For more info, read the ESPRESSO User\'s Guide \(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo configure: success

97
install/configure vendored
View File

@ -3567,7 +3567,7 @@ echo "$as_me:$LINENO: result: $ac_cv_search_dgemm" >&5
echo "${ECHO_T}$ac_cv_search_dgemm" >&6
if test "$ac_cv_search_dgemm" != no; then
test "$ac_cv_search_dgemm" = "none required" || LIBS="$ac_cv_search_dgemm $LIBS"
have_blas=1
have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS"
fi
@ -3688,7 +3688,7 @@ echo "$as_me:$LINENO: result: $ac_cv_search_dgemm" >&5
echo "${ECHO_T}$ac_cv_search_dgemm" >&6
if test "$ac_cv_search_dgemm" != no; then
test "$ac_cv_search_dgemm" = "none required" || LIBS="$ac_cv_search_dgemm $LIBS"
have_blas=1
have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS"
fi
@ -4456,28 +4456,13 @@ then
# search
case "$arch:$f90_id" in
linux64:ifort | linux64:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/64
/opt/intel/mkl701/lib/64
/opt/intel/mkl70/lib/64
/opt/intel/mkl/mkl61/lib/64
/opt/intel/mkl/lib/64
/opt/intel/mkl61/lib/64"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux64:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
echo "$as_me:$LINENO: checking for library containing zggev" >&5
echo $ECHO_N "checking for library containing zggev... $ECHO_C" >&6
@ -4567,37 +4552,19 @@ echo "${ECHO_T}$ac_cv_search_zggev" >&6
if test "$ac_cv_search_zggev" != no; then
test "$ac_cv_search_zggev" = "none required" || LIBS="$ac_cv_search_zggev $LIBS"
have_lapack=1
lapack_libs="$try_loption -lmkl_lapack"
lapack_libs="-lmkl_lapack"
fi
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
fi
;;
linux32:ifort | linux32:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/32
/opt/intel/mkl701/lib/32
/opt/intel/mkl70/lib/32
/opt/intel/mkl/mkl61/lib/32
/opt/intel/mkl/lib/32
/opt/intel/mkl61/lib/32
/cineca/prod/intel/lib"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux32:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
echo "$as_me:$LINENO: checking for library containing zggev" >&5
echo $ECHO_N "checking for library containing zggev... $ECHO_C" >&6
@ -4687,12 +4654,10 @@ echo "${ECHO_T}$ac_cv_search_zggev" >&6
if test "$ac_cv_search_zggev" != no; then
test "$ac_cv_search_zggev" = "none required" || LIBS="$ac_cv_search_zggev $LIBS"
have_lapack=1
lapack_libs="$try_loption -lmkl_lapack"
lapack_libs="-lmkl_lapack"
fi
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
fi
;;
sparc:* )
@ -8017,19 +7982,29 @@ fi
if test "$mpi_libs" != "" ; then echo " MPI_LIBS=$mpi_libs" ; fi
if test "$arch" = "aix" ; then echo " MASS_LIBS=$mass_libs" ; fi
echo Please check if that is correct.
echo
echo If any libraries are missing, you may specify a list of directories
echo to search and retry, as follows:
echo " ./configure LIBDIRS=\"list of directories, separated by spaces\""
echo
if test "$use_parallel" -ne 0 && test "$parallel" -eq 0
then
echo "A parallel environment was not detected"
echo "this program will run in single-processor mode"
echo
fi
echo For more information, read the ESPRESSO User\'s Guide \
\(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo "configure: success"
if test "$use_parallel" -ne 0
then
if test "$parallel" -ne 0
then
echo Parallel environment detected successfully.
echo This program will run in multi-processor mode.
else
echo Parallel environment not detected \
\(is this a parallel machine?\).
echo This program will run in single-processor mode.
fi
else
echo This program will run in single-processor mode.
fi
echo
echo For more info, read the ESPRESSO User\'s Guide \(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo configure: success

View File

@ -695,7 +695,7 @@ then
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LIBS="-lguide"
AC_SEARCH_LIBS(dgemm, mkl_ipf, have_blas=1
AC_SEARCH_LIBS(dgemm, mkl_ipf, have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS")
if test "$ac_cv_search_dgemm" != "no"
then break ; fi
@ -727,7 +727,7 @@ then
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LIBS="-lguide -lpthread"
AC_SEARCH_LIBS(dgemm, mkl_ia32, have_blas=1
AC_SEARCH_LIBS(dgemm, mkl_ia32, have_blas=1 have_mkl=1
blas_libs="$try_loption $LIBS")
if test "$ac_cv_search_dgemm" != "no"
then break ; fi
@ -870,65 +870,30 @@ then
# search
case "$arch:$f90_id" in
linux64:ifort | linux64:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/64
/opt/intel/mkl701/lib/64
/opt/intel/mkl70/lib/64
/opt/intel/mkl/mkl61/lib/64
/opt/intel/mkl/lib/64
/opt/intel/mkl61/lib/64"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux64:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
AC_SEARCH_LIBS(zggev, mkl_lapack, have_lapack=1
lapack_libs="$try_loption -lmkl_lapack")
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
lapack_libs="-lmkl_lapack")
fi
;;
linux32:ifort | linux32:ifc )
# check for mkl (in several directories)
try_libdirs="/opt/intel/mkl72/lib/32
/opt/intel/mkl701/lib/32
/opt/intel/mkl70/lib/32
/opt/intel/mkl/mkl61/lib/32
/opt/intel/mkl/lib/32
/opt/intel/mkl61/lib/32
/cineca/prod/intel/lib"
try_libdirs="$libdirs $try_libdirs $ld_library_path"
for dir in none $try_libdirs
do
linux32:* )
# check for mkl_lapack
if test "$have_mkl" -ne 0
then
unset ac_cv_search_zggev # clear cached value
if test "$dir" = "none"
then
try_loption=
else
echo $ECHO_N "in $dir: " $ECHO_C
try_loption="-L$dir"
fi
FFLAGS="$test_fflags"
LDFLAGS="$test_ldflags $try_loption"
LDFLAGS="$test_ldflags"
LIBS="$blas_libs"
AC_SEARCH_LIBS(zggev, mkl_lapack, have_lapack=1
lapack_libs="$try_loption -lmkl_lapack")
if test "$ac_cv_search_zggev" != "no"
then break ; fi
done
lapack_libs="-lmkl_lapack")
fi
;;
sparc:* )
@ -1320,19 +1285,29 @@ fi
if test "$mpi_libs" != "" ; then echo " MPI_LIBS=$mpi_libs" ; fi
if test "$arch" = "aix" ; then echo " MASS_LIBS=$mass_libs" ; fi
echo Please check if that is correct.
echo
echo If any libraries are missing, you may specify a list of directories
echo to search and retry, as follows:
echo " ./configure LIBDIRS=\"list of directories, separated by spaces\""
echo
if test "$use_parallel" -ne 0 && test "$parallel" -eq 0
then
echo "A parallel environment was not detected"
echo "this program will run in single-processor mode"
echo
fi
echo For more information, read the ESPRESSO User\'s Guide \
\(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo "configure: success"
if test "$use_parallel" -ne 0
then
if test "$parallel" -ne 0
then
echo Parallel environment detected successfully.
echo This program will run in multi-processor mode.
else
echo Parallel environment not detected \
\(is this a parallel machine?\).
echo This program will run in single-processor mode.
fi
else
echo This program will run in single-processor mode.
fi
echo
echo For more info, read the ESPRESSO User\'s Guide \(Doc/users-guide.tex\).
echo --------------------------------------------------------------------
echo configure: success