Skip to content

GitLab

Commit 857c5a01 authored by Andreas Marek's avatar Andreas Marek
Browse files

Remove _new_interface suffix from file names

parent dc04d37d
Hide whitespace changes
Inline Side-by-side
Makefile.am
View file @ 857c5a01
......@@ -16,7 +16,7 @@ libelpa@SUFFIX@_public_la_SOURCES = \
src/elpa2/legacy_interface/elpa2_legacy.F90 \
src/elpa2/elpa2_utilities.F90 \
src/elpa1/legacy_interface/elpa1_auxiliary_legacy.F90 \
src/elpa1/elpa1_auxiliary_new_interface.F90 \
src/elpa1/elpa1_auxiliary.F90 \
src/elpa_t.F90 \
src/general/elpa_utilities.F90
......@@ -48,8 +48,8 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/elpa2/qr/elpa_qrkernels.F90 \
src/elpa2/qr/elpa_pdlarfb.F90 \
src/elpa2/qr/elpa_pdgeqrf.F90 \
src/elpa1/elpa1_new_interface.F90 \
src/elpa2/elpa2_new_interface.F90 \
src/elpa1/elpa1.F90 \
src/elpa2/elpa2.F90 \
src/elpa_index.c \
src/elpa_options.c
......@@ -60,9 +60,9 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
src/elpa2/elpa2_compute_real_template.X90 \
src/elpa2/elpa2_compute_complex_template.X90 \
src/elpa1/legacy_interface/elpa1_template_legacy.X90 \
src/elpa1/elpa1_template_new_interface.X90 \
src/elpa1/elpa1_template.X90 \
src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
src/elpa2/elpa2_template_new_interface.X90 \
src/elpa2/elpa2_template.X90 \
src/elpa1/legacy_interface/elpa1_c_interface_template_legacy.X90 \
src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90 \
src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 \
......@@ -86,13 +86,13 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
src/elpa2/redist_band.X90 \
src/general/sanity.X90 \
src/elpa1/legacy_interface/elpa_cholesky_template_legacy.X90 \
src/elpa1/elpa_cholesky_template_new_interface.X90 \
src/elpa1/elpa_cholesky_template.X90 \
src/elpa1/legacy_interface/elpa_invert_trm_legacy.X90 \
src/elpa1/elpa_invert_trm_new_interface.X90 \
src/elpa1/elpa_invert_trm.X90 \
src/elpa1/legacy_interface/elpa_multiply_a_b_legacy.X90 \
src/elpa1/elpa_multiply_a_b_new_interface.X90 \
src/elpa1/elpa_multiply_a_b.X90 \
src/elpa1/legacy_interface/elpa_solve_tridi_legacy.X90 \
src/elpa1/elpa_solve_tridi_new_interface.X90 \
src/elpa1/elpa_solve_tridi_impl_public.X90 \
src/general/precision_macros.h
lib_LTLIBRARIES = libelpa@SUFFIX@.la
......@@ -1102,8 +1102,8 @@ EXTRA_DIST = \
src/elpa1/elpa_transpose_vectors.X90 \
src/elpa1/elpa1_compute_template.X90 \
src/elpa1/elpa1_merge_systems_real_template.X90 \
src/elpa1/elpa1_solve_tridi_real_template_legacy.X90 \
src/elpa1/elpa1_solve_tridi_real_template.X90 \
src/elpa1/elpa1_solve_tridi_real_template_new_interface.X90 \
src/elpa1/elpa1_tools_template.X90 \
src/elpa1/elpa1_trans_ev_template.X90 \
src/elpa1/elpa1_tridiag_template.X90 \
......@@ -1113,9 +1113,9 @@ EXTRA_DIST = \
src/elpa2/elpa2_herm_matrix_allreduce_complex_template.X90 \
src/elpa2/elpa2_symm_matrix_allreduce_real_template.X90 \
src/elpa1/legacy_interface/elpa1_template_legacy.X90 \
src/elpa1/elpa1_template_new_interface.X90 \
src/elpa1/elpa1_template.X90 \
src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
src/elpa2/elpa2_template_new_interface.X90 \
src/elpa2/elpa2_template.X90 \
src/elpa1/legacy_interface/elpa1_c_interface_template_legacy.X90 \
src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90 \
src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 \
......@@ -1138,13 +1138,13 @@ EXTRA_DIST = \
src/elpa2/compute_hh_trafo.X90 \
src/general/sanity.X90 \
src/elpa1/legacy_interface/elpa_cholesky_template_legacy.X90 \
src/elpa1/elpa_cholesky_template_new_interface.X90 \
src/elpa1/elpa_cholesky_template.X90 \
src/elpa1/legacy_interface/elpa_invert_trm_legacy.X90 \
src/elpa1/elpa_invert_trm_new_interface.X90 \
src/elpa1/elpa_invert_trm.X90 \
src/elpa1/legacy_interface/elpa_multiply_a_b_legacy.X90 \
src/elpa1/elpa_multiply_a_b_new_interface.X90 \
src/elpa1/elpa_multiply_a_b.X90 \
src/elpa1/legacy_interface/elpa_solve_tridi_legacy.X90 \
src/elpa1/elpa_solve_tridi_new_interface.X90 \
src/elpa1/elpa_solve_tridi_impl_public.X90 \
src/elpa2/qr/elpa_qrkernels.X90 \
src/elpa2/GPU/ev_tridi_band_gpu_c_v2_complex_template.Xcu \
src/elpa2/GPU/ev_tridi_band_gpu_c_v2_real_template.Xcu \
......
src/elpa1/elpa1_new_interface.F90 → src/elpa1/elpa1.F90
View file @ 857c5a01
......@@ -254,7 +254,7 @@ end function elpa_get_communicators_impl
#define REALCASE 1
#define DOUBLE_PRECISION 1
#include "../general/precision_macros.h"
#include "elpa1_template_new_interface.X90"
#include "elpa1_template.X90"
#undef REALCASE
#undef DOUBLE_PRECISION
......@@ -298,7 +298,7 @@ end function elpa_get_communicators_impl
#define REALCASE 1
#define SINGLE_PRECISION 1
#include "../general/precision_macros.h"
#include "elpa1_template_new_interface.X90"
#include "elpa1_template.X90"
#undef REALCASE
#undef SINGLE_PRECISION
#endif /* WANT_SINGLE_PRECISION_REAL */
......@@ -341,7 +341,7 @@ end function elpa_get_communicators_impl
#define COMPLEXCASE 1
#define DOUBLE_PRECISION 1
#include "../general/precision_macros.h"
#include "elpa1_template_new_interface.X90"
#include "elpa1_template.X90"
#undef DOUBLE_PRECISION
#undef COMPLEXCASE
......@@ -387,7 +387,7 @@ end function elpa_get_communicators_impl
#define COMPLEXCASE 1
#define SINGLE_PRECISION
#include "../general/precision_macros.h"
#include "elpa1_template_new_interface.X90"
#include "elpa1_template.X90"
#undef COMPLEXCASE
#undef SINGLE_PRECISION
#endif /* WANT_SINGLE_PRECISION_COMPLEX */
......
src/elpa1/elpa1_auxiliary_new_interface.F90 → src/elpa1/elpa1_auxiliary.F90
View file @ 857c5a01
......@@ -94,7 +94,7 @@ module elpa1_auxiliary_impl
function elpa_cholesky_real_double_impl (na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
wantDebug) result(success)
#include "elpa_cholesky_template_new_interface.X90"
#include "elpa_cholesky_template.X90"
end function elpa_cholesky_real_double_impl
......@@ -105,7 +105,7 @@ module elpa1_auxiliary_impl
function elpa_cholesky_real_single_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
wantDebug) result(success)
#include "elpa_cholesky_template_new_interface.X90"
#include "elpa_cholesky_template.X90"
end function elpa_cholesky_real_single_impl
......@@ -130,7 +130,7 @@ module elpa1_auxiliary_impl
!> \result succes logical, reports success or failure
function elpa_invert_trm_real_double_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug) result(success)
#include "elpa_invert_trm_new_interface.X90"
#include "elpa_invert_trm.X90"
end function elpa_invert_trm_real_double_impl
#if WANT_SINGLE_PRECISION_REAL
......@@ -154,7 +154,7 @@ module elpa1_auxiliary_impl
!> \result succes logical, reports success or failure
function elpa_invert_trm_real_single_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug) result(success)
#include "elpa_invert_trm_new_interface.X90"
#include "elpa_invert_trm.X90"
end function elpa_invert_trm_real_single_impl
#endif /* WANT_SINGLE_PRECISION_REAL */
......@@ -182,7 +182,7 @@ module elpa1_auxiliary_impl
function elpa_cholesky_complex_double_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
wantDebug) result(success)
#include "elpa_cholesky_template_new_interface.X90"
#include "elpa_cholesky_template.X90"
end function elpa_cholesky_complex_double_impl
......@@ -210,7 +210,7 @@ module elpa1_auxiliary_impl
function elpa_cholesky_complex_single_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
wantDebug) result(success)
#include "elpa_cholesky_template_new_interface.X90"
#include "elpa_cholesky_template.X90"
end function elpa_cholesky_complex_single_impl
......@@ -237,7 +237,7 @@ module elpa1_auxiliary_impl
function elpa_invert_trm_complex_double_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug) result(success)
#include "elpa_invert_trm_new_interface.X90"
#include "elpa_invert_trm.X90"
end function elpa_invert_trm_complex_double_impl
#ifdef WANT_SINGLE_PRECISION_COMPLEX
......@@ -262,7 +262,7 @@ module elpa1_auxiliary_impl
function elpa_invert_trm_complex_single_impl(na, a, lda, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug) result(success)
#include "elpa_invert_trm_new_interface.X90"
#include "elpa_invert_trm.X90"
end function elpa_invert_trm_complex_single_impl
#endif /* WANT_SINGE_PRECISION_COMPLEX */
......@@ -272,7 +272,7 @@ module elpa1_auxiliary_impl
#include "../general/precision_macros.h"
function elpa_mult_at_b_real_double_impl(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, nblk, &
mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) result(success)
#include "elpa_multiply_a_b_new_interface.X90"
#include "elpa_multiply_a_b.X90"
end function elpa_mult_at_b_real_double_impl
#if WANT_SINGLE_PRECISION_REAL
......@@ -315,7 +315,7 @@ module elpa1_auxiliary_impl
function elpa_mult_at_b_real_single_impl(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, nblk, &
mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) result(success)
#include "elpa_multiply_a_b_new_interface.X90"
#include "elpa_multiply_a_b.X90"
end function elpa_mult_at_b_real_single_impl
......@@ -362,7 +362,7 @@ module elpa1_auxiliary_impl
function elpa_mult_ah_b_complex_double_impl(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, nblk, &
mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) result(success)
#include "elpa_multiply_a_b_new_interface.X90"
#include "elpa_multiply_a_b.X90"
end function elpa_mult_ah_b_complex_double_impl
......@@ -408,7 +408,7 @@ module elpa1_auxiliary_impl
function elpa_mult_ah_b_complex_single_impl(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, nblk, &
mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) result(success)
#include "elpa_multiply_a_b_new_interface.X90"
#include "elpa_multiply_a_b.X90"
end function elpa_mult_ah_b_complex_single_impl
......@@ -438,7 +438,7 @@ module elpa1_auxiliary_impl
function elpa_solve_tridi_double_impl(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug) &
result(success)
#include "elpa_solve_tridi_new_interface.X90"
#include "elpa_solve_tridi_impl_public.X90"
end function
......@@ -468,7 +468,7 @@ module elpa1_auxiliary_impl
function elpa_solve_tridi_single_impl(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug) result(success)
#include "elpa_solve_tridi_new_interface.X90"
#include "elpa_solve_tridi_impl_public.X90"
end function
......
src/elpa1/elpa1_compute_template.X90
View file @ 857c5a01
......@@ -69,8 +69,8 @@
#include "elpa1_tridiag_template.X90"
#include "elpa1_trans_ev_template.X90"
#include "elpa1_solve_tridi_real_template_legacy.X90"
#include "elpa1_solve_tridi_real_template.X90"
#include "elpa1_solve_tridi_real_template_new_interface.X90"
#include "elpa1_merge_systems_real_template.X90"
#include "elpa1_tools_template.X90"
......
src/elpa1/elpa1_solve_tridi_real_template.X90
View file @ 857c5a01
......@@ -55,8 +55,8 @@
#include "../general/sanity.X90"
subroutine solve_tridi_&
&PRECISION &
( na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
&PRECISION&
&_impl ( na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug, success )
#ifdef HAVE_DETAILED_TIMINGS
......@@ -146,8 +146,8 @@ subroutine solve_tridi_&
nev1 = MIN(nev,l_cols)
endif
call solve_tridi_col_&
&PRECISION &
(l_cols, nev1, nc, d(nc+1), e(nc+1), q, ldq, nblk, &
&PRECISION&
&_impl (l_cols, nev1, nc, d(nc+1), e(nc+1), q, ldq, nblk, &
matrixCols, mpi_comm_rows, wantDebug, success)
if (.not.(success)) then
call timer%stop("solve_tridi" // PRECISION_SUFFIX)
......@@ -349,11 +349,12 @@ subroutine solve_tridi_&
&PRECISION
end subroutine solve_tridi_&
&PRECISION
&PRECISION&
&_impl
subroutine solve_tridi_col_&
&PRECISION &
( na, nev, nqoff, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, wantDebug, success )
&PRECISION&
&_impl ( na, nev, nqoff, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, wantDebug, success )
! Solves the symmetric, tridiagonal eigenvalue problem on one processor column
! with the divide and conquer method.
......@@ -450,7 +451,8 @@ subroutine solve_tridi_&
nlen = limits(n+1)-noff ! Size of subproblem
call solve_tridi_single_problem_&
&PRECISION &
&PRECISION&
&_impl &
(nlen,d(noff+1),e(noff+1), &
q(nqoff+noff+1,noff+1),ubound(q,dim=1), wantDebug, success)
......@@ -481,7 +483,8 @@ subroutine solve_tridi_&
noff = limits(my_prow) ! Start of subproblem
nlen = limits(my_prow+1)-noff ! Size of subproblem
call solve_tridi_single_problem_&
&PRECISION &
&PRECISION&
&_impl &
(nlen,d(noff+1),e(noff+1),qmat1, &
ubound(qmat1,dim=1), wantDebug, success)
......@@ -577,11 +580,12 @@ subroutine solve_tridi_&
call timer%stop("solve_tridi_col" // PRECISION_SUFFIX)
end subroutine solve_tridi_col_&
&PRECISION
&PRECISION&
&_impl
recursive subroutine solve_tridi_single_problem_&
&PRECISION &
(nlen, d, e, q, ldq, wantDebug, success)
&PRECISION&
&_impl (nlen, d, e, q, ldq, wantDebug, success)
! Solves the symmetric, tridiagonal eigenvalue problem on a single processor.
! Takes precautions if DSTEDC fails or if the eigenvalues are not ordered correctly.
......@@ -708,5 +712,6 @@ subroutine solve_tridi_&
call timer%stop("solve_tridi_single" // PRECISION_SUFFIX)
end subroutine solve_tridi_single_problem_&
&PRECISION
&PRECISION&
&_impl
src/elpa1/elpa1_solve_tridi_real_template_new_interface.X90 → src/elpa1/elpa1_solve_tridi_real_template_legacy.X90
View file @ 857c5a01
......@@ -55,8 +55,8 @@
#include "../general/sanity.X90"
subroutine solve_tridi_&
&PRECISION&
&_impl ( na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
&PRECISION &
( na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, wantDebug, success )
#ifdef HAVE_DETAILED_TIMINGS
......@@ -146,8 +146,8 @@ subroutine solve_tridi_&
nev1 = MIN(nev,l_cols)
endif
call solve_tridi_col_&
&PRECISION&
&_impl (l_cols, nev1, nc, d(nc+1), e(nc+1), q, ldq, nblk, &
&PRECISION &
(l_cols, nev1, nc, d(nc+1), e(nc+1), q, ldq, nblk, &
matrixCols, mpi_comm_rows, wantDebug, success)
if (.not.(success)) then
call timer%stop("solve_tridi" // PRECISION_SUFFIX)
......@@ -349,12 +349,11 @@ subroutine solve_tridi_&
&PRECISION
end subroutine solve_tridi_&
&PRECISION&
&_impl
&PRECISION
subroutine solve_tridi_col_&
&PRECISION&
&_impl ( na, nev, nqoff, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, wantDebug, success )
&PRECISION &
( na, nev, nqoff, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, wantDebug, success )
! Solves the symmetric, tridiagonal eigenvalue problem on one processor column
! with the divide and conquer method.
......@@ -451,8 +450,7 @@ subroutine solve_tridi_&
nlen = limits(n+1)-noff ! Size of subproblem
call solve_tridi_single_problem_&
&PRECISION&
&_impl &
&PRECISION &
(nlen,d(noff+1),e(noff+1), &
q(nqoff+noff+1,noff+1),ubound(q,dim=1), wantDebug, success)
......@@ -483,8 +481,7 @@ subroutine solve_tridi_&
noff = limits(my_prow) ! Start of subproblem
nlen = limits(my_prow+1)-noff ! Size of subproblem
call solve_tridi_single_problem_&
&PRECISION&
&_impl &
&PRECISION &
(nlen,d(noff+1),e(noff+1),qmat1, &
ubound(qmat1,dim=1), wantDebug, success)
......@@ -580,12 +577,11 @@ subroutine solve_tridi_&
call timer%stop("solve_tridi_col" // PRECISION_SUFFIX)
end subroutine solve_tridi_col_&
&PRECISION&
&_impl
&PRECISION
recursive subroutine solve_tridi_single_problem_&
&PRECISION&
&_impl (nlen, d, e, q, ldq, wantDebug, success)
&PRECISION &
(nlen, d, e, q, ldq, wantDebug, success)
! Solves the symmetric, tridiagonal eigenvalue problem on a single processor.
! Takes precautions if DSTEDC fails or if the eigenvalues are not ordered correctly.
......@@ -712,6 +708,5 @@ subroutine solve_tridi_&
call timer%stop("solve_tridi_single" // PRECISION_SUFFIX)
end subroutine solve_tridi_single_problem_&
&PRECISION&
&_impl
&PRECISION
src/elpa2/elpa2_new_interface.F90 → src/elpa2/elpa2.F90
View file @ 857c5a01
......@@ -123,7 +123,7 @@ module elpa2_impl
!>
!> \result success logical, false if error occured
!-------------------------------------------------------------------------------
#include "elpa2_template_new_interface.X90"
#include "elpa2_template.X90"
#undef REALCASE
#undef DOUBLE_PRECISION
......@@ -171,7 +171,7 @@ module elpa2_impl
!>
!> \result success logical, false if error occured
!-------------------------------------------------------------------------------
#include "elpa2_template_new_interface.X90"
#include "elpa2_template.X90"
#undef REALCASE
#undef SINGLE_PRECISION
......@@ -217,7 +217,7 @@ module elpa2_impl
!>
!> \result success logical, false if error occured
!-------------------------------------------------------------------------------
#include "elpa2_template_new_interface.X90"
#include "elpa2_template.X90"
#undef COMPLEXCASE
#undef DOUBLE_PRECISION
......@@ -264,7 +264,7 @@ module elpa2_impl
!>
!> \result success logical, false if error occured
!-------------------------------------------------------------------------------
#include "elpa2_template_new_interface.X90"
#include "elpa2_template.X90"
#undef COMPLEXCASE
#undef SINGLE_PRECISION
......
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