More cleanup of test programs

Most of the test programs for the new interface were all essentially
copy&pasted from test.F90, now all of those directly use test.F90 with
appropriate preprocessor flags

autogen.sh

@@ -5,4 +5,5 @@ mkdir -p m4/
 test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 
+$srcdir/generate_automake_test_programs.py
 autoreconf --force --install --verbose "$srcdir"

generate_automake_test_programs.py

+#!/usr/bin/env python
+from __future__ import print_function
+from itertools import product
+
+domain_flag = {
+        "real"   : "-DTEST_REAL",
+        "complex": "-DTEST_COMPLEX",
+}
+prec_flag = {
+        "double" : "-DTEST_DOUBLE",
+        "single" : "-DTEST_SINGLE",
+}
+solver_flag = {
+        "1stage" : "-DTEST_SOLVER_1STAGE",
+        "2stage" : "-DTEST_SOLVER_2STAGE",
+}
+gpu_flag = {
+        0 : "-DTEST_GPU=0",
+        1 : "-DTEST_GPU=1",
+}
+
+f = open("test_programs.am", "w")
+
+for g, p, d, s in product(sorted(gpu_flag.keys()),
+                          sorted(prec_flag.keys()),
+                          sorted(domain_flag.keys()),
+                          sorted(solver_flag.keys())):
+    endifs = 0
+    extra_flags = []
+    if (g == 1):
+        print("if WITH_GPU_VERSION", file=f)
+        endifs += 1
+        if s == "2stage":
+            extra_flags.append("-DTEST_KERNEL=ELPA_2STAGE_{0}_GPU".format(d.upper()))
+
+    if (p == "single"):
+        if (d == "real"):
+            print("if WANT_SINGLE_PRECISION_REAL", file=f)
+        elif (d == "complex"):
+            print("if WANT_SINGLE_PRECISION_COMPLEX", file=f)
+        else:
+            raise Exception("Oh no!")
+        endifs += 1
+
+    name = "test_{0}_{1}_{2}{3}".format(d, p, s, "_gpu" if g else "")
+    print("noinst_PROGRAMS += " + name, file=f)
+    print("check_SCRIPTS += " + name + ".sh", file=f)
+    print(name + "_SOURCES = test/Fortran/test.F90", file=f)
+    print(name + "_LDADD = $(build_lib) $(FCLIBS)", file=f)
+    print(name + "_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules \\", file=f)
+    print("  " + " \\\n  ".join([
+        domain_flag[d],
+        prec_flag[p],
+        solver_flag[s],
+        gpu_flag[g]] + extra_flags), file=f)
+
+    print("endif\n" * endifs, file=f)

test/Fortran/elpa1/complex_1stage.F90

-!    This file is part of ELPA.
-!
-!    The ELPA library was originally created by the ELPA consortium,
-!    consisting of the following organizations:
-!
-!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-!      Informatik,
-!    - Technische Universität München, Lehrstuhl für Informatik mit
-!      Schwerpunkt Wissenschaftliches Rechnen ,
-!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-!      and
-!    - IBM Deutschland GmbH
-!
-!
-!    More information can be found here:
-!    http://elpa.mpcdf.mpg.de/
-!
-!    ELPA is free software: you can redistribute it and/or modify
-!    it under the terms of the version 3 of the license of the
-!    GNU Lesser General Public License as published by the Free
-!    Software Foundation.
-!
-!    ELPA is distributed in the hope that it will be useful,
-!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-!    GNU Lesser General Public License for more details.
-!
-!    You should have received a copy of the GNU Lesser General Public License
-!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-!
-!    ELPA reflects a substantial effort on the part of the original
-!    ELPA consortium, and we ask you to respect the spirit of the
-!    license that we chose: i.e., please contribute any changes you
-!    may have back to the original ELPA library distribution, and keep
-!    any derivatives of ELPA under the same license that we chose for
-!    the original distribution, the GNU Lesser General Public License.
-!
-!
-#include "config-f90.h"
-
-#include "../assert.h"
-
-program test_interface
-   use elpa
-
-   use test_setup_mpi
-   use test_prepare_matrix
-   use test_read_input_parameters
-   use test_blacs_infrastructure
-   use test_check_correctness
-
-   implicit none
-   ! matrix dimensions
-   integer :: na, nev, nblk
-
-   ! mpi
-   integer :: myid, nprocs
-   integer :: na_cols, na_rows  ! local matrix size
-   integer :: np_cols, np_rows  ! number of MPI processes per column/row
-   integer :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-   integer :: mpierr
-
-   ! blacs
-   integer :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-
-   ! The Matrix
-   complex(kind=C_DOUBLE_COMPLEX), allocatable :: a(:,:), as(:,:)
-   ! eigenvectors
-   complex(kind=C_DOUBLE_COMPLEX), allocatable :: z(:,:)
-   ! eigenvalues
-   real(kind=C_DOUBLE), allocatable :: ev(:)
-
-   integer :: success, status
-
-   integer(kind=c_int) :: solver
-   integer(kind=c_int) :: qr
-
-   type(output_t) :: write_to_file
-   class(elpa_t), pointer :: e
-
-   call read_input_parameters_traditional(na, nev, nblk, write_to_file)
-   call setup_mpi(myid, nprocs)
-
-   status = 0
-
-   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-      if(mod(nprocs,np_cols) == 0 ) exit
-   enddo
-
-   np_rows = nprocs/np_cols
-
-   my_prow = mod(myid, np_cols)
-   my_pcol = myid / np_cols
-
-   call set_up_blacsgrid(mpi_comm_world, my_blacs_ctxt, np_rows, np_cols, &
-                         nprow, npcol, my_prow, my_pcol)
-
-   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-
-   allocate(a (na_rows,na_cols), as(na_rows,na_cols))
-   allocate(z (na_rows,na_cols))
-   allocate(ev(na))
-
-   a(:,:) = 0.0
-   z(:,:) = 0.0
-   ev(:) = 0.0
-
-   call prepare_matrix(na, myid, sc_desc, a, z, as)
-
-   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-     print *, "ELPA API version not supported"
-     stop 1
-   endif
-
-   e => elpa_allocate()
-
-   call e%set("na", na, success)
-   assert_elpa_ok(success)
-   call e%set("nev", nev, success)
-   assert_elpa_ok(success)
-   call e%set("local_nrows", na_rows, success)
-   assert_elpa_ok(success)
-   call e%set("local_ncols", na_cols, success)
-   assert_elpa_ok(success)
-   call e%set("nblk", nblk, success)
-   assert_elpa_ok(success)
-   call e%set("mpi_comm_parent", MPI_COMM_WORLD, success)
-   assert_elpa_ok(success)
-   call e%set("process_row", my_prow, success)
-   assert_elpa_ok(success)
-   call e%set("process_col", my_pcol, success)
-   assert_elpa_ok(success)
-
-   assert(e%setup() .eq. ELPA_OK)
-
-   call e%set("solver", ELPA_SOLVER_1STAGE, success)
-   assert_elpa_ok(success)
-
-   call e%eigenvectors(a, ev, z, success)
-   assert_elpa_ok(success)
-
-   call elpa_deallocate(e)
-
-   call elpa_uninit()
-
-   status = check_correctness(na, nev, as, z, ev, sc_desc, myid)
-
-   deallocate(a)
-   deallocate(as)
-   deallocate(z)
-   deallocate(ev)
-
-#ifdef WITH_MPI
-   call blacs_gridexit(my_blacs_ctxt)
-   call mpi_finalize(mpierr)
-#endif
-   call EXIT(STATUS)
-
-end program

test/Fortran/elpa1/complex_1stage_gpu.F90

-!    This file is part of ELPA.
-!
-!    The ELPA library was originally created by the ELPA consortium,
-!    consisting of the following organizations:
-!
-!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-!      Informatik,
-!    - Technische Universität München, Lehrstuhl für Informatik mit
-!      Schwerpunkt Wissenschaftliches Rechnen ,
-!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-!      and
-!    - IBM Deutschland GmbH
-!
-!
-!    More information can be found here:
-!    http://elpa.mpcdf.mpg.de/
-!
-!    ELPA is free software: you can redistribute it and/or modify
-!    it under the terms of the version 3 of the license of the
-!    GNU Lesser General Public License as published by the Free
-!    Software Foundation.
-!
-!    ELPA is distributed in the hope that it will be useful,
-!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-!    GNU Lesser General Public License for more details.
-!
-!    You should have received a copy of the GNU Lesser General Public License
-!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-!
-!    ELPA reflects a substantial effort on the part of the original
-!    ELPA consortium, and we ask you to respect the spirit of the
-!    license that we chose: i.e., please contribute any changes you
-!    may have back to the original ELPA library distribution, and keep
-!    any derivatives of ELPA under the same license that we chose for
-!    the original distribution, the GNU Lesser General Public License.
-!
-!
-#include "config-f90.h"
-
-#include "../assert.h"
-
-program test_interface
-   use precision
-   use test_setup_mpi
-   use elpa_mpi
-   use elpa
-   use test_prepare_matrix
-   use test_read_input_parameters
-   use test_blacs_infrastructure
-   use test_check_correctness
-#ifdef HAVE_DETAILED_TIMINGS
-   use timings
-#endif
-
-   implicit none
-
-   ! matrix dimensions
-   integer :: na, nev, nblk
-
-   ! mpi
-   integer :: myid, nprocs
-   integer :: na_cols, na_rows  ! local matrix size
-   integer :: np_cols, np_rows  ! number of MPI processes per column/row
-   integer :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-   integer :: mpierr
-
-   ! blacs
-   integer :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-
-   ! The Matrix
-   complex(kind=C_DOUBLE_COMPLEX), allocatable :: a(:,:), as(:,:)
-   ! eigenvectors
-   complex(kind=C_DOUBLE_COMPLEX), allocatable :: z(:,:)
-   ! eigenvalues
-   real(kind=C_DOUBLE), allocatable :: ev(:)
-
-   integer :: success, status
-
-   integer(kind=c_int) :: solver
-   integer(kind=c_int) :: qr
-
-   type(output_t) :: write_to_file
-   class(elpa_t), pointer :: e
-
-   call read_input_parameters_traditional(na, nev, nblk, write_to_file)
-   call setup_mpi(myid, nprocs)
-
-   status = 0
-
-#ifdef HAVE_DETAILED_TIMINGS
-
-   ! initialise the timing functionality
-
-#ifdef HAVE_LIBPAPI
-   call timer%measure_flops(.true.)
-#endif
-
-   call timer%measure_allocated_memory(.true.)
-   call timer%measure_virtual_memory(.true.)
-   call timer%measure_max_allocated_memory(.true.)
-
-   call timer%set_print_options(&
-#ifdef HAVE_LIBPAPI
-                print_flop_count=.true., &
-                print_flop_rate=.true., &
-#endif
-                print_allocated_memory = .true. , &
-                print_virtual_memory=.true., &
-                print_max_allocated_memory=.true.)
-
-
-  call timer%enable()
-
-  call timer%start("program")
-#endif
-
-   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-      if(mod(nprocs,np_cols) == 0 ) exit
-   enddo
-
-   np_rows = nprocs/np_cols
-
-   my_prow = mod(myid, np_cols)
-   my_pcol = myid / np_cols
-
-   call set_up_blacsgrid(mpi_comm_world, my_blacs_ctxt, np_rows, np_cols, &
-                         nprow, npcol, my_prow, my_pcol)
-
-   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%start("set up matrix")
-#endif
-
-   allocate(a (na_rows,na_cols), as(na_rows,na_cols))
-   allocate(z (na_rows,na_cols))
-   allocate(ev(na))
-
-   a(:,:) = 0.0
-   z(:,:) = 0.0
-   ev(:) = 0.0
-
-   call prepare_matrix(na, myid, sc_desc, a, z, as)
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%stop("set up matrix")
-#endif
-   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-     print *, "ELPA API version not supported"
-     stop 1
-   endif
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%start("prepare_elpa")
-#endif
-
-   e => elpa_allocate()
-
-   call e%set("na", na, success)
-   assert_elpa_ok(success)
-   call e%set("nev", nev, success)
-   assert_elpa_ok(success)
-   call e%set("local_nrows", na_rows, success)
-   assert_elpa_ok(success)
-   call e%set("local_ncols", na_cols, success)
-   assert_elpa_ok(success)
-   call e%set("nblk", nblk, success)
-   assert_elpa_ok(success)
-   call e%set("mpi_comm_parent", MPI_COMM_WORLD, success)
-   assert_elpa_ok(success)
-   call e%set("process_row", my_prow, success)
-   assert_elpa_ok(success)
-   call e%set("process_col", my_pcol, success)
-   assert_elpa_ok(success)
-
-   assert_elpa_ok(e%setup())
-
-   call e%set("solver", ELPA_SOLVER_1STAGE, success)
-   assert_elpa_ok(success)
-
-   call e%set("gpu", 1, success)
-   assert_elpa_ok(success)
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%stop("prepare_elpa")
-#endif
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%start("solve")
-#endif
-
-   call e%eigenvectors(a, ev, z, success)
-   assert_elpa_ok(success)
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%stop("solve")
-#endif
-
-   call elpa_deallocate(e)
-
-   call elpa_uninit()
-
-   status = check_correctness(na, nev, as, z, ev, sc_desc, myid)
-
-   deallocate(a)
-   deallocate(as)
-   deallocate(z)
-   deallocate(ev)
-
-#ifdef HAVE_DETAILED_TIMINGS
-   call timer%stop("program")
-   print *," "
-   print *,"Timings program:"
-   print *," "
-   call timer%print("program")
-   print *," "
-   print *,"End timings program"
-   print *," "
-#endif
-
-
-#ifdef WITH_MPI
-   call blacs_gridexit(my_blacs_ctxt)
-   call mpi_finalize(mpierr)
-#endif
-
-   call EXIT(STATUS)
-
-end program

test/Fortran/elpa1/real_1stage.F90

-!    This file is part of ELPA.
-!
-!    The ELPA library was originally created by the ELPA consortium,
-!    consisting of the following organizations:
-!
-!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-!      Informatik,
-!    - Technische Universität München, Lehrstuhl für Informatik mit
-!      Schwerpunkt Wissenschaftliches Rechnen ,
-!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-!      and
-!    - IBM Deutschland GmbH
-!
-!
-!    More information can be found here:
-!    http://elpa.mpcdf.mpg.de/
-!
-!    ELPA is free software: you can redistribute it and/or modify
-!    it under the terms of the version 3 of the license of the
-!    GNU Lesser General Public License as published by the Free
-!    Software Foundation.
-!
-!    ELPA is distributed in the hope that it will be useful,
-!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-!    GNU Lesser General Public License for more details.
-!
-!    You should have received a copy of the GNU Lesser General Public License
-!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-!
-!    ELPA reflects a substantial effort on the part of the original
-!    ELPA consortium, and we ask you to respect the spirit of the
-!    license that we chose: i.e., please contribute any changes you
-!    may have back to the original ELPA library distribution, and keep
-!    any derivatives of ELPA under the same license that we chose for
-!    the original distribution, the GNU Lesser General Public License.
-!
-!
-#include "config-f90.h"
-
-#include "../assert.h"
-
-program test_interface
-   use elpa
-
-   use test_setup_mpi
-   use test_prepare_matrix
-   use test_read_input_parameters
-   use test_blacs_infrastructure
-   use test_check_correctness
-
-   implicit none
-
-   ! matrix dimensions
-   integer :: na, nev, nblk
-
-   ! mpi
-   integer :: myid, nprocs
-   integer :: na_cols, na_rows  ! local matrix size
-   integer :: np_cols, np_rows  ! number of MPI processes per column/row
-   integer :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-   integer :: mpierr
-
-   ! blacs
-   integer :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-
-   ! The Matrix
-   real(kind=C_DOUBLE), allocatable :: a(:,:), as(:,:)
-   ! eigenvectors
-   real(kind=C_DOUBLE), allocatable :: z(:,:)
-   ! eigenvalues
-   real(kind=C_DOUBLE), allocatable :: ev(:)
-
-   integer :: success, status
-
-   integer(kind=c_int) :: solver
-   integer(kind=c_int) :: qr
-
-   type(output_t) :: write_to_file
-   class(elpa_t), pointer :: e
-
-   call read_input_parameters_traditional(na, nev, nblk, write_to_file)
-   call setup_mpi(myid, nprocs)
-
-   status = 0
-
-   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-      if(mod(nprocs,np_cols) == 0 ) exit
-   enddo
-
-   np_rows = nprocs/np_cols
-
-   my_prow = mod(myid, np_cols)
-   my_pcol = myid / np_cols
-
-   call set_up_blacsgrid(mpi_comm_world, my_blacs_ctxt, np_rows, np_cols, &
-                         nprow, npcol, my_prow, my_pcol)
-
-   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-
-   allocate(a (na_rows,na_cols), as(na_rows,na_cols))
-   allocate(z (na_rows,na_cols))
-   allocate(ev(na))
-
-   a(:,:) = 0.0
-   z(:,:) = 0.0
-   ev(:) = 0.0
-
-   call prepare_matrix(na, myid, sc_desc, a, z, as)
-
-   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-     print *, "ELPA API version not supported"
-     stop 1
-   endif
-
-   e => elpa_allocate()
-
-   call e%set("na", na, success)
-   assert_elpa_ok(success)
-   call e%set("nev", nev, success)
-   assert_elpa_ok(success)
-   call e%set("local_nrows", na_rows, success)
-   assert_elpa_ok(success)
-   call e%set("local_ncols", na_cols, success)
-   assert_elpa_ok(success)
-   call e%set("nblk", nblk, success)
-   assert_elpa_ok(success)
-
-   call e%set("mpi_comm_parent", MPI_COMM_WORLD, success)
-   assert_elpa_ok(success)
-   call e%set("process_row", my_prow, success)
-   assert_elpa_ok(success)
-   call e%set("process_col", my_pcol, success)
-   assert_elpa_ok(success)
-
-   assert(e%setup() == ELPA_OK)
-
-   call e%set("solver", ELPA_SOLVER_1STAGE, success)
-   assert_elpa_ok(success)
-   call e%eigenvectors(a, ev, z, success)
-   assert_elpa_ok(success)
-
-   if (myid .eq. 0) then
-     call e%print_times()
-   endif
-
-   call elpa_deallocate(e)
-
-   call elpa_uninit()
-
-   status = check_correctness(na, nev, as, z, ev, sc_desc, myid)