Skip to content

GitLab

Commit 2d2f192b authored by Lorenz Huedepohl's avatar Lorenz Huedepohl
Browse files

Hide member 'timer' from public API 

This is a bit cumbersome, as it involves yet another abstract
intermediate type, but necessary due to language limitations.
parent 28854290
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 80 deletions
Makefile.am
View file @ 2d2f192b
......@@ -37,6 +37,7 @@ noinst_LTLIBRARIES += libelpa@SUFFIX@_private.la
libelpa@SUFFIX@_private_la_FCFLAGS = $(AM_FCFLAGS) $(FC_MODOUT)private_modules $(FC_MODINC)private_modules
libelpa@SUFFIX@_private_la_SOURCES = \
src/elpa_impl.F90 \
src/elpa_abstract_impl.F90 \
src/helpers/mod_precision.F90 \
src/helpers/mod_mpi.F90 \
src/helpers/mod_mpi_stubs.F90 \
......@@ -45,7 +46,6 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/elpa2/mod_pack_unpack_cpu.F90 \
src/elpa2/mod_compute_hh_trafo.F90 \
src/helpers/aligned_mem.F90 \
src/elpa1/elpa1_utilities.F90 \
src/elpa1/elpa1_compute_private.F90 \
src/elpa2/elpa2_determine_workload.F90 \
src/elpa2/elpa2_compute.F90 \
......@@ -121,7 +121,6 @@ endif
if HAVE_DETAILED_TIMINGS
libelpa@SUFFIX@_private_la_SOURCES += \
src/helpers/timer.F90 \
src/ftimings/ftimings.F90 \
src/ftimings/ftimings_type.F90 \
src/ftimings/ftimings_value.F90 \
......@@ -130,6 +129,12 @@ libelpa@SUFFIX@_private_la_SOURCES += \
src/ftimings/time.c \
src/ftimings/virtual_memory.c \
src/ftimings/papi.c
if ENABLE_LEGACY
libelpa@SUFFIX@_private_la_SOURCES += \
src/helpers/timer.F90
endif
else
libelpa@SUFFIX@_private_la_SOURCES += \
src/helpers/timer_dummy.F90
......@@ -551,7 +556,7 @@ noinst_LTLIBRARIES += libelpatest@SUFFIX@.la
libelpatest@SUFFIX@_la_FCFLAGS = $(AM_FCFLAGS) $(FC_MODOUT)private_modules $(FC_MODINC)private_modules
libelpatest@SUFFIX@_la_SOURCES = \
test/shared/util.F90 \
test/shared/read_input_parameters.F90 \
test/shared/read_input_parameters.F90 \
test/shared/check_correctness.F90 \
test/shared/check_correctness_template.X90 \
test/shared/setup_mpi.F90 \
......
src/elpa.F90
View file @ 2d2f192b
......@@ -49,8 +49,9 @@
! The ELPA public API
module elpa
use elpa_api
use elpa_constants
use elpa_api
use elpa_mpi
implicit none
public
......
src/elpa1/elpa1.F90
View file @ 2d2f192b
......@@ -85,7 +85,6 @@ module elpa1_impl
use, intrinsic :: iso_c_binding
use elpa_utilities
use elpa1_auxiliary_impl
use elpa1_utilities
implicit none
......
src/elpa1/elpa1_merge_systems_real_template.X90
View file @ 2d2f192b
......@@ -60,9 +60,9 @@
l_col, p_col, l_col_out, p_col_out, npc_0, npc_n, wantDebug, success)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, nm, ldq, nqoff, nblk, matrixCols, mpi_comm_rows, &
mpi_comm_cols, npc_0, npc_n
integer(kind=ik), intent(in) :: l_col(na), p_col(na), l_col_out(na), p_col_out(na)
......@@ -796,9 +796,9 @@
&PRECISION&
&(obj, d1, dbase, ddiff, z, ev_scale_value, na1,i)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na1, i
real(kind=REAL_DATATYPE), intent(in) :: d1(:), dbase(:), ddiff(:), z(:)
......@@ -825,9 +825,9 @@
&PRECISION&
&(obj, idx_ev, nLength)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: nLength
integer(kind=ik) :: idx_ev(nLength)
integer(kind=ik) :: i, nc, pc1, pc2, lc1, lc2, l_cols_out
......@@ -908,9 +908,9 @@
&PRECISION&
&(obj, col1, col2)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: col1, col2
integer(kind=ik) :: pc1, pc2, lc1, lc2
......@@ -964,9 +964,9 @@
! i.e. z(i) should be nonzero on exactly 1 processor column,
! otherways the results may be numerically different on different columns
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: n
real(kind=REAL_DATATYPE) :: z(n)
real(kind=REAL_DATATYPE) :: tmp(n)
......@@ -1019,9 +1019,9 @@
&(obj, z, n)
! This routine calculates the global product of z.
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: n
......@@ -1099,10 +1099,10 @@
! This is a test routine for checking if the eigenvalues are monotonically increasing.
! It is for debug purposes only, an error should never be triggered!
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: n
real(kind=REAL_DATATYPE) :: d(n)
character*(*) :: text
......
src/elpa1/elpa1_solve_tridi_real_template.X90
View file @ 2d2f192b
......@@ -60,9 +60,9 @@ subroutine solve_tridi_&
mpi_comm_cols, wantDebug, success )
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, nev, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
real(kind=REAL_DATATYPE), intent(inout) :: d(na), e(na)
#ifdef USE_ASSUMED_SIZE
......@@ -239,13 +239,13 @@ subroutine solve_tridi_&
&PRECISION &
(obj, np_off, nprocs, wantDebug, success)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
! noff is always a multiple of nblk_ev
! nlen-noff is always > nblk_ev
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: np_off, nprocs
integer(kind=ik) :: np1, np2, noff, nlen, nmid, n
#ifdef WITH_MPI
......@@ -352,9 +352,9 @@ subroutine solve_tridi_&
! with the divide and conquer method.
! Works best if the number of processor rows is a power of 2!
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: na, nev, nqoff, ldq, nblk, matrixCols, mpi_comm_rows
real(kind=REAL_DATATYPE) :: d(na), e(na)
......@@ -576,9 +576,9 @@ subroutine solve_tridi_&
! Solves the symmetric, tridiagonal eigenvalue problem on a single processor.
! Takes precautions if DSTEDC fails or if the eigenvalues are not ordered correctly.
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: nlen, ldq
real(kind=REAL_DATATYPE) :: d(nlen), e(nlen), q(ldq,nlen)
......
src/elpa1/elpa1_template.X90
View file @ 2d2f192b
......@@ -63,13 +63,12 @@ function elpa_solve_evp_&
use cuda_functions
use mod_check_for_gpu
use iso_c_binding
use elpa_api
use elpa_abstract_impl
use elpa_mpi
use elpa1_compute
use elpa1_utilities, only : gpu_usage_via_environment_variable
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
real(kind=REAL_DATATYPE), intent(out) :: ev(obj%na)
#if REALCASE == 1
#ifdef USE_ASSUMED_SIZE
......@@ -132,11 +131,6 @@ function elpa_solve_evp_&
else
useGPU = .false.
endif
! if (obj%get("summary_timings") .eq. 1) then
! summary_timings = .true.
! else
! summary_timings = .false.
! endif
call obj%timer%start("mpi_communication")
......@@ -175,7 +169,7 @@ function elpa_solve_evp_&
endif
else
! check whether set by environment variable
do_useGPU = gpu_usage_via_environment_variable()
do_useGPU = obj%get("gpu") == 1
if (do_useGPU) then
if (check_for_gpu(my_pe,numberOfGPUDevices, wantDebug=wantDebug)) then
......
src/elpa1/elpa1_tools_template.X90
View file @ 2d2f192b
......@@ -60,9 +60,9 @@
&PRECISION&
&(obj, v,n,s)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: n
real(kind=REAL_DATATYPE) :: v(n),s
......@@ -74,10 +74,10 @@
&PRECISION&
&(obj, g_col, l_col, noff, nlen, my_prow, np_rows, nblk)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
real(kind=REAL_DATATYPE) :: g_col(nlen), l_col(*) ! chnage this to proper 2d 1d matching ! remove assumed size
integer(kind=ik) :: noff, nlen, my_prow, np_rows, nblk
......@@ -155,10 +155,10 @@
!-------------------------------------------------------------------------------
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: n, i
real(kind=REAL_DATATYPE) :: d(n), z(n), delta(n), rho, dlam
......@@ -259,9 +259,9 @@
! It also hasn't the special handling for numbers < 1.d-300 or > 1.d150
! since this would be expensive for the parallel implementation.
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
#if REALCASE == 1
real(kind=REAL_DATATYPE), intent(inout) :: alpha
#endif
......
src/elpa1/elpa1_trans_ev_template.X90
View file @ 2d2f192b
......@@ -96,9 +96,9 @@
use cuda_functions
use iso_c_binding
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, nqc, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
#if REALCASE == 1
real(kind=REAL_DATATYPE), intent(in) :: tau(na)
......
src/elpa1/elpa1_tridiag_template.X90
View file @ 2d2f192b
......@@ -91,9 +91,9 @@
use cuda_functions
use iso_c_binding
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
logical, intent(in) :: useGPU
......
src/elpa1/elpa_cholesky_template.X90
View file @ 2d2f192b
......@@ -47,10 +47,10 @@
use elpa_utilities
use elpa_mpi
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
#if REALCASE == 1
#ifdef USE_ASSUMED_SIZE
......
src/elpa1/elpa_invert_trm.X90
View file @ 2d2f192b
......@@ -56,9 +56,9 @@
use elpa1_compute
use elpa_utilities
use elpa_mpi
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
#if REALCASE == 1
......
src/elpa1/elpa_multiply_a_b.X90
View file @ 2d2f192b
......@@ -58,10 +58,10 @@
use elpa1_compute
use elpa_mpi
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
character*1 :: uplo_a, uplo_c
......
src/elpa1/elpa_reduce_add_vectors.X90
View file @ 2d2f192b
......@@ -78,10 +78,10 @@ subroutine elpa_reduce_add_vectors_&
use omp_lib
#endif
use elpa_mpi
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: ld_s, comm_s, ld_t, comm_t, nvr, nvc, nblk
MATH_DATATYPE(kind=C_DATATYPE_KIND), intent(in) :: vmat_s(ld_s,nvc)
MATH_DATATYPE(kind=C_DATATYPE_KIND), intent(inout) :: vmat_t(ld_t,nvc)
......
src/elpa1/elpa_solve_tridi_impl_public.X90
View file @ 2d2f192b
......@@ -62,10 +62,10 @@
&PRECISION&
&_impl
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t):: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: na, nev, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
real(kind=REAL_DATATYPE) :: d(obj%na), e(obj%na)
#ifdef USE_ASSUMED_SIZE
......
src/elpa1/elpa_transpose_vectors.X90
View file @ 2d2f192b
......@@ -77,14 +77,14 @@ subroutine elpa_transpose_vectors_&
!
!-------------------------------------------------------------------------------
use precision
use elpa_api
use elpa_abstract_impl
#ifdef WITH_OPENMP
use omp_lib
#endif
use elpa_mpi
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: ld_s, comm_s, ld_t, comm_t, nvs, nvr, nvc, nblk
MATH_DATATYPE(kind=C_DATATYPE_KIND), intent(in) :: vmat_s(ld_s,nvc)
MATH_DATATYPE(kind=C_DATATYPE_KIND), intent(inout):: vmat_t(ld_t,nvc)
......
src/elpa1/legacy_interface/elpa1_template.X90
View file @ 2d2f192b
......@@ -104,6 +104,8 @@ function elpa_solve_evp_&
integer(kind=c_int) :: successInternal
class(elpa_t), pointer :: e
print *, "timer%start"
call timer%start("elpa_solve_evp_&
&MATH_DATATYPE&
&_1stage_&
......@@ -163,9 +165,9 @@ function elpa_solve_evp_&
endif
endif
call e%set("summary_timings", 1,successInternal)
call e%set("print_flops", 1,successInternal)
if (successInternal .ne. ELPA_OK) then
print *, "Cannot set summary_timings"
print *, "Cannot set print_flops"
success = .false.
return
endif
......@@ -186,6 +188,7 @@ function elpa_solve_evp_&
call elpa_uninit()
print *, "timer%stop"
call timer%stop("elpa_solve_evp_&
&MATH_DATATYPE&
&_1stage_&
......
src/elpa2/compute_hh_trafo.X90
View file @ 2d2f192b
......@@ -68,7 +68,7 @@
kernel)
use precision
use elpa_api
use elpa_abstract_impl
use iso_c_binding
#if REALCASE == 1
......@@ -108,7 +108,7 @@
use elpa_generated_fortran_interfaces
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
real(kind=c_double), intent(inout) :: kernel_time ! MPI_WTIME always needs double
integer(kind=lik) :: kernel_flops
integer(kind=ik), intent(in) :: nbw, max_blk_size
......
src/elpa2/elpa2_bandred_template.X90
View file @ 2d2f192b
......@@ -109,10 +109,10 @@
use omp_lib
#endif
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik) :: na, lda, nblk, nbw, matrixCols, numBlocks, mpi_comm_rows, mpi_comm_cols
#if REALCASE == 1
......
src/elpa2/elpa2_compute_real_template.X90
View file @ 2d2f192b
......@@ -99,12 +99,12 @@
! communicator
! MPI-Communicator for the total processor set
!-------------------------------------------------------------------------------
use elpa_api
use elpa_abstract_impl
use elpa2_workload
use precision
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, nb, nbCol, nb2, nb2Col, communicator
real(kind=REAL_DATATYPE), intent(inout) :: ab(2*nb,nbCol) ! removed assumed size
real(kind=REAL_DATATYPE), intent(inout) :: ab2(2*nb2,nb2Col) ! removed assumed size
......@@ -455,10 +455,10 @@
&PRECISION&
&(obj, n, nb, W, Y, tau, mem, lda)
use elpa_api
use elpa_abstract_impl
use precision
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: n !length of householder-vectors
integer(kind=ik), intent(in) :: nb !number of householder-vectors
integer(kind=ik), intent(in) :: lda !leading dimension of Y and W
......@@ -487,9 +487,9 @@
&(obj, n, m, nb, A, lda, W, Y, mem, lda2)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: n !width of the matrix A
integer(kind=ik), intent(in) :: m !length of matrix W and Y
integer(kind=ik), intent(in) :: nb !width of matrix W and Y
......@@ -513,9 +513,9 @@
&(obj, n, m, nb, A, lda, W, Y, mem, lda2)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: n !height of the matrix A
integer(kind=ik), intent(in) :: m !length of matrix W and Y
integer(kind=ik), intent(in) :: nb !width of matrix W and Y
......@@ -540,10 +540,10 @@
&PRECISION&
&(obj, n, nb, A, lda, W, Y, mem, mem2, lda2)
use elpa_api
use elpa_abstract_impl
use precision
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: n !width/heigth of the matrix A; length of matrix W and Y
integer(kind=ik), intent(in) :: nb !width of matrix W and Y
integer(kind=ik), intent(in) :: lda !leading dimension of A
......
src/elpa2/elpa2_determine_workload.F90
View file @ 2d2f192b
......@@ -71,11 +71,11 @@ module elpa2_workload
contains
subroutine determine_workload(obj, na, nb, nprocs, limits)
use elpa_api
use elpa_abstract_impl
use precision
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: na, nb, nprocs
integer(kind=ik), intent(out) :: limits(0:nprocs)
......@@ -109,9 +109,9 @@ module elpa2_workload
subroutine divide_band(obj, nblocks_total, n_pes, block_limits)
use precision
use elpa_api
use elpa_abstract_impl
implicit none
class(elpa_t) :: obj
class(elpa_abstract_impl_t), intent(inout) :: obj
integer(kind=ik), intent(in) :: nblocks_total ! total number of blocks in band
integer(kind=ik), intent(in) :: n_pes ! number of PEs for division
integer(kind=ik), intent(out) :: block_limits(0:n_pes)
......
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