Commit 75c85b49 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Fix includes with the move to subdir chameleon, and fix some warnings

parent 3755e526
......@@ -32,7 +32,7 @@
*/
#include <stdlib.h>
#include "control/common.h"
#include "runtime.h"
#include "chameleon/morse_runtime.h"
/*******************************************************************************
* Register an exception.
......
......@@ -9,7 +9,7 @@
**/
/***
*
*
*
* @file async.h
*
......@@ -26,7 +26,7 @@
#ifndef _MORSE_ASYNC_H_
#define _MORSE_ASYNC_H_
#include "morse_struct.h"
#include "chameleon/morse_struct.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -27,7 +27,7 @@
#ifndef _MORSE_AUXILIARY_H_
#define _MORSE_AUXILIARY_H_
#include "morse_struct.h"
#include "chameleon/morse_struct.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -41,7 +41,7 @@
#include "control/common.h"
#include "control/auxiliary.h"
#include "control/context.h"
#include "runtime.h"
#include "chameleon/morse_runtime.h"
/*******************************************************************************
* Global data
......
......@@ -27,7 +27,7 @@
#ifndef _MORSE_CONTEXT_H_
#define _MORSE_CONTEXT_H_
#include "morse_struct.h"
#include "chameleon/morse_struct.h"
/*******************************************************************************
* Routines to handle threads context
......
......@@ -35,7 +35,7 @@
#include <stdlib.h>
#include "control/auxiliary.h"
#include "control/common.h"
#include "runtime.h"
#include "chameleon/morse_runtime.h"
/** ***************************************************************************
*
......
......@@ -34,7 +34,7 @@
#include <assert.h>
#include "control/common.h"
#include "control/descriptor.h"
#include "runtime.h"
#include "chameleon/morse_runtime.h"
static int nbdesc = 0;
......
......@@ -27,8 +27,8 @@
#define _MORSE_DESCRIPTOR_H_
#include <assert.h>
#include "include/chameleon_config.h"
#include "morse_struct.h"
#include "chameleon/chameleon_config.h"
#include "chameleon/morse_struct.h"
#include "control/auxiliary.h"
#ifdef __cplusplus
......
......@@ -42,12 +42,9 @@
/** ****************************************************************************
* MORSE types and constants
**/
#include "morse_types.h"
#include "morse_struct.h"
#include "morse_constants.h"
//#include "control/auxiliary.h"
//#include "control/descriptor.h"
//#include "control/tile.h"
#include "chameleon/morse_types.h"
#include "chameleon/morse_struct.h"
#include "chameleon/morse_constants.h"
/** ****************************************************************************
* CORE BLAS headers
......
......@@ -53,6 +53,7 @@ inline static void* user_getaddr_arrayofpointers(const MORSE_desc_t *A, int m, i
**/
inline static int user_getblkldd_arrayofpointers(const MORSE_desc_t *A, int m)
{
(void)m;
return A->mb;
}
......
......@@ -190,6 +190,7 @@ inline static void* user_getaddr_arrayofpointers(const MORSE_desc_t *A, int m, i
*/
inline static int user_getblkldd_arrayofpointers(const MORSE_desc_t *A, int m)
{
(void)m;
return A->mb;
}
......@@ -198,6 +199,7 @@ inline static int user_getblkldd_arrayofpointers(const MORSE_desc_t *A, int m)
*/
inline static int user_getrankof_zero(const MORSE_desc_t *A, int m, int n)
{
(void)A; (void)m; (void)n;
return 0;
}
......
......@@ -34,8 +34,8 @@ set(CHAMELEON_HDRS_GENERATED "")
set(ZHDR
chameleon/morse_z.h
chameleon/morse_zc.h
chameleon/runtime_z.h
chameleon/runtime_zc.h
chameleon/morse_tasks_z.h
chameleon/morse_tasks_zc.h
)
precisions_rules_py(CHAMELEON_HDRS_GENERATED "${ZHDR}"
......@@ -52,11 +52,12 @@ set(CHAMELEON_HDRS
chameleon/chameleon_config.h
chameleon/morse_constants.h
chameleon/morse_kernels.h
chameleon/morse_mangling.h
chameleon/morse_runtime.h
chameleon/morse_simulate.h
chameleon/morse_struct.h
chameleon/morse_tasks.h
chameleon/morse_types.h
chameleon/morse_mangling.h
chameleon/runtime.h
${CHAMELEON_HDRS_GENERATED}
)
......
......@@ -56,4 +56,20 @@
#cmakedefine CHAMELEON_HAVE_GETOPT_H
#cmakedefine CHAMELEON_HAVE_GETOPT_LONG
#ifdef BEGIN_C_DECLS
#undef BEGIN_C_DECLS
#endif
#ifdef END_C_DECLS
#undef END_C_DECLS
#endif
#if defined(c_plusplus) || defined(__cplusplus)
# define BEGIN_C_DECLS extern "C" {
# define END_C_DECLS }
#else
# define BEGIN_C_DECLS /* empty */
# define END_C_DECLS /* empty */
#endif
#endif /* CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED */
......@@ -85,4 +85,4 @@ typedef enum morse_kernel_e {
MORSE_NBKERNELS
} MORSE_kernel_t;
#endif /* _MORSE_KERNELS_H_ */
#endif
......@@ -24,10 +24,10 @@
* @date 2011-06-01
*
**/
#ifndef _RUNTIME_H_
#define _RUNTIME_H_
#ifndef _MORSE_RUNTIME_H_
#define _MORSE_RUNTIME_H_
#include "morse_struct.h"
#include "chameleon/morse_struct.h"
/*******************************************************************************
* RUNTIME Async
......@@ -133,34 +133,4 @@ void RUNTIME_ddisplay_oneprofile (MORSE_kernel_t);
void RUNTIME_sdisplay_allprofile ();
void RUNTIME_sdisplay_oneprofile (MORSE_kernel_t);
/*******************************************************************************
* RUNTIME Kernels
**/
#include "runtime_z.h"
#include "runtime_d.h"
#include "runtime_c.h"
#include "runtime_s.h"
#include "runtime_zc.h"
#include "runtime_ds.h"
void MORSE_TASK_ztile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_dtile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_ctile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_stile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
/*
* Mark a data as unused after this call
*/
void MORSE_TASK_dataflush(const MORSE_option_t *options,
const MORSE_desc_t *A, int Am, int An);
void MORSE_TASK_dataflush_all();
#endif
#endif /* _MORSE_RUNTIME_H_ */
......@@ -25,7 +25,7 @@
#ifndef _MORSE_SIMULATE_H_
#define _MORSE_SIMULATE_H_
#include "chameleon_config.h"
#include "chameleon/chameleon_config.h"
/* we need this when starpu is compiled with simgrid enabled */
#if defined(CHAMELEON_SCHED_STARPU) && defined(CHAMELEON_SIMULATION)
......
......@@ -28,8 +28,8 @@
#ifndef _MORSE_STRUCT_H_
#define _MORSE_STRUCT_H_
#include "chameleon_config.h"
#include "morse_types.h"
#include "chameleon/chameleon_config.h"
#include "chameleon/morse_types.h"
/** ****************************************************************************
* RUNTIME headers to include types of :
......@@ -188,7 +188,6 @@ typedef struct morse_option_s {
/** ****************************************************************************
* MORSE kernels
**/
#include "morse_kernels.h"
#include "chameleon/morse_kernels.h"
#endif /* __CHAMELEON_H__ */
/**
*
* @copyright (c) 2009-2014 The University of Tennessee and The University
* of Tennessee Research Foundation.
* All rights reserved.
* @copyright (c) 2012-2014 Inria. All rights reserved.
* @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
*
**/
/**
*
* @file morse_tasks.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
* Univ. of California Berkeley and Univ. of Colorado Denver,
* and INRIA Bordeaux Sud-Ouest
*
* @version 2.3.1
* @author Mathieu Faverge
* @author Cedric Augonnet
* @date 2011-06-01
*
**/
#ifndef _MORSE_TASKS_H_
#define _MORSE_TASKS_H_
/*******************************************************************************
* MORSE Task submission routines
**/
void MORSE_TASK_ztile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_dtile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_ctile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
void MORSE_TASK_stile_zero(const MORSE_option_t *options,
int X1, int X2, int Y1, int Y2,
const MORSE_desc_t *A, int Am, int An, int lda);
/*
* Mark a data as unused after this call
*/
void MORSE_TASK_dataflush(const MORSE_option_t *options,
const MORSE_desc_t *A, int Am, int An);
void MORSE_TASK_dataflush_all();
#include "chameleon/morse_tasks_z.h"
#include "chameleon/morse_tasks_d.h"
#include "chameleon/morse_tasks_c.h"
#include "chameleon/morse_tasks_s.h"
#include "chameleon/morse_tasks_zc.h"
#include "chameleon/morse_tasks_ds.h"
#endif /* _MORSE_TASKS_H_ */
......@@ -10,7 +10,7 @@
/**
*
* @file runtime_z.h
* @file morse_tasks_z.h
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
......@@ -29,8 +29,8 @@
* @precisions normal z -> c d s
*
**/
#ifndef _RUNTIME_ZBLAS_H_
#define _RUNTIME_ZBLAS_H_
#ifndef _MORSE_TASKS_Z_H_
#define _MORSE_TASKS_Z_H_
#define COMPLEX
......
......@@ -10,7 +10,7 @@
/**
*
* @file runtime_zc.h
* @file morse_tasks_zc.h
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
......@@ -28,8 +28,8 @@
* @precisions mixed zc -> ds
*
**/
#ifndef _RUNTIME_ZCBLAS_H_
#define _RUNTIME_ZCBLAS_H_
#ifndef _MORSE_TASKS_Z_H_
#define _MORSE_TASKS_Z_H_
#ifdef __cplusplus
extern "C" {
......
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