Commit 87f0342b authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

control header files are internal to the library, they should not be included in public headers

parent f9300b07
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
* @brief Group routines exposed to users to handle asynchronous tasks execution * @brief Group routines exposed to users to handle asynchronous tasks execution
* *
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "control/common.h" #include "control/common.h"
#include "runtime.h" #include "runtime.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#ifndef _MORSE_COMMON_H_ #ifndef _MORSE_COMMON_H_
#define _MORSE_COMMON_H_ #define _MORSE_COMMON_H_
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
...@@ -73,7 +74,6 @@ ...@@ -73,7 +74,6 @@
#include <magma.h> #include <magma.h>
#endif #endif
/** **************************************************************************** /** ****************************************************************************
* Line to avoid conflict with magma, because, we don't know why * Line to avoid conflict with magma, because, we don't know why
* but lapacke provide a wrong interface of lapack in fortran * but lapacke provide a wrong interface of lapack in fortran
...@@ -81,15 +81,21 @@ ...@@ -81,15 +81,21 @@
#ifndef LAPACK_NAME #ifndef LAPACK_NAME
#define LAPACK_NAME(a, b) lapackef77_##a #define LAPACK_NAME(a, b) lapackef77_##a
#endif #endif
/** ****************************************************************************
* Chameleon header files
**/
#include "morse.h"
#include "coreblas/include/coreblas.h" #include "coreblas/include/coreblas.h"
#if defined(CHAMELEON_USE_CUDA) #if defined(CHAMELEON_USE_CUDA)
#include "cudablas/include/cudablas.h" #include "cudablas/include/cudablas.h"
#endif #endif
#include "morse.h"
#include "control/global.h" #include "control/global.h"
#include "control/auxiliary.h" #include "control/auxiliary.h"
#include "control/context.h"
#include "control/descriptor.h"
#include "control/tile.h" #include "control/tile.h"
#include "control/async.h" #include "control/async.h"
#include "control/bulge.h" #include "control/bulge.h"
......
...@@ -55,14 +55,6 @@ ...@@ -55,14 +55,6 @@
*/ */
#include "morse_simulate.h" #include "morse_simulate.h"
/* ****************************************************************************
* Set of routines which can be useful fo users
*/
#include "control/context.h"
#include "control/descriptor.h"
/* **************************************************************************** /* ****************************************************************************
* MORSE Functions * MORSE Functions
*/ */
...@@ -72,7 +64,6 @@ extern "C" { ...@@ -72,7 +64,6 @@ extern "C" {
/* Auxiliary */ /* Auxiliary */
int MORSE_Version (int *ver_major, int *ver_minor, int *ver_micro); 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_My_Mpi_Rank (void);
int MORSE_Init (int nworkers, int ncudas); int MORSE_Init (int nworkers, int ncudas);
int MORSE_InitPar (int nworkers, int ncudas, int nthreads_per_worker); int MORSE_InitPar (int nworkers, int ncudas, int nthreads_per_worker);
...@@ -87,6 +78,7 @@ int MORSE_Distributed_size (int*size); ...@@ -87,6 +78,7 @@ int MORSE_Distributed_size (int*size);
int MORSE_Distributed_rank (int*rank); int MORSE_Distributed_rank (int*rank);
/* Descriptor */ /* Descriptor */
int MORSE_Element_Size(int type);
int MORSE_Desc_Create (MORSE_desc_t **desc, void *mat, MORSE_enum dtyp, int MORSE_Desc_Create (MORSE_desc_t **desc, void *mat, MORSE_enum dtyp,
int mb, int nb, int bsiz, int lm, int ln, int mb, int nb, int bsiz, int lm, int ln,
int i, int j, int m, int n, int p, int q); int i, int j, int m, int n, int p, int q);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment