From 87f0342b1c2e90c84c646beab355e20491cbf56f Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 2 Oct 2015 23:24:42 +0000
Subject: [PATCH] control header files are internal to the library, they should
not be included in public headers
---
control/async.c | 1 -
control/common.h | 12 +++++++++---
include/morse.h.in | 10 +---------
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/control/async.c b/control/async.c
index b3df48acf..82d998930 100644
--- a/control/async.c
+++ b/control/async.c
@@ -30,7 +30,6 @@
* @brief Group routines exposed to users to handle asynchronous tasks execution
*
*/
-
#include <stdlib.h>
#include "control/common.h"
#include "runtime.h"
diff --git a/control/common.h b/control/common.h
index 283286e8b..8b88dbd2f 100644
--- a/control/common.h
+++ b/control/common.h
@@ -31,6 +31,7 @@
#ifndef _MORSE_COMMON_H_
#define _MORSE_COMMON_H_
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <string.h>
@@ -73,7 +74,6 @@
#include <magma.h>
#endif
-
/** ****************************************************************************
* Line to avoid conflict with magma, because, we don't know why
* but lapacke provide a wrong interface of lapack in fortran
@@ -81,15 +81,21 @@
#ifndef LAPACK_NAME
#define LAPACK_NAME(a, b) lapackef77_##a
#endif
+
+/** ****************************************************************************
+ * Chameleon header files
+ **/
+#include "morse.h"
+
#include "coreblas/include/coreblas.h"
#if defined(CHAMELEON_USE_CUDA)
#include "cudablas/include/cudablas.h"
#endif
-#include "morse.h"
-
#include "control/global.h"
#include "control/auxiliary.h"
+#include "control/context.h"
+#include "control/descriptor.h"
#include "control/tile.h"
#include "control/async.h"
#include "control/bulge.h"
diff --git a/include/morse.h.in b/include/morse.h.in
index 63658aac3..be279ede5 100644
--- a/include/morse.h.in
+++ b/include/morse.h.in
@@ -55,14 +55,6 @@
*/
#include "morse_simulate.h"
-
-/* ****************************************************************************
- * Set of routines which can be useful fo users
- */
-#include "control/context.h"
-#include "control/descriptor.h"
-
-
/* ****************************************************************************
* MORSE Functions
*/
@@ -72,7 +64,6 @@ extern "C" {
/* Auxiliary */
int MORSE_Version (int *ver_major, int *ver_minor, int *ver_micro);
-int MORSE_Element_Size(int type);
int MORSE_My_Mpi_Rank (void);
int MORSE_Init (int nworkers, int ncudas);
int MORSE_InitPar (int nworkers, int ncudas, int nthreads_per_worker);
@@ -87,6 +78,7 @@ int MORSE_Distributed_size (int*size);
int MORSE_Distributed_rank (int*rank);
/* Descriptor */
+int MORSE_Element_Size(int type);
int MORSE_Desc_Create (MORSE_desc_t **desc, void *mat, MORSE_enum dtyp,
int mb, int nb, int bsiz, int lm, int ln,
int i, int j, int m, int n, int p, int q);
--
GitLab