Commit bb65016e authored by Mathieu Faverge's avatar Mathieu Faverge

Merge branch 'fix_headers' into 'master'

chameleon's config file was not called in the proper directory

See merge request !12
parents f345eb82 745d783e
......@@ -3,7 +3,7 @@
* @copyright (c) 2009-2014 The University of Tennessee and The University
* of Tennessee Research Foundation.
* All rights reserved.
* @copyright (c) 2012-2015 Inria. All rights reserved.
* @copyright (c) 2012-2017 Inria. All rights reserved.
* @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
*
**/
......@@ -25,7 +25,7 @@
#ifndef _MORSE_SIMULATE_H_
#define _MORSE_SIMULATE_H_
#include "include/chameleon_config.h"
#include "chameleon_config.h"
/* we need this when starpu is compiled with simgrid enabled */
#if defined(CHAMELEON_SCHED_STARPU) && defined(CHAMELEON_SIMULATION)
......
......@@ -3,7 +3,7 @@
* @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-2017 Inria. All rights reserved.
* @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
*
**/
......@@ -28,7 +28,7 @@
#ifndef _MORSE_STRUCT_H_
#define _MORSE_STRUCT_H_
#include "include/chameleon_config.h"
#include "chameleon_config.h"
#include "morse_types.h"
/** ****************************************************************************
......@@ -81,7 +81,7 @@ struct morse_desc_s {
int mb; // number of rows in a tile
int nb; // number of columns in a tile
int bsiz; // size in elements including padding
int lm; // number of rows of the entire matrix
int lm; // number of rows of the entire matrix
int ln; // number of columns of the entire matrix
int lmt; // number of tile rows of the entire matrix - derived parameter
int lnt; // number of tile columns of the entire matrix - derived parameter
......
......@@ -84,7 +84,7 @@ static void cl_zbuild_cpu_func(void *descr[], void *cl_arg)
/* The callback 'user_build_callback' is expected to build the block of matrix [row_min, row_max] x [col_min, col_max]
* (with both min and max values included in the intervals, index start at 0 like in C, NOT 1 like in Fortran)
* and store it at the adresse 'buffer' with leading dimension 'ld'
* and store it at the address 'buffer' with leading dimension 'ld'
*/
user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data);
......
Markdown is supported
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