Fix compilation with starpu

example/lapack_to_morse/step6.c

@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
     MORSE_Set(MORSE_INNER_BLOCK_SIZE, iparam[IPARAM_IB] );
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &NMPIPROC );
+    NMPIPROC = MORSE_Comm_size();
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&
          (NMPIPROC % iparam[IPARAM_P] != 0) ) {

example/lapack_to_morse/step7.c

@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
     MORSE_Set(MORSE_INNER_BLOCK_SIZE, iparam[IPARAM_IB] );
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &NMPIPROC );
+    NMPIPROC = MORSE_Comm_size();
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&
          (NMPIPROC % iparam[IPARAM_P] != 0) ) {

include/chameleon/chameleon_config.h.in

@@ -25,10 +25,6 @@
 #ifndef CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED
 #define CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED
 
-#define MORSE_VERSION_MAJOR @MORSE_VERSION_MAJOR@
-#define MORSE_VERSION_MINOR @MORSE_VERSION_MINOR@
-#define MORSE_VERSION_MICRO @MORSE_VERSION_MICRO@
-
 #define CHAMELEON_VERSION_MAJOR @CHAMELEON_VERSION_MAJOR@
 #define CHAMELEON_VERSION_MINOR @CHAMELEON_VERSION_MINOR@
 #define CHAMELEON_VERSION_MICRO @CHAMELEON_VERSION_MICRO@

runtime/starpu/control/runtime_control.c

@@ -107,8 +107,8 @@ int RUNTIME_init( MORSE_context_t *morse,
         MPI_Initialized( &flag );
 #endif
         starpu_mpi_init(NULL, NULL, !flag);
-        RUNTIME_comm_rank(&(morse->my_mpi_rank));
-        RUNTIME_comm_size(&(morse->mpi_comm_size));
+        morse->my_mpi_rank = RUNTIME_comm_rank( morse );
+        morse->mpi_comm_size = RUNTIME_comm_size( morse );
     }
 #endif
 

timing/timing.c

@@ -687,7 +687,7 @@ main(int argc, char *argv[]) {
         MORSE_Enable(MORSE_GEMM3M);
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &nbnode );
+    nbnode = MORSE_Comm_size();
     iparam[IPARAM_NMPI] = nbnode;
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&