Fix single-precision tests after merge

Makefile.am

@@ -331,7 +331,8 @@ noinst_PROGRAMS += \
   elpa2_test_real_single_precision@SUFFIX@ \
   elpa2_test_real_default_single_precision@SUFFIX@ \
   elpa2_test_real_qr_single_precision@SUFFIX@ \
-  elpa2_test_real_api_single_precision@SUFFIX@
+  elpa2_test_real_api_single_precision@SUFFIX@ \
+  elpa1_real_toeplitz_single_precision@SUFFIX@
 endif
 
 if WITH_GPU_VERSION
@@ -470,7 +471,7 @@ elpa2_test_real_single_precision@SUFFIX@_LDADD = $(build_lib)
 elpa2_test_real_single_precision@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 EXTRA_elpa2_test_real_single_precision@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa1_real_toeplitz_single_precision@SUFFIX@_SOURCES = test/Fortran/test_toeplitz_single_precision.F90
+elpa1_real_toeplitz_single_precision@SUFFIX@_SOURCES = test/Fortran/test_toeplitz_single.F90
 elpa1_real_toeplitz_single_precision@SUFFIX@_LDADD = $(build_lib)
 elpa1_real_toeplitz_single_precision@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 EXTRA_elpa1_real_toeplitz_single_precision@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
@@ -571,17 +572,17 @@ if WANT_SINGLE_PRECISION_REAL
 check_SCRIPTS += \
   elpa1_test_real_single_precision@SUFFIX@.sh \
   elpa2_test_real_single_precision@SUFFIX@.sh \
-  elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh \
-  elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh \
-  elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh
+  elpa2_test_real_default_single_precision@SUFFIX@.sh \
+  elpa2_test_real_qr_single_precision@SUFFIX@.sh \
+  elpa2_test_real_api_single_precision@SUFFIX@.sh
 endif
 
 if WANT_SINGLE_PRECISION_COMPLEX
 check_SCRIPTS += \
   elpa1_test_complex_single_precision@SUFFIX@.sh \
   elpa2_test_complex_single_precision@SUFFIX@.sh \
-  elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh \
-  elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh
+  elpa2_test_complex_default_single_precision@SUFFIX@.sh \
+  elpa2_test_complex_api_single_precision@SUFFIX@.sh
 endif
 
 if WITH_GPU_VERSION

src/elpa1_auxiliary.F90

@@ -3376,7 +3376,8 @@ module elpa1_auxiliary
 !> \param wantDebug             logical, give more debug information if .true.
 !> \result success              logical, .true. on success, else .false.
 
-    function elpa_solve_tridi_single(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug) result(success)
+    function elpa_solve_tridi_single(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
+                                     mpi_comm_cols, wantDebug) result(success)
 
       use elpa1_compute, solve_tridi_single_private => solve_tridi_single
       use precision

src/elpa_c_interface.F90

@@ -786,7 +786,8 @@
       wantDebugFortran = .false.
     endif
 
-    successFortran = elpa_solve_tridi_float(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebugFortran)
+    successFortran = elpa_solve_tridi_single(na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm_rows, &
+                                             mpi_comm_cols, wantDebugFortran)
 
     if (successFortran) then
       success = 1
@@ -901,7 +902,7 @@
                                              nblk, mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) &
     bind(C,name="elpa_mult_at_b_real_float") result(success)
     use, intrinsic :: iso_c_binding
-    use elpa1_auxiliary, only : elpa_mult_at_b_real_float
+    use elpa1_auxiliary, only : elpa_mult_at_b_real_single
 
     implicit none
 
@@ -916,7 +917,7 @@
 #endif
     logical                     :: successFortran
 
-    successFortran = elpa_mult_at_b_real_float(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, &
+    successFortran = elpa_mult_at_b_real_single(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, &
                                                nblk, mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols)
 
     if (successFortran) then
@@ -1051,7 +1052,7 @@
 #endif
     logical                        :: successFortran
 
-    successFortran = elpa_mult_ah_b_complex_float(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, &
+    successFortran = elpa_mult_ah_b_complex_single(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, &
                                                   nblk, mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols)
 
     if (successFortran) then
@@ -1235,7 +1236,8 @@
  !c> */
 
  !c> int elpa_invert_trm_complex_single(int na, complex *a, int lda, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int wantDebug);
- function elpa_invert_trm_complex_wrapper_single(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug) result(success) &
+ function elpa_invert_trm_complex_wrapper_single(na, a, lda, nblk, matrixCols, mpi_comm_rows, &
+                                                 mpi_comm_cols, wantDebug) result(success) &
    bind(C,name="elpa_invert_trm_complex_single")
 
    use, intrinsic :: iso_c_binding
@@ -1445,7 +1447,8 @@
  !c> */
 
  !c> int elpa_cholesky_complex_single(int na, complex *a, int lda, int nblk, int matrixCols, int mpi_comm_rows, int mpi_comm_cols, int wantDebug);
- function elpa_cholesky_complex_wrapper_single(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug) result(success) &
+ function elpa_cholesky_complex_wrapper_single(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
+                                               wantDebug) result(success) &
        bind(C,name="elpa_cholesky_complex_single")
 
    use, intrinsic :: iso_c_binding

test/Fortran/test_complex2_default_single.F90

@@ -82,7 +82,7 @@ program test_complex2_default_kernel_single_precision
    use ELPA2
    use mod_check_for_gpu, only : check_for_gpu
    use elpa_utilities, only : error_unit
-
+   use elpa2_utilities
 #ifdef WITH_OPENMP
    use test_util
 #endif

test/Fortran/test_toeplitz_single.F90

@@ -106,7 +106,7 @@ program test_solve_tridi_single
 
    logical                     :: wantDebug
 
-   real(kind=rk4), parameter   :: pi = 3.141592653589793238462643383279_rk
+   real(kind=rk4), parameter   :: pi = 3.141592653589793238462643383279_rk4
 
    integer(kind=ik)            :: iseed(4096) ! Random seed, size should be sufficient for every generator
 
@@ -371,7 +371,7 @@ program test_solve_tridi_single
    allocate(tmp1(na_rows,na_cols))
    allocate(tmp2(na_rows,na_cols))
 
-   status = check_correctness(na, nev, as, a, ev, sc_desc, myid, tmp1, tmp2)
+   status = check_correctness_single(na, nev, as, a, ev, sc_desc, myid, tmp1, tmp2)
 
    deallocate(a)