Commit 9cb7537f authored by Paolo Giannozzi's avatar Paolo Giannozzi

ELPA cleanup, following a suggestion by Ye Luo, Argonne: define

__ELPA_2015 for old interface,__ELPA_2016 for new interface.
__ELPA_2017 is a mix of the two and was removed. Configure updated accordingly.
First attempt to commit into branch "develop"
parent e654641f
......@@ -652,7 +652,7 @@ CONTAINS
SUBROUTINE pdsyevd_drv( tv, n, nb, s, lds, w, ortho_cntx, ortho_comm )
!
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
use elpa1
#endif
IMPLICIT NONE
......@@ -677,7 +677,7 @@ CONTAINS
INTEGER :: LWORK, LIWORK, info
CHARACTER :: jobv
INTEGER :: i, ierr
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
INTEGER :: nprow,npcol,my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols
LOGICAL :: success
#endif
......@@ -701,13 +701,10 @@ CONTAINS
itmp = 0
rtmp = 0.0_DP
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
CALL BLACS_Gridinfo(ortho_cntx,nprow, npcol, my_prow,my_pcol)
#if defined(__ELPA_2017)
ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols)
success = elpa_solve_evp_real_1stage_double(n, n, s, lds, w, vv, lds, SIZE(s,2), nb, mpi_comm_rows, mpi_comm_cols, ortho_comm)
#elif defined(__ELPA_2016)
#if defined(__ELPA_2016)
! -> ELPA 2016.11.001_pre
ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols)
success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols, ortho_comm)
......
......@@ -1474,7 +1474,7 @@ CONTAINS
SUBROUTINE pzheevd_drv( tv, n, nb, h, w, ortho_cntx, ortho_comm )
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
USE elpa1
#endif
IMPLICIT NONE
......@@ -1499,7 +1499,7 @@ CONTAINS
INTEGER :: LWORK, LRWORK, LIWORK
INTEGER :: desch( 10 ), info, ierr
CHARACTER :: jobv
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
INTEGER :: nprow,npcol,my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols
LOGICAL :: success
#endif
......@@ -1514,14 +1514,10 @@ CONTAINS
call descinit( desch, n, n, nb, nb, 0, 0, ortho_cntx, size(h,1), info )
#if defined(__ELPA) || defined(__ELPA_2017) || defined(__ELPA_2016) || defined(__ELPA_2015)
#if defined(__ELPA) || defined(__ELPA_2016) || defined(__ELPA_2015)
CALL BLACS_Gridinfo(ortho_cntx,nprow, npcol, my_prow,my_pcol)
#if defined(__ELPA_2017)
ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols)
success = elpa_solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, &
mpi_comm_rows, mpi_comm_cols, ortho_comm)
#elif defined(__ELPA_2016)
#if defined(__ELPA_2016)
! -> ELPA 2016.11.001_pre
ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols)
success = solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, &
......
......@@ -1403,7 +1403,7 @@ Optional Packages:
(default: no)
--with-elpa-lib Specify full path ELPA static or dynamic library
(default: no)
--with-elpa-version Specify ELPA version, only year (default: 2016)
--with-elpa-version Specify ELPA version, only year (2015 or 2016, default: 2016)
--with-hdf5 (no|<path>) Use HDF5, a valid <path> must be
specified (default: no)
......@@ -8577,8 +8577,6 @@ if test "$with_elpa_libs" -eq 1; then
try_dflags="$try_dflags -D__ELPA_2015"
elif test "$with_elpa_version" = "2016"; then
try_dflags="$try_dflags -D__ELPA_2016"
elif test "$with_elpa_version" = "2017"; then
try_dflags="$try_dflags -D__ELPA_2017"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Invalid ELPA version, defaulting to 2016" >&5
$as_echo "$as_me: WARNING: *** Invalid ELPA version, defaulting to 2016" >&2;}
......
......@@ -28,7 +28,7 @@ AC_ARG_WITH(elpa-lib,
AC_ARG_WITH(elpa-version,
[AS_HELP_STRING([--with-elpa-version],
[Specify ELPA version, only year (default: 2016)])],
[Specify ELPA version, only year (2015 or 2016, default: 2016)])],
[if test "$withval" = "no" ; then
with_elpa_version=0
else
......@@ -48,8 +48,6 @@ if test "$with_elpa_libs" -eq 1; then
try_dflags="$try_dflags -D__ELPA_2015"
elif test "$with_elpa_version" = "2016"; then
try_dflags="$try_dflags -D__ELPA_2016"
elif test "$with_elpa_version" = "2017"; then
try_dflags="$try_dflags -D__ELPA_2017"
else
AC_MSG_WARN([*** Invalid ELPA version, defaulting to 2016])
try_dflags="$try_dflags -D__ELPA_2016"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment