From 980ed889dcef96128297b0fb436cf12b0951eeb2 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Tue, 12 Dec 2017 10:58:33 +0100 Subject: [PATCH] Change of naming --- runtime/parsec/control/runtime_descriptor.c | 4 ---- runtime/parsec/include/chameleon_parsec.h | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index 1bd316e2f..06364f173 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -40,10 +40,6 @@ struct morse_parsec_desc_s { int arena_index; }; -int morse_parsec_get_arena_index(const MORSE_desc_t *desc) { - return ((morse_parsec_desc_t *)desc->schedopt)->arena_index; -} - static void morse_parsec_key_to_coordinates(parsec_data_collection_t *data_collection, parsec_data_key_t key, int *m, int *n) diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h index 0967a7287..76f515905 100644 --- a/runtime/parsec/include/chameleon_parsec.h +++ b/runtime/parsec/include/chameleon_parsec.h @@ -22,7 +22,8 @@ typedef struct morse_parsec_desc_s morse_parsec_desc_t; /* * Access to block pointer and leading dimension */ -#define RTBLKADDR( desc, type, m, n ) ( dague_dtd_tile_of( DAGUE_dtd_handle, (desc)->schedopt, m, n ) ) +#define RTBLKADDR( desc, type, m, n ) ( parsec_dtd_tile_of( (parsec_data_collection_t *) ((desc)->schedopt), \ + ((parsec_data_collection_t *) (desc)->schedopt)->data_key((desc)->schedopt, m, n) )) #define RUNTIME_BEGIN_ACCESS_DECLARATION -- GitLab