Rename elpa template routines

src/elpa1/elpa1.F90

@@ -94,22 +94,22 @@ module elpa1_impl
   ! The following routines are public:
   private
 
-  public :: elpa_solve_evp_real_1stage_double_impl    !< Driver routine for real double-precision 1-stage eigenvalue problem
+  public :: elpa_solve_evp_real_1stage_all_host_arrays_double_impl    !< Driver routine for real double-precision 1-stage eigenvalue problem
 
 #ifdef WANT_SINGLE_PRECISION_REAL
-  public :: elpa_solve_evp_real_1stage_single_impl    !< Driver routine for real single-precision 1-stage eigenvalue problem
+  public :: elpa_solve_evp_real_1stage_all_host_arrays_single_impl    !< Driver routine for real single-precision 1-stage eigenvalue problem
 
 #endif
-  public :: elpa_solve_evp_complex_1stage_double_impl !< Driver routine for complex 1-stage eigenvalue problem
+  public :: elpa_solve_evp_complex_1stage_all_host_arrays_double_impl !< Driver routine for complex 1-stage eigenvalue problem
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
-  public :: elpa_solve_evp_complex_1stage_single_impl !< Driver routine for complex 1-stage eigenvalue problem
+  public :: elpa_solve_evp_complex_1stage_all_host_arrays_single_impl !< Driver routine for complex 1-stage eigenvalue problem
 #endif
 
 #ifdef HAVE_SKEWSYMMETRIC
-  public :: elpa_solve_skew_evp_real_1stage_double_impl    !< Driver routine for real double-precision 1-stage skew-symmetric eigenvalue problem
+  public :: elpa_solve_skew_evp_real_1stage_all_host_arrays_double_impl    !< Driver routine for real double-precision 1-stage skew-symmetric eigenvalue problem
 
 #ifdef WANT_SINGLE_PRECISION_REAL
-  public :: elpa_solve_skew_evp_real_1stage_single_impl    !< Driver routine for real single-precision 1-stage skew-symmetric eigenvalue problem
+  public :: elpa_solve_skew_evp_real_1stage_all_host_arrays_single_impl    !< Driver routine for real single-precision 1-stage skew-symmetric eigenvalue problem
 
 #endif
 #endif /* HAVE_SKEWSYMMETRIC */

src/elpa1/elpa1_template.F90

@@ -58,13 +58,13 @@
 #ifdef ACTIVATE_SKEW
 function elpa_solve_skew_evp_&
          &MATH_DATATYPE&
-   &_1stage_&
+   &_1stage_all_host_arrays_&
    &PRECISION&
    &_impl (obj, &
 #else
 function elpa_solve_evp_&
          &MATH_DATATYPE&
-   &_1stage_&
+   &_1stage_all_host_arrays_&
    &PRECISION&
    &_impl (obj, &
 #endif

src/elpa2/elpa2.F90

@@ -64,20 +64,20 @@ module elpa2_impl
 
   private
 
-  public :: elpa_solve_evp_real_2stage_double_impl          !< Driver routine for real double-precision 2-stage eigenvalue problem
-  public :: elpa_solve_evp_complex_2stage_double_impl       !< Driver routine for complex double-precision 2-stage eigenvalue problem
+  public :: elpa_solve_evp_real_2stage_all_host_arrays_double_impl          !< Driver routine for real double-precision 2-stage eigenvalue problem
+  public :: elpa_solve_evp_complex_2stage_all_host_arrays_double_impl       !< Driver routine for complex double-precision 2-stage eigenvalue problem
 #ifdef WANT_SINGLE_PRECISION_REAL
-  public :: elpa_solve_evp_real_2stage_single_impl          !< Driver routine for real single-precision 2-stage eigenvalue problem
+  public :: elpa_solve_evp_real_2stage_all_host_arrays_single_impl          !< Driver routine for real single-precision 2-stage eigenvalue problem
 #endif
 
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
-  public :: elpa_solve_evp_complex_2stage_single_impl       !< Driver routine for complex single-precision 2-stage eigenvalue problem
+  public :: elpa_solve_evp_complex_2stage_all_host_arrays_single_impl       !< Driver routine for complex single-precision 2-stage eigenvalue problem
 #endif
 
 #ifdef HAVE_SKEWSYMMETRIC
-  public :: elpa_solve_skew_evp_real_2stage_double_impl          !< Driver routine for real double-precision 2-stage skew-symmetric eigenvalue problem
+  public :: elpa_solve_skew_evp_real_2stage_all_host_arrays_double_impl          !< Driver routine for real double-precision 2-stage skew-symmetric eigenvalue problem
 #ifdef WANT_SINGLE_PRECISION_REAL
-  public :: elpa_solve_skew_evp_real_2stage_single_impl          !< Driver routine for real single-precision 2-stage skew-symmetric eigenvalue problem
+  public :: elpa_solve_skew_evp_real_2stage_all_host_arrays_single_impl          !< Driver routine for real single-precision 2-stage skew-symmetric eigenvalue problem
 #endif
 #endif /* HAVE_SKEWSYMMETRIC */
 

src/elpa2/elpa2_template.F90

@@ -62,7 +62,7 @@
 #endif
   &MATH_DATATYPE&
   &_&
-  &2stage_&
+  &2stage_all_host_arrays_&
   &PRECISION&
   &_impl (obj, &
 #ifdef REDISTRIBUTE_MATRIX
@@ -1150,14 +1150,6 @@
      &")
 1    format(a,f10.3)
 
-#ifdef ACTIVATE_SKEW
-   end function elpa_solve_skew_evp_&
-#else
-   end function elpa_solve_evp_&
-#endif
-   &MATH_DATATYPE&
-   &_2stage_&
-   &PRECISION&
-   &_impl
+   end function
 
 ! vim: syntax=fortran

src/elpa_impl_math_template.F90

@@ -110,7 +110,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_1stage_&
+                &_1stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -121,7 +121,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_2stage_&
+                &_2stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -276,7 +276,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_skew_evp_&
                 &MATH_DATATYPE&
-                &_1stage_&
+                &_1stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -287,7 +287,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_skew_evp_&
                 &MATH_DATATYPE&
-                &_2stage_&
+                &_2stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -418,7 +418,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                          &_1stage_&
+                          &_1stage_all_host_arrays_&
                           &PRECISION&
                           &_impl(self, a, ev)
 #endif
@@ -429,7 +429,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                                   &_2stage_&
+                                   &_2stage_all_host_arrays_&
                                    &PRECISION&
                                    &_impl(self, a, ev)
 #endif
@@ -571,7 +571,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_skew_evp_&
                 &MATH_DATATYPE&
-                          &_1stage_&
+                          &_1stage_all_host_arrays_&
                           &PRECISION&
                           &_impl(self, a, ev)
 #endif
@@ -582,7 +582,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_skew_evp_&
                 &MATH_DATATYPE&
-                                   &_2stage_&
+                                   &_2stage_all_host_arrays_&
                                    &PRECISION&
                                    &_impl(self, a, ev)
 #endif
@@ -723,7 +723,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_1stage_&
+                &_1stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -731,7 +731,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_2stage_&
+                &_2stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev, q)
 #endif
@@ -900,7 +900,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_1stage_&
+                &_1stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev)
 #endif
@@ -908,7 +908,7 @@
 #if defined(INCLUDE_ROUTINES)
         success_l = elpa_solve_evp_&
                 &MATH_DATATYPE&
-                &_2stage_&
+                &_2stage_all_host_arrays_&
                 &PRECISION&
                 &_impl(self, a, ev)
 #endif