Commit ca00697f authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'ELPA_GPU' into ELPA_KNL

parents 60c08c1f 19390d50
This diff is collapsed.
......@@ -13,6 +13,7 @@ libelpa@SUFFIX@_public_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@modules @FC_MODINC@
libelpa@SUFFIX@_public_la_SOURCES = \
src/elpa1.F90 \
src/elpa2.F90 \
src/elpa1_auxiliary.F90 \
src/elpa2_utilities.F90 \
src/elpa_utilities.F90
......@@ -28,7 +29,7 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/mod_compute_hh_trafo_complex.F90 \
src/mod_pack_unpack_complex.F90 \
src/aligned_mem.F90 \
src/elpa1_compute.F90 \
src/elpa1_compute_private.F90 \
src/elpa2_compute.F90 \
src/elpa2_kernels/mod_fortran_interfaces.F90 \
src/elpa2_kernels/mod_single_hh_trafo_real.F90 \
......
......@@ -1025,9 +1025,9 @@ DX_HTML_FEATURE(ON)
DX_INIT_DOXYGEN([ELPA], [Doxyfile], [docs])
DESPERATELY_WANT_ASSUMED_SIZE=no
AC_MSG_CHECKING(whether --enable-assumed-size-arrays is specified)
AC_MSG_CHECKING(whether --enable-assumed-size is specified)
AC_ARG_ENABLE([assumed-size],
AS_HELP_STRING([--enable-assumded-size-arrays],
AS_HELP_STRING([--enable-assumed-size],
[use assumed-size Fortran arrays]),
[],
[DESPERATELY_WANT_ASSUMED_SIZE=no])
......
......@@ -20,7 +20,7 @@
%define with_openmp 1
Name: elpa
Version: 2016.05.001
Version: 2016.05.002
Release: 2
Summary: A massively parallel eigenvector solver
License: LGPL-3.0
......
......@@ -84,12 +84,12 @@
module ELPA1
use precision
use elpa_utilities
use elpa1_auxiliary
implicit none
PRIVATE ! By default, all routines contained are private
! The following routines are public:
private
public :: get_elpa_row_col_comms !< old, deprecated interface: Sets MPI row/col communicators
public :: get_elpa_communicators !< Sets MPI row/col communicators
......@@ -116,7 +116,7 @@ module ELPA1
!> \brief get_elpa_row_col_comms: old, deprecated Fortran function to create the MPI communicators for ELPA. Better use "elpa_get_communicators"
!> \detail
!> \details
!> The interface and variable definition is the same as in "elpa_get_communicators"
!> \param mpi_comm_global Global communicator for the calculations (in)
!>
......@@ -134,7 +134,7 @@ module ELPA1
!> \brief solve_evp_real: old, deprecated Fortran function to solve the real eigenvalue problem with 1-stage solver. Better use "solve_evp_real_1stage"
!>
!> \detail
!> \details
!> The interface and variable definition is the same as in "elpa_solve_evp_real_1stage"
! Parameters
!
......@@ -179,7 +179,7 @@ module ELPA1
!> \brief solve_evp_complex: old, deprecated Fortran function to solve the complex eigenvalue problem with 1-stage solver. Better use "solve_evp_complex_1stage"
!>
!> \detail
!> \details
!> The interface and variable definition is the same as in "elpa_solve_evp_complex_1stage"
! Parameters
!
......
This diff is collapsed.
This diff is collapsed.
......@@ -66,33 +66,28 @@ module ELPA1_compute
public :: tridiag_real
public :: trans_ev_real_double ! Transform real eigenvectors of a tridiagonal matrix back
public :: trans_ev_real
public :: mult_at_b_real_double ! Multiply real matrices A**T * B
public :: mult_at_b_real
public :: solve_tridi_double
interface tridiag_real
module procedure tridiag_real_double
end interface
interface trans_ev_real
module procedure trans_ev_real_double
end interface
interface mult_at_b_real
module procedure mult_at_b_real_double
end interface
#ifdef WANT_SINGLE_PRECISION_REAL
public :: tridiag_real_single ! Transform real single-precision symmetric matrix to tridiagonal form
public :: trans_ev_real_single ! Transform real single-precision eigenvectors of a tridiagonal matrix back
public :: mult_at_b_real_single ! Multiply real single-precision matrices A**T * B
public :: solve_tridi_single
#endif
public :: tridiag_complex_double ! Transform complex hermitian matrix to tridiagonal form
public :: tridiag_complex
public :: trans_ev_complex_double ! Transform eigenvectors of a tridiagonal matrix back
public :: trans_ev_complex
public :: mult_ah_b_complex_double ! Multiply complex matrices A**H * B
public :: mult_ah_b_complex
interface tridiag_complex
module procedure tridiag_complex_double
......@@ -102,60 +97,9 @@ module ELPA1_compute
module procedure trans_ev_complex_double
end interface
interface mult_ah_b_complex
module procedure mult_ah_b_complex_double
end interface
#ifdef WANT_SINGLE_PRECISION_COMPLEX
public :: tridiag_complex_single ! Transform complex single-precision hermitian matrix to tridiagonal form
public :: trans_ev_complex_single ! Transform complex single-precision eigenvectors of a tridiagonal matrix back
public :: mult_ah_b_complex_single ! Multiply complex single-precision matrices A**H * B
#endif
public :: solve_tridi_double ! Solve tridiagonal eigensystem with divide and conquer method
public :: solve_tridi
public :: cholesky_real_double ! Cholesky factorization of a real matrix
public :: cholesky_real
public :: invert_trm_real_double ! Invert real triangular matrix
public :: invert_trm_real
interface solve_tridi
module procedure solve_tridi_double
end interface
interface cholesky_real
module procedure cholesky_real_double
end interface
interface invert_trm_real
module procedure invert_trm_real_double
end interface
#ifdef WANT_SINGLE_PRECISION_REAL
public :: solve_tridi_single ! Solve tridiagonal real single-precision eigensystem with divide and conquer method
public :: cholesky_real_single ! Cholesky factorization of a real single-precision matrix
public :: invert_trm_real_single ! Invert real single-precision triangular matrix
#endif
public :: cholesky_complex_double ! Cholesky factorization of a complex single-precision matrix
public :: cholesky_complex
public :: invert_trm_complex_double ! Invert complex single-precision triangular matrix
public :: invert_trm_complex
interface cholesky_complex
module procedure cholesky_complex_double
end interface
interface invert_trm_complex
module procedure invert_trm_complex_double
end interface
#ifdef WANT_SINGLE_PRECISION_COMPLEX
public :: cholesky_complex_single ! Cholesky factorization of a complex matrix
public :: invert_trm_complex_single ! Invert complex triangular matrix
#endif
public :: local_index ! Get local index of a block cyclic distributed matrix
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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