From 745d783e05c01f8240d42ed9a9f84039f7730721 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Mon, 6 Feb 2017 10:29:16 +0100
Subject: [PATCH] chameleon's config file was not called in the proper
directory
---
include/morse_simulate.h | 4 ++--
include/morse_struct.h | 6 +++---
runtime/starpu/codelets/codelet_zbuild.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/morse_simulate.h b/include/morse_simulate.h
index 03dd4fb40..7ef57e729 100644
--- a/include/morse_simulate.h
+++ b/include/morse_simulate.h
@@ -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)
diff --git a/include/morse_struct.h b/include/morse_struct.h
index a710366df..522dd61fe 100644
--- a/include/morse_struct.h
+++ b/include/morse_struct.h
@@ -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
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index de3b1650b..d2e654064 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -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);
--
GitLab