Merge branch 'master' into ELPA_GPU

Makefile.am

@@ -249,24 +249,8 @@ pkgconfig_DATA = @PKG_CONFIG_FILE@
 
 # programs
 bin_PROGRAMS = \
-  elpa1_test_real@SUFFIX@ \
-  elpa1_test_complex@SUFFIX@ \
-  elpa2_test_real@SUFFIX@ \
-  elpa2_test_complex@SUFFIX@ \
   elpa2_print_kernels@SUFFIX@
 
-if WANT_SINGLE_PRECISION_COMPLEX
-bin_PROGRAMS += \
-  elpa1_test_complex_single_precision@SUFFIX@ \
-  elpa2_test_complex_single_precision@SUFFIX@
-endif
-
-if WANT_SINGLE_PRECISION_REAL
-bin_PROGRAMS += \
-  elpa1_test_real_single_precision@SUFFIX@ \
-  elpa2_test_real_single_precision@SUFFIX@
-endif
-
 noinst_PROGRAMS = \
   elpa2_test_real_default_kernel@SUFFIX@ \
   elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@ \
@@ -277,16 +261,24 @@ noinst_PROGRAMS = \
   elpa1_test_complex_c_version@SUFFIX@ \
   elpa2_test_real_c_version@SUFFIX@ \
   elpa2_test_complex_c_version@SUFFIX@ \
-  elpa1_test_real_with_c@SUFFIX@
+  elpa1_test_real_with_c@SUFFIX@ \
+  elpa1_test_complex@SUFFIX@ \
+  elpa1_test_real@SUFFIX@ \
+  elpa2_test_complex@SUFFIX@ \
+  elpa2_test_real@SUFFIX@
 
 if WANT_SINGLE_PRECISION_COMPLEX
 noinst_PROGRAMS += \
+  elpa1_test_complex_single_precision@SUFFIX@ \
+  elpa2_test_complex_single_precision@SUFFIX@ \
   elpa2_test_complex_default_kernel_single_precision@SUFFIX@ \
   elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@
 endif
 
 if WANT_SINGLE_PRECISION_REAL
 noinst_PROGRAMS += \
+  elpa1_test_real_single_precision@SUFFIX@ \
+  elpa2_test_real_single_precision@SUFFIX@ \
   elpa2_test_real_default_kernel_single_precision@SUFFIX@ \
   elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@ \
   elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@

src/elpa2_utilities.F90

@@ -99,6 +99,7 @@ module ELPA2_utilities
   public :: AVAILABLE_COMPLEX_ELPA_KERNELS, AVAILABLE_REAL_ELPA_KERNELS
 
   public :: print_available_real_kernels, print_available_complex_kernels
+  public :: query_available_real_kernels, query_available_complex_kernels
 
   public :: qr_decomposition_via_environment_variable
 
@@ -445,7 +446,6 @@ module ELPA2_utilities
 
 !******
   contains
-
     subroutine print_available_real_kernels
 #ifdef HAVE_DETAILED_TIMINGS
       use timings
@@ -459,6 +459,33 @@ module ELPA2_utilities
       call timer%start("print_available_real_kernels")
 #endif
 
+      do i=1, number_of_real_kernels
+        if (AVAILABLE_REAL_ELPA_KERNELS(i) .eq. 1) then
+          write(*,*) REAL_ELPA_KERNEL_NAMES(i)
+        endif
+      enddo
+      write(*,*) " "
+      write(*,*) " At the moment the following kernel would be choosen:"
+      write(*,*) get_actual_real_kernel_name()
+
+#ifdef HAVE_DETAILED_TIMINGS
+      call timer%stop("print_available_real_kernels")
+#endif
+
+    end subroutine print_available_real_kernels
+
+    subroutine query_available_real_kernels
+#ifdef HAVE_DETAILED_TIMINGS
+      use timings
+#endif
+      implicit none
+
+      integer :: i
+
+#ifdef HAVE_DETAILED_TIMINGS
+      call timer%start("query_available_real_kernels")
+#endif
+
       do i=1, number_of_real_kernels
         if (AVAILABLE_REAL_ELPA_KERNELS(i) .eq. 1) then
           write(error_unit,*) REAL_ELPA_KERNEL_NAMES(i)
@@ -469,10 +496,10 @@ module ELPA2_utilities
       write(error_unit,*) get_actual_real_kernel_name()
 
 #ifdef HAVE_DETAILED_TIMINGS
-      call timer%stop("print_available_real_kernels")
+      call timer%stop("query_available_real_kernels")
 #endif
 
-    end subroutine print_available_real_kernels
+    end subroutine query_available_real_kernels
 
     subroutine print_available_complex_kernels
 #ifdef HAVE_DETAILED_TIMINGS
@@ -486,6 +513,33 @@ module ELPA2_utilities
       call timer%start("print_available_complex_kernels")
 #endif
 
+      do i=1, number_of_complex_kernels
+        if (AVAILABLE_COMPLEX_ELPA_KERNELS(i) .eq. 1) then
+           write(*,*) COMPLEX_ELPA_KERNEL_NAMES(i)
+        endif
+      enddo
+      write(*,*) " "
+      write(*,*) " At the moment the following kernel would be choosen:"
+      write(*,*) get_actual_complex_kernel_name()
+
+#ifdef HAVE_DETAILED_TIMINGS
+      call timer%stop("print_available_complex_kernels")
+#endif
+
+    end subroutine print_available_complex_kernels
+
+    subroutine query_available_complex_kernels
+#ifdef HAVE_DETAILED_TIMINGS
+      use timings
+#endif
+
+      implicit none
+
+      integer :: i
+#ifdef HAVE_DETAILED_TIMINGS
+      call timer%start("query_available_complex_kernels")
+#endif
+
       do i=1, number_of_complex_kernels
         if (AVAILABLE_COMPLEX_ELPA_KERNELS(i) .eq. 1) then
            write(error_unit,*) COMPLEX_ELPA_KERNEL_NAMES(i)
@@ -496,10 +550,10 @@ module ELPA2_utilities
       write(error_unit,*) get_actual_complex_kernel_name()
 
 #ifdef HAVE_DETAILED_TIMINGS
-      call timer%stop("print_available_complex_kernels")
+      call timer%stop("query_available_complex_kernels")
 #endif
 
-    end subroutine print_available_complex_kernels
+    end subroutine query_available_complex_kernels
 
     function get_actual_real_kernel() result(actual_kernel)
 #ifdef HAVE_DETAILED_TIMINGS