From 0365353e4fe4b2d9eea3b9c5578ac820c1903d70 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 11 Jan 2018 10:42:38 +0100
Subject: [PATCH] Fix compilation with starpu
---
example/lapack_to_morse/step6.c | 2 +-
example/lapack_to_morse/step7.c | 2 +-
include/chameleon/chameleon_config.h.in | 4 ----
runtime/starpu/control/runtime_control.c | 4 ++--
timing/timing.c | 2 +-
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/example/lapack_to_morse/step6.c b/example/lapack_to_morse/step6.c
index 325a0fd8b..51261b6c4 100644
--- a/example/lapack_to_morse/step6.c
+++ b/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) ) {
diff --git a/example/lapack_to_morse/step7.c b/example/lapack_to_morse/step7.c
index 378123abd..b9c0f9117 100644
--- a/example/lapack_to_morse/step7.c
+++ b/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) ) {
diff --git a/include/chameleon/chameleon_config.h.in b/include/chameleon/chameleon_config.h.in
index b1d6abb13..b2ea05211 100644
--- a/include/chameleon/chameleon_config.h.in
+++ b/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@
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index aec18aa50..deba03a2c 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/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
diff --git a/timing/timing.c b/timing/timing.c
index d054b1ef7..22015352b 100644
--- a/timing/timing.c
+++ b/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) &&
--
GitLab