Add error return parameter for autotune functions

elpa/elpa_generic.h

 #pragma once
+#if 0
+/*! \brief generic C method for elpa_autotune_print_best
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \result none
+ */
+#define elpa_autotune_print_best(X) _Generic((X), elpa_autotune_print_best_no_err, \
+		elpa_autotune_print_best_err)(X)
+
+/*! \brief generic C method for elpa_autotune_set_best
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \param  error            int *
+ *  \result none 
+ */
+#define elpa_autotune_set_best(X) _Generic((X), elpa_autotune_set_best_no_err, \
+		elpa_autotune_set_best_err)(X)
+
+
+/*! \brief generic C method for elpa_autotune_step
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \param  error            int *error code
+ *  \result int              unfinished:  describes whether autotuning finished (0) or not (1)
+ */
+#define elpa_autotune_step(X) _Generic((X), elpa_autotune_step_no_err, \
+		elpa_autotune_step_err)(X)
+#endif
+
+#if 0
+/*! \brief generic C method for elpa_autotune_print_best
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \result none 
+ */
+#define elpa_autotune_print_best(...) OVERLOAD(elpa_autotune_print_best (__VA_ARGS__), \
+    (elpa_autotune_print_best_no_err (elpa_t, elpa_autotune_t)), \
+    (elpa_autotune_print_best_err (elpa_t, elpa_autotune_t, int*)), \
+    )
+
+/*! \brief generic C method for elpa_autotune_set_best
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \param  error            int *
+ *  \result none 
+ */
+#define elpa_autotune_set_best(...) OVERLOAD(elpa_autotune_set_best (__VA_ARGS__), \
+    (elpa_autotune_set_best_no_err (elpa_t, elpa_autotune_t)), \
+    (elpa_autotune_set_best_err (elpa_t, elpa_autotune_t, int*)), \
+    )
+
+/*! \brief generic C method for elpa_autotune_step
+ *
+ *  \param  elpa_t           handle: of the ELPA object which should be tuned
+ *  \param  elpa_autotune_t  autotune_handle: the autotuning object
+ *  \param  error            int *error code
+ *  \result int              unfinished:  describes whether autotuning finished (0) or not (1)
+ */
+#define elpa_autotune_step(...) OVERLOAD(elpa_autotune_step (__VA_ARGS__), \
+    (elpa_autotune_step_no_err (elpa_t, elpa_autotune_t)), \
+    (elpa_autotune_step_err (elpa_t, elpa_autotune_t, int*)), \
+    )
+#endif
 
 /*! \brief generic C method for elpa_set
  *

src/elpa_api.F90

@@ -325,13 +325,15 @@ module elpa_api
   !> \param   self        class(elpa_t): the ELPA object, which should be tuned
   !> \param   tune_state  class(elpa_autotune_t): the autotuning object
   !> \param   unfinished  logical: state whether tuning is unfinished or not
+  !> \param   error       integer, optional
   abstract interface
-    function elpa_autotune_step_i(self, tune_state) result(unfinished)
+    function elpa_autotune_step_i(self, tune_state, error) result(unfinished)
       import elpa_t, elpa_autotune_t
       implicit none
-      class(elpa_t), intent(inout) :: self
+      class(elpa_t), intent(inout)                  :: self
       class(elpa_autotune_t), intent(inout), target :: tune_state
-      logical :: unfinished
+      logical                                       :: unfinished
+      integer, optional, intent(out)                :: error
     end function
   end interface
 
@@ -341,13 +343,15 @@ module elpa_api
   !> \details
   !> \param   self        class(elpa_t): the ELPA object, which should be tuned
   !> \param   tune_state  class(elpa_autotune_t): the autotuning object
+  !> \param   error       integer, optional
   !> Sets the best combination of ELPA options
   abstract interface
-    subroutine elpa_autotune_set_best_i(self, tune_state)
+    subroutine elpa_autotune_set_best_i(self, tune_state, error)
       import elpa_t, elpa_autotune_t
       implicit none
-      class(elpa_t), intent(inout) :: self
+      class(elpa_t), intent(inout)               :: self
       class(elpa_autotune_t), intent(in), target :: tune_state
+      integer, optional, intent(out)             :: error
     end subroutine
   end interface
 
@@ -357,13 +361,15 @@ module elpa_api
   !> \details
   !> \param   self        class(elpa_t): the ELPA object, which should be tuned
   !> \param   tune_state  class(elpa_autotune_t): the autotuning object
+  !> \param   error       integer, optional
   !> Prints the best combination of ELPA options
   abstract interface
-    subroutine elpa_autotune_print_best_i(self, tune_state)
+    subroutine elpa_autotune_print_best_i(self, tune_state, error)
       import elpa_t, elpa_autotune_t
       implicit none
-      class(elpa_t), intent(inout) :: self
+      class(elpa_t), intent(inout)               :: self
       class(elpa_autotune_t), intent(in), target :: tune_state
+      integer, optional, intent(out)             :: error
     end subroutine
   end interface
 

test/C/test_autotune.c

@@ -219,7 +219,7 @@ int main(int argc, char** argv) {
 
    for (i=0; i < 20; i++) {
 
-      unfinished = elpa_autotune_step(handle, autotune_handle);
+      unfinished = elpa_autotune_step_err(handle, autotune_handle, &error);
 
       if (unfinished == 0) {
         if (myid == 0) {
@@ -269,7 +269,7 @@ int main(int argc, char** argv) {
      }	     
 
    }
-   elpa_autotune_set_best(handle, autotune_handle);
+   elpa_autotune_set_best_no_err(handle, autotune_handle);
 
    elpa_autotune_deallocate(autotune_handle);
    elpa_deallocate(handle);