Merge branch 'master' into 'master'

starpu: use starpu_mpi_wait_for_all when available

See merge request !210

CMakeLists.txt

@@ -645,6 +645,10 @@ if( CHAMELEON_SCHED_STARPU )
         if ( HAVE_STARPU_MPI_INIT_CONF )
             message("-- ${Blue}Add definition HAVE_STARPU_MPI_INIT_CONF${ColourReset}")
         endif()
+        check_function_exists(starpu_mpi_wait_for_all HAVE_STARPU_MPI_WAIT_FOR_ALL)
+        if ( HAVE_STARPU_MPI_WAIT_FOR_ALL )
+            message("-- ${Blue}Add definition HAVE_STARPU_MPI_WAIT_FOR_ALL${ColourReset}")
+        endif()
         check_function_exists(starpu_mpi_data_migrate HAVE_STARPU_MPI_DATA_MIGRATE)
         if ( HAVE_STARPU_MPI_DATA_MIGRATE )
             message("-- ${Blue}Add definition HAVE_STARPU_MPI_DATA_MIGRATE${ColourReset}")

runtime/starpu/control/runtime_async.c

@@ -55,9 +55,15 @@ int RUNTIME_sequence_wait( CHAM_context_t  *chamctxt,
         RUNTIME_progress(chamctxt);
     }
 
-    starpu_task_wait_for_all();
 #if defined(CHAMELEON_USE_MPI)
+#  if defined(HAVE_STARPU_MPI_WAIT_FOR_ALL)
+    starpu_mpi_wait_for_all(MPI_COMM_WORLD);
+#  else
+    starpu_task_wait_for_all();
     starpu_mpi_barrier(MPI_COMM_WORLD);
+#  endif
+#else
+    starpu_task_wait_for_all();
 #endif
     return CHAMELEON_SUCCESS;
 }

runtime/starpu/control/runtime_control.c

@@ -198,9 +198,17 @@ void RUNTIME_resume( CHAM_context_t *chamctxt )
 void RUNTIME_barrier( CHAM_context_t *chamctxt )
 {
     (void)chamctxt;
-    starpu_task_wait_for_all();
+
 #if defined(CHAMELEON_USE_MPI)
+#  if defined(HAVE_STARPU_MPI_WAIT_FOR_ALL)
+    starpu_mpi_wait_for_all(MPI_COMM_WORLD);
+    starpu_mpi_barrier(MPI_COMM_WORLD);
+#  else
+    starpu_task_wait_for_all();
     starpu_mpi_barrier(MPI_COMM_WORLD);
+#  endif
+#else
+    starpu_task_wait_for_all();
 #endif
 }
 

runtime/starpu/include/chameleon_starpu.h.in

@@ -37,6 +37,7 @@
 #cmakedefine HAVE_STARPU_MPI_CACHED_RECEIVE
 #cmakedefine HAVE_STARPU_MPI_COMM_GET_ATTR
 #cmakedefine HAVE_STARPU_MPI_INIT_CONF
+#cmakedefine HAVE_STARPU_MPI_WAIT_FOR_ALL
 
 #if defined(CHAMELEON_USE_MPI)
 #include <starpu_mpi.h>