From 84ba10994211ebcc952498f40c3412eb483acde3 Mon Sep 17 00:00:00 2001 From: Reazul Hoque Date: Thu, 30 Nov 2017 12:44:35 -0500 Subject: [PATCH 01/17] Updated PaRSEC interface --- runtime/parsec/control/runtime_descriptor.c | 4 ++++ runtime/parsec/include/chameleon_parsec.h | 1 + 2 files changed, 5 insertions(+) diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index be513a3e..da9250b4 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -225,6 +225,10 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) parsec_dtd_data_collection_init(data_collection); + /*dplasma_add2arena_tile( parsec_dtd_arenas[0], + mdesc->mb*mdesc->nb*sizeof(MORSE_Complex64_t), + PARSEC_ARENA_ALIGNMENT_SSE, + parsec_datatype_double_complex_t, mdesc->mb ); */ /* /\* Overwrite the leading dimensions to store the padding *\/ */ /* mdesc->llm = mdesc->mb * mdesc->lmt; */ /* mdesc->lln = mdesc->nb * mdesc->lnt; */ diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h index 4dcce756..ffb51160 100644 --- a/runtime/parsec/include/chameleon_parsec.h +++ b/runtime/parsec/include/chameleon_parsec.h @@ -16,6 +16,7 @@ #include "control/common.h" + struct morse_parsec_desc_s; typedef struct morse_parsec_desc_s morse_parsec_desc_t; -- GitLab From 26f9fc70be63ba7cce3c83c4a85be11806c54f93 Mon Sep 17 00:00:00 2001 From: Reazul Hoque Date: Thu, 30 Nov 2017 17:59:49 -0500 Subject: [PATCH 02/17] Added changes for distributed(incomplete) --- runtime/parsec/codelets/codelet_zgemm.c | 6 ++--- runtime/parsec/codelets/codelet_zher2k.c | 6 ++--- runtime/parsec/codelets/codelet_zherk.c | 4 +-- runtime/parsec/codelets/codelet_zplghe.c | 2 +- runtime/parsec/codelets/codelet_zplgsy.c | 2 +- runtime/parsec/codelets/codelet_zpotrf.c | 2 +- runtime/parsec/codelets/codelet_zsyr2k.c | 6 ++--- runtime/parsec/codelets/codelet_zsyrk.c | 4 +-- runtime/parsec/codelets/codelet_ztrsm.c | 4 +-- runtime/parsec/control/runtime_descriptor.c | 29 ++++++++++++++++++--- runtime/parsec/include/chameleon_parsec.h | 2 ++ 11 files changed, 45 insertions(+), 22 deletions(-) diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index 34ca3c30..13ede15f 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -88,12 +88,12 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, sizeof(MORSE_Complex64_t), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, - PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT, + PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | morse_parsec_get_arena_index(B), sizeof(int), &ldb, VALUE, sizeof(MORSE_Complex64_t), &beta, VALUE, - PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c index c2af9c22..78064708 100644 --- a/runtime/parsec/codelets/codelet_zher2k.c +++ b/runtime/parsec/codelets/codelet_zher2k.c @@ -84,12 +84,12 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, sizeof(MORSE_Complex64_t), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, - PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT, + PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | morse_parsec_get_arena_index(B), sizeof(int), &ldb, VALUE, sizeof(double), &beta, VALUE, - PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c index 20c78e97..73857265 100644 --- a/runtime/parsec/codelets/codelet_zherk.c +++ b/runtime/parsec/codelets/codelet_zherk.c @@ -79,10 +79,10 @@ void MORSE_TASK_zherk(const MORSE_option_t *options, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, sizeof(double), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, sizeof(double), &beta, VALUE, - PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c index 6883fd6e..13dfda18 100644 --- a/runtime/parsec/codelets/codelet_zplghe.c +++ b/runtime/parsec/codelets/codelet_zplghe.c @@ -65,7 +65,7 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options, sizeof(double), &bump, VALUE, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &lda, VALUE, sizeof(int), &bigM, VALUE, sizeof(int), &m0, VALUE, diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c index 6ed9e709..afd91170 100644 --- a/runtime/parsec/codelets/codelet_zplgsy.c +++ b/runtime/parsec/codelets/codelet_zplgsy.c @@ -65,7 +65,7 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &bump, VALUE, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &lda, VALUE, sizeof(int), &bigM, VALUE, sizeof(int), &m0, VALUE, diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c index b13f687b..9cdf2486 100644 --- a/runtime/parsec/codelets/codelet_zpotrf.c +++ b/runtime/parsec/codelets/codelet_zpotrf.c @@ -60,7 +60,7 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options, PARSEC_dtd_taskpool, CORE_zpotrf_parsec, options->priority, "potrf", sizeof(MORSE_enum), &uplo, VALUE, sizeof(int), &n, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, 0); diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c index 33d326d3..a16a874e 100644 --- a/runtime/parsec/codelets/codelet_zsyr2k.c +++ b/runtime/parsec/codelets/codelet_zsyr2k.c @@ -79,12 +79,12 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, sizeof(MORSE_Complex64_t), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, - PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT, + PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INPUT | morse_parsec_get_arena_index(B), sizeof(int), &ldb, VALUE, sizeof(MORSE_Complex64_t), &beta, VALUE, - PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c index 4ff939ef..28911f3c 100644 --- a/runtime/parsec/codelets/codelet_zsyrk.c +++ b/runtime/parsec/codelets/codelet_zsyrk.c @@ -73,10 +73,10 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options, sizeof(int), &n, VALUE, sizeof(int), &k, VALUE, sizeof(MORSE_Complex64_t), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, sizeof(MORSE_Complex64_t), &beta, VALUE, - PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); } diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c index 08520db9..fb650e6c 100644 --- a/runtime/parsec/codelets/codelet_ztrsm.c +++ b/runtime/parsec/codelets/codelet_ztrsm.c @@ -71,9 +71,9 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options, sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, sizeof(MORSE_Complex64_t), &alpha, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | morse_parsec_get_arena_index(A), sizeof(int), &lda, VALUE, - PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | AFFINITY, + PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &ldb, VALUE, 0); } diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index da9250b4..70b38659 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -11,6 +11,7 @@ #include "chameleon_parsec.h" #include #include +#include #include static int parsec_global_arena_index = 0; @@ -39,6 +40,10 @@ 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) @@ -225,10 +230,26 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) parsec_dtd_data_collection_init(data_collection); - /*dplasma_add2arena_tile( parsec_dtd_arenas[0], - mdesc->mb*mdesc->nb*sizeof(MORSE_Complex64_t), - PARSEC_ARENA_ALIGNMENT_SSE, - parsec_datatype_double_complex_t, mdesc->mb ); */ + /* arena init */ + /* taskpool init to bypass a requirement of PaRSEC */ +#if defined(CHAMELEON_USE_MPI) + parsec_dtd_taskpool_new(); + /* Internal limitation of PaRSEC */ + assert(parsec_global_arena_index < 16); + pdesc->arena_index = parsec_global_arena_index++; + + parsec_datatype_t datatype; + switch(mdesc->dtyp) { + case MorseInteger: datatype = parsec_datatype_int32_t; break; + case MorseRealFloat: datatype = parsec_datatype_float_t; break; + case MorseRealDouble: datatype = parsec_datatype_double_t; break; + case MorseComplexFloat: datatype = parsec_datatype_complex_t; break; + case MorseComplexDouble: datatype = parsec_datatype_double_complex_t; break; + default: morse_fatal_error("MORSE_Element_Size", "undefined type"); break; + } + + parsec_matrix_add2arena_tile( parsec_dtd_arenas[pdesc->arena_index], datatype, mdesc->mb*mdesc->nb*MORSE_Element_Size(mdesc->dtyp) ); +#endif /* /\* Overwrite the leading dimensions to store the padding *\/ */ /* mdesc->llm = mdesc->mb * mdesc->lmt; */ /* mdesc->lln = mdesc->nb * mdesc->lnt; */ diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h index ffb51160..f1b91ebc 100644 --- a/runtime/parsec/include/chameleon_parsec.h +++ b/runtime/parsec/include/chameleon_parsec.h @@ -20,6 +20,8 @@ struct morse_parsec_desc_s; typedef struct morse_parsec_desc_s morse_parsec_desc_t; +int morse_parsec_get_arena_index(const MORSE_desc_t *desc); + /* * Access to block pointer and leading dimension */ -- GitLab From 39e821314c5977c0aca25a88b5ba3a9966d356a6 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Fri, 12 Jan 2018 20:37:50 +0100 Subject: [PATCH 03/17] Update the parsec interface --- runtime/parsec/codelets/codelet_dataflush.c | 6 +- runtime/parsec/control/runtime_async.c | 33 ++++-- runtime/parsec/control/runtime_context.c | 41 +++---- runtime/parsec/control/runtime_control.c | 114 +++++++++--------- runtime/parsec/control/runtime_descriptor.c | 122 ++++++++++++-------- runtime/parsec/control/runtime_options.c | 16 ++- runtime/parsec/control/runtime_profiling.c | 33 +++++- runtime/parsec/control/runtime_zlocality.c | 16 ++- runtime/parsec/control/runtime_zprofiling.c | 16 ++- runtime/parsec/include/chameleon_parsec.h | 1 - runtime/starpu/control/runtime_control.c | 5 +- 11 files changed, 243 insertions(+), 160 deletions(-) diff --git a/runtime/parsec/codelets/codelet_dataflush.c b/runtime/parsec/codelets/codelet_dataflush.c index a065cedf..6f14deb7 100644 --- a/runtime/parsec/codelets/codelet_dataflush.c +++ b/runtime/parsec/codelets/codelet_dataflush.c @@ -33,11 +33,13 @@ void MORSE_TASK_flush_data( const MORSE_option_t *options, void MORSE_TASK_flush_desc( const MORSE_option_t *options, MORSE_enum uplo, const MORSE_desc_t *A ) { - parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); + /* parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); */ - parsec_dtd_data_flush_all( PARSEC_dtd_taskpool, (parsec_data_collection_t*)(A->schedopt) ); + /* parsec_dtd_data_flush_all( PARSEC_dtd_taskpool, (parsec_data_collection_t*)(A->schedopt) ); */ + (void)options; (void)uplo; + (void)A; } void MORSE_TASK_flush_all() diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c index 7df5d0bc..faa41447 100644 --- a/runtime/parsec/control/runtime_async.c +++ b/runtime/parsec/control/runtime_async.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_async.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include @@ -13,7 +19,8 @@ /******************************************************************************* * Create a sequence **/ -int RUNTIME_sequence_create(MORSE_context_t *morse, MORSE_sequence_t *sequence) +int RUNTIME_sequence_create( MORSE_context_t *morse, + MORSE_sequence_t *sequence ) { parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; parsec_taskpool_t *parsec_dtd_tp = parsec_dtd_taskpool_new(); @@ -29,7 +36,8 @@ int RUNTIME_sequence_create(MORSE_context_t *morse, MORSE_sequence_t *sequence) /******************************************************************************* * Destroy a sequence **/ -int RUNTIME_sequence_destroy(MORSE_context_t *morse, MORSE_sequence_t *sequence) +int RUNTIME_sequence_destroy( MORSE_context_t *morse, + MORSE_sequence_t *sequence ) { parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *) sequence->schedopt; @@ -50,7 +58,8 @@ int RUNTIME_sequence_destroy(MORSE_context_t *morse, MORSE_sequence_t *sequence) /******************************************************************************* * Wait for the completion of a sequence **/ -int RUNTIME_sequence_wait(MORSE_context_t *morse, MORSE_sequence_t *sequence ) +int RUNTIME_sequence_wait( MORSE_context_t *morse, + MORSE_sequence_t *sequence ) { parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *) sequence->schedopt; @@ -65,13 +74,13 @@ int RUNTIME_sequence_wait(MORSE_context_t *morse, MORSE_sequence_t *sequence ) /******************************************************************************* * Terminate a sequence **/ -void RUNTIME_sequence_flush(void *schedopt, MORSE_sequence_t *sequence, MORSE_request_t *request, int status) +void RUNTIME_sequence_flush( MORSE_context_t *morse, + MORSE_sequence_t *sequence, + MORSE_request_t *request, + int status ) { - parsec_context_t *parsec = (parsec_context_t *)schedopt; - (void)schedopt; sequence->request = request; sequence->status = status; request->status = status; return; } - diff --git a/runtime/parsec/control/runtime_context.c b/runtime/parsec/control/runtime_context.c index dee863d4..130161d5 100644 --- a/runtime/parsec/control/runtime_context.c +++ b/runtime/parsec/control/runtime_context.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_context.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include @@ -13,7 +19,7 @@ /******************************************************************************* * Create new context **/ -void RUNTIME_context_create(MORSE_context_t *morse) +void RUNTIME_context_create( MORSE_context_t *morse ) { /* In case of PaRSEC, this is done in init */ morse->scheduler = RUNTIME_SCHED_PARSEC; @@ -23,8 +29,7 @@ void RUNTIME_context_create(MORSE_context_t *morse) /******************************************************************************* * Clean the context **/ - -void RUNTIME_context_destroy(MORSE_context_t *morse) +void RUNTIME_context_destroy( MORSE_context_t *morse ) { (void)morse; return; @@ -37,12 +42,10 @@ void RUNTIME_enable(MORSE_enum lever) { switch (lever) { - case MORSE_PROFILING_MODE: - // TODO: check correctly for this - //dague_profiling_start(); - break; - default: - return; + case MORSE_PROFILING_MODE: + break; + default: + return; } return; } @@ -54,12 +57,10 @@ void RUNTIME_disable(MORSE_enum lever) { switch (lever) { - case MORSE_PROFILING_MODE: - // TODO: check correctly for this - //dague_profiling_stop(); - break; - default: - return; + case MORSE_PROFILING_MODE: + break; + default: + return; } return; } diff --git a/runtime/parsec/control/runtime_control.c b/runtime/parsec/control/runtime_control.c index 5efcbcde..2063be2c 100644 --- a/runtime/parsec/control/runtime_control.c +++ b/runtime/parsec/control/runtime_control.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_control.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include @@ -15,32 +21,27 @@ #include #endif -/******************************************************************************* - * Thread rank. - **/ -int RUNTIME_rank(MORSE_context_t *morse) -{ - return 0; -} - /******************************************************************************* * Initialize MORSE **/ -int RUNTIME_init_scheduler(MORSE_context_t *morse, int nworkers, int ncudas, int nthreads_per_worker) +int RUNTIME_init( MORSE_context_t *morse, + int ncpus, + int ncudas, + int nthreads_per_worker ) { int hres = -1, default_ncores = -1; int *argc = (int *)malloc(sizeof(int)); *argc = 0; /* Initializing parsec context */ - if( 0 < nworkers ) { - default_ncores = nworkers; + if( 0 < ncpus ) { + default_ncores = ncpus; } morse->parallel_enabled = MORSE_TRUE; morse->schedopt = (void *)parsec_init(default_ncores, argc, NULL); if(NULL != morse->schedopt) { - morse->nworkers = nworkers; + morse->nworkers = ncpus; morse->nthreads_per_worker = nthreads_per_worker; hres = 0; } @@ -52,7 +53,7 @@ int RUNTIME_init_scheduler(MORSE_context_t *morse, int nworkers, int ncudas, int /******************************************************************************* * Finalize MORSE */ -void RUNTIME_finalize_scheduler(MORSE_context_t *morse) +void RUNTIME_finalize( MORSE_context_t *morse ) { parsec_context_t *parsec = (parsec_context_t*)morse->schedopt; parsec_fini(&parsec); @@ -60,81 +61,86 @@ void RUNTIME_finalize_scheduler(MORSE_context_t *morse) } /******************************************************************************* - * Barrier MORSE. + * To suspend the processing of new tasks by workers **/ -void RUNTIME_barrier(MORSE_context_t *morse) +void RUNTIME_pause( MORSE_context_t *morse ) { - parsec_context_t *parsec = (parsec_context_t*)morse->schedopt; - // This will be a problem with the fake tasks inserted to detect end of DTD algorithms - //parsec_context_wait( parsec ); + (void)morse; return; } /******************************************************************************* - * Set iteration numbers for traces + * This is the symmetrical call to RUNTIME_pause, + * used to resume the workers polling for new tasks. **/ -void RUNTIME_iteration_push( MORSE_context_t *morse, unsigned long iteration ) +void RUNTIME_resume( MORSE_context_t *morse ) { - (void)morse; (void)iteration; + (void)morse; return; } -void RUNTIME_iteration_pop( MORSE_context_t *morse ) + +/******************************************************************************* + * Barrier MORSE. + **/ +void RUNTIME_barrier( MORSE_context_t *morse ) { - (void)morse; + parsec_context_t *parsec = (parsec_context_t*)morse->schedopt; + // This will be a problem with the fake tasks inserted to detect end of DTD algorithms + parsec_context_wait( parsec ); return; } /******************************************************************************* - * To suspend the processing of new tasks by workers + * Display a progress information when executing the tasks **/ -void RUNTIME_pause( MORSE_context_t *morse ) +void RUNTIME_progress( MORSE_context_t *morse ) { (void)morse; return; } /******************************************************************************* - * This is the symmetrical call to RUNTIME_pause, - * used to resume the workers polling for new tasks. + * Thread rank. **/ -void RUNTIME_resume( MORSE_context_t *morse ) +int RUNTIME_thread_rank( MORSE_context_t *morse ) { - (void)morse; - return; + return 0; } /******************************************************************************* - * This returns the rank of this process + * Thread rank. **/ -void RUNTIME_comm_rank( int *rank ) +int RUNTIME_thread_size( MORSE_context_t *morse ) { -#if defined(CHAMELEON_USE_MPI) - MPI_Comm_rank(MPI_COMM_WORLD, rank); -#else - *rank = 0; -#endif - return; + // TODO: fixme + //return vpmap_get_nb_total_threads(); + return 1; } /******************************************************************************* - * This returns the size of the distributed computation + * This returns the rank of this process **/ -void RUNTIME_comm_size( int *size ) +int RUNTIME_comm_rank( MORSE_context_t *morse ) { + int rank = 0; #if defined(CHAMELEON_USE_MPI) - MPI_Comm_size(MPI_COMM_WORLD, size); -#else - *size = 1; + MPI_Comm_rank(MPI_COMM_WORLD, &rank); #endif - return; + + (void)morse; + return rank; } /******************************************************************************* - * This returns the number of workers + * This returns the size of the distributed computation **/ -int RUNTIME_get_thread_nbr() +int RUNTIME_comm_size( MORSE_context_t *morse ) { - // TODO: fixme - //return vpmap_get_nb_total_threads(); - return 0; + int size = 0; +#if defined(CHAMELEON_USE_MPI) + MPI_Comm_size(MPI_COMM_WORLD, &size); +#endif + + (void)morse; + return size; } diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index 70b38659..0af56f51 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -1,35 +1,43 @@ /** * - * @copyright (c) 2009-2015 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-2016 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_descriptor.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include #include "chameleon_parsec.h" #include #include -#include +//#include #include static int parsec_global_arena_index = 0; -void RUNTIME_user_tag_size(int user_tag_width, int user_tag_sep) { - (void)user_tag_width; - (void)user_tag_sep; +void RUNTIME_comm_set_tag_sizes( int user_tag_width, + int user_tag_sep ) +{ + (void)user_tag_width; + (void)user_tag_sep; } -void *RUNTIME_mat_alloc( size_t size) +void *RUNTIME_malloc( size_t size ) { return malloc(size); } -void RUNTIME_mat_free( void *mat, size_t size) +void RUNTIME_free( void *ptr, size_t size ) { (void)size; - free(mat); + free(ptr); return; } @@ -40,11 +48,12 @@ struct morse_parsec_desc_s { int arena_index; }; -int morse_parsec_get_arena_index(const MORSE_desc_t *desc) { +int +morse_parsec_get_arena_index(const MORSE_desc_t *desc) { return ((morse_parsec_desc_t *)desc->schedopt)->arena_index; } -static void +static inline void morse_parsec_key_to_coordinates(parsec_data_collection_t *data_collection, parsec_data_key_t key, int *m, int *n) { @@ -58,7 +67,7 @@ morse_parsec_key_to_coordinates(parsec_data_collection_t *data_collection, parse *n = _n - mdesc->j / mdesc->nb; } -static parsec_data_key_t +static inline parsec_data_key_t morse_parsec_data_key(parsec_data_collection_t *data_collection, ...) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)data_collection; @@ -79,7 +88,7 @@ morse_parsec_data_key(parsec_data_collection_t *data_collection, ...) return ((n * mdesc->lmt) + m); } -static uint32_t +static inline uint32_t morse_parsec_rank_of(parsec_data_collection_t *data_collection, ...) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)data_collection; @@ -100,7 +109,7 @@ morse_parsec_rank_of(parsec_data_collection_t *data_collection, ...) return mdesc->get_rankof( mdesc, m, n ); } -static uint32_t +static inline uint32_t morse_parsec_rank_of_key(parsec_data_collection_t *data_collection, parsec_data_key_t key) { int m, n; @@ -108,13 +117,13 @@ morse_parsec_rank_of_key(parsec_data_collection_t *data_collection, parsec_data_ return morse_parsec_rank_of(data_collection, m, n); } -static int32_t +static inline int32_t morse_parsec_vpid_of(parsec_data_collection_t *data_collection, ...) { return 0; } -static int32_t +static inline int32_t morse_parsec_vpid_of_key(parsec_data_collection_t *data_collection, parsec_data_key_t key) { int m, n; @@ -122,7 +131,7 @@ morse_parsec_vpid_of_key(parsec_data_collection_t *data_collection, parsec_data_ return morse_parsec_vpid_of(data_collection, m, n); } -static parsec_data_t* +static inline parsec_data_t* morse_parsec_data_of(parsec_data_collection_t *data_collection, ...) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)data_collection; @@ -145,12 +154,12 @@ morse_parsec_data_of(parsec_data_collection_t *data_collection, ...) //assert( data_collection->nodes == 1 ); #endif return parsec_data_create( pdesc->data_map + n * mdesc->lmt + m, data_collection, - morse_parsec_data_key( data_collection, m, n ), - mdesc->get_blkaddr( mdesc, m, n ), - mdesc->bsiz * MORSE_Element_Size(mdesc->dtyp) ); + morse_parsec_data_key( data_collection, m, n ), + mdesc->get_blkaddr( mdesc, m, n ), + mdesc->bsiz * MORSE_Element_Size(mdesc->dtyp) ); } -static parsec_data_t* +static inline parsec_data_t* morse_parsec_data_of_key(parsec_data_collection_t *data_collection, parsec_data_key_t key) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)data_collection; @@ -163,12 +172,12 @@ morse_parsec_data_of_key(parsec_data_collection_t *data_collection, parsec_data_ //assert( data_collection->nodes == 1 ); #endif return parsec_data_create( pdesc->data_map + key, data_collection, key, - mdesc->get_blkaddr( mdesc, m, n ), - mdesc->bsiz * MORSE_Element_Size(mdesc->dtyp) ); + mdesc->get_blkaddr( mdesc, m, n ), + mdesc->bsiz * MORSE_Element_Size(mdesc->dtyp) ); } #ifdef parsec_PROF_TRACE -static int +static inline int morse_parsec_key_to_string(parsec_data_collection_t *data_collection, parsec_data_key_t key, char * buffer, uint32_t buffer_size) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)data_collection; @@ -184,15 +193,12 @@ morse_parsec_key_to_string(parsec_data_collection_t *data_collection, parsec_dat } #endif -void RUNTIME_desc_init( MORSE_desc_t *mdesc ) -{ - (void)mdesc; - return; -} - +/******************************************************************************* + * Create data descriptor + **/ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) { - parsec_data_collection_t *data_collection; + parsec_data_collection_t *data_collection; morse_parsec_desc_t *pdesc; int comm_size; @@ -200,7 +206,7 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) data_collection = (parsec_data_collection_t*)pdesc; /* Super setup */ - RUNTIME_comm_size( &comm_size ); + comm_size = RUNTIME_comm_size( NULL ); data_collection->nodes = comm_size; data_collection->myrank = mdesc->myrank; @@ -240,12 +246,12 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) parsec_datatype_t datatype; switch(mdesc->dtyp) { - case MorseInteger: datatype = parsec_datatype_int32_t; break; - case MorseRealFloat: datatype = parsec_datatype_float_t; break; - case MorseRealDouble: datatype = parsec_datatype_double_t; break; - case MorseComplexFloat: datatype = parsec_datatype_complex_t; break; - case MorseComplexDouble: datatype = parsec_datatype_double_complex_t; break; - default: morse_fatal_error("MORSE_Element_Size", "undefined type"); break; + case MorseInteger: datatype = parsec_datatype_int32_t; break; + case MorseRealFloat: datatype = parsec_datatype_float_t; break; + case MorseRealDouble: datatype = parsec_datatype_double_t; break; + case MorseComplexFloat: datatype = parsec_datatype_complex_t; break; + case MorseComplexDouble: datatype = parsec_datatype_double_complex_t; break; + default: morse_fatal_error("MORSE_Element_Size", "undefined type"); break; } parsec_matrix_add2arena_tile( parsec_dtd_arenas[pdesc->arena_index], datatype, mdesc->mb*mdesc->nb*MORSE_Element_Size(mdesc->dtyp) ); @@ -256,6 +262,9 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) return; } +/******************************************************************************* + * Destroy data descriptor + **/ void RUNTIME_desc_destroy( MORSE_desc_t *mdesc ) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)(mdesc->schedopt); @@ -280,30 +289,49 @@ void RUNTIME_desc_destroy( MORSE_desc_t *mdesc ) return; } -void RUNTIME_desc_submatrix( MORSE_desc_t *desc ) +/******************************************************************************* + * Acquire data + **/ +int RUNTIME_desc_acquire( const MORSE_desc_t *desc ) { (void)desc; - return; + return MORSE_SUCCESS; } -int RUNTIME_desc_acquire( MORSE_desc_t *desc ) +/******************************************************************************* + * Release data + **/ +int RUNTIME_desc_release( const MORSE_desc_t *desc ) { (void)desc; return MORSE_SUCCESS; } -int RUNTIME_desc_release( MORSE_desc_t *desc ) +/******************************************************************************* + * Get data on cpu - Synchronous call + **/ +int RUNTIME_desc_getoncpu( const MORSE_desc_t *desc ) { (void)desc; return MORSE_SUCCESS; } -int RUNTIME_desc_getoncpu( MORSE_desc_t *desc ) +/******************************************************************************* + * Get data on cpu - Asynchronous call + **/ +int RUNTIME_desc_getoncpu_async( const MORSE_desc_t *desc, + MORSE_sequence_t *sequence ) { - (void)desc; + parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(sequence->schedopt); + + parsec_dtd_data_flush_all( PARSEC_dtd_taskpool, (parsec_data_collection_t*)(desc->schedopt) ); + return MORSE_SUCCESS; } +/******************************************************************************* + * Get data addr + **/ void *RUNTIME_desc_getaddr( const MORSE_desc_t *desc, int m, int n ) { assert(0); /* This should not be called because we also need the handle to match the address we need. */ diff --git a/runtime/parsec/control/runtime_options.c b/runtime/parsec/control/runtime_options.c index b9fd469a..03556193 100644 --- a/runtime/parsec/control/runtime_options.c +++ b/runtime/parsec/control/runtime_options.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_options.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include diff --git a/runtime/parsec/control/runtime_profiling.c b/runtime/parsec/control/runtime_profiling.c index 1e50dac2..ed7dbd84 100644 --- a/runtime/parsec/control/runtime_profiling.c +++ b/runtime/parsec/control/runtime_profiling.c @@ -1,14 +1,20 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_profiling.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include "chameleon_parsec.h" -#include "chameleon_timer.h" +#include "chameleon/chameleon_timer.h" double RUNTIME_get_time(){ return CHAMELEON_timer(); @@ -43,3 +49,18 @@ void RUNTIME_kernelprofile_display(void) { morse_warning("RUNTIME_kernelprofile_display(parsec)", "Kernel profiling is not available with PaRSEC\n"); } + +/******************************************************************************* + * Set iteration numbers for traces + **/ +void RUNTIME_iteration_push( MORSE_context_t *morse, unsigned long iteration ) +{ + (void)morse; (void)iteration; + return; +} +void RUNTIME_iteration_pop( MORSE_context_t *morse ) +{ + (void)morse; + return; +} + diff --git a/runtime/parsec/control/runtime_zlocality.c b/runtime/parsec/control/runtime_zlocality.c index 8dc21a47..6b1b97dd 100644 --- a/runtime/parsec/control/runtime_zlocality.c +++ b/runtime/parsec/control/runtime_zlocality.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_zlocality.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include "runtime/PaRSEC/include/chameleon_parsec.h" diff --git a/runtime/parsec/control/runtime_zprofiling.c b/runtime/parsec/control/runtime_zprofiling.c index 1bcf7d0d..f93c3658 100644 --- a/runtime/parsec/control/runtime_zprofiling.c +++ b/runtime/parsec/control/runtime_zprofiling.c @@ -1,10 +1,16 @@ /** * - * @copyright (c) 2009-2015 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-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. + * @copyright 2012-2017 The University of Tennessee and The University of + * Tennessee Research Foundation. All rights reserved. + * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, + * Univ. Bordeaux. All rights reserved. + * + * @file runtime_zprofiling.c + * + * @version 1.0.0 + * @author Reazul Hoque + * @author Mathieu Faverge + * @date 2017-01-12 * **/ #include "chameleon_parsec.h" diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h index f1b91ebc..a75f2ee8 100644 --- a/runtime/parsec/include/chameleon_parsec.h +++ b/runtime/parsec/include/chameleon_parsec.h @@ -16,7 +16,6 @@ #include "control/common.h" - struct morse_parsec_desc_s; typedef struct morse_parsec_desc_s morse_parsec_desc_t; diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c index 770c1826..6034f92a 100644 --- a/runtime/starpu/control/runtime_control.c +++ b/runtime/starpu/control/runtime_control.c @@ -236,15 +236,14 @@ int RUNTIME_thread_size( MORSE_context_t *morse ) **/ int RUNTIME_comm_rank( MORSE_context_t *morse ) { - int rank; + int rank = 0; + #if defined(CHAMELEON_USE_MPI) # if defined(HAVE_STARPU_MPI_COMM_RANK) starpu_mpi_comm_rank( MPI_COMM_WORLD, &rank ); # else MPI_Comm_rank( MPI_COMM_WORLD, &rank ); # endif -#else - rank = 0; #endif (void)morse; -- GitLab From 2ba61d45ff9a4d6facc16f9849eb9b6885a5f081 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 10:21:15 +0100 Subject: [PATCH 04/17] Update the parsec interface --- runtime/parsec/CMakeLists.txt | 1 - runtime/parsec/control/runtime_async.c | 10 ++++------ runtime/parsec/control/runtime_descriptor.c | 21 +++++++++++---------- runtime/starpu/control/runtime_async.c | 1 - 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/runtime/parsec/CMakeLists.txt b/runtime/parsec/CMakeLists.txt index 9ff06bd0..7360137b 100644 --- a/runtime/parsec/CMakeLists.txt +++ b/runtime/parsec/CMakeLists.txt @@ -85,7 +85,6 @@ set(RUNTIME_COMMON control/runtime_descriptor.c control/runtime_options.c control/runtime_profiling.c - codelets/codelet_dataflush.c ${RUNTIME_COMMON_GENERATED} ) diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c index faa41447..67661a47 100644 --- a/runtime/parsec/control/runtime_async.c +++ b/runtime/parsec/control/runtime_async.c @@ -25,7 +25,7 @@ int RUNTIME_sequence_create( MORSE_context_t *morse, parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; parsec_taskpool_t *parsec_dtd_tp = parsec_dtd_taskpool_new(); - parsec_enqueue(parsec, (parsec_taskpool_t *) parsec_dtd_tp); + parsec_enqueue( parsec, (parsec_taskpool_t *)parsec_dtd_tp ); sequence->schedopt = parsec_dtd_tp; parsec_context_start(parsec); @@ -47,10 +47,9 @@ int RUNTIME_sequence_destroy( MORSE_context_t *morse, // TODO: switch to a partial wait //parsec_dtd_taskpool_wait(parsec, parsec_dtd_tp); - parsec_context_wait(parsec); - - parsec_taskpool_free(parsec_dtd_tp); + parsec_context_wait( parsec ); + parsec_taskpool_free( parsec_dtd_tp ); sequence->schedopt = NULL; return MORSE_SUCCESS; } @@ -65,8 +64,7 @@ int RUNTIME_sequence_wait( MORSE_context_t *morse, parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *) sequence->schedopt; assert( parsec_dtd_tp ); - - parsec_dtd_taskpool_wait(parsec, parsec_dtd_tp); + parsec_dtd_taskpool_wait( parsec, parsec_dtd_tp ); return MORSE_SUCCESS; } diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index 0af56f51..88939126 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -308,25 +308,26 @@ int RUNTIME_desc_release( const MORSE_desc_t *desc ) } /******************************************************************************* - * Get data on cpu - Synchronous call + * Flush cached data **/ -int RUNTIME_desc_getoncpu( const MORSE_desc_t *desc ) +void RUNTIME_flush() { - (void)desc; - return MORSE_SUCCESS; } -/******************************************************************************* - * Get data on cpu - Asynchronous call - **/ -int RUNTIME_desc_getoncpu_async( const MORSE_desc_t *desc, - MORSE_sequence_t *sequence ) +void RUNTIME_desc_flush( const MORSE_desc_t *desc, + const MORSE_sequence_t *sequence ) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(sequence->schedopt); parsec_dtd_data_flush_all( PARSEC_dtd_taskpool, (parsec_data_collection_t*)(desc->schedopt) ); +} - return MORSE_SUCCESS; +void RUNTIME_data_flush( const MORSE_sequence_t *sequence, + const MORSE_desc_t *A, int Am, int An ) +{ + parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(sequence->schedopt); + + parsec_dtd_data_flush( PARSEC_dtd_taskpool, RTBLKADDR( A, MORSE_Complex64_t, Am, An ) ); } /******************************************************************************* diff --git a/runtime/starpu/control/runtime_async.c b/runtime/starpu/control/runtime_async.c index 70e9597f..9ecd0942 100644 --- a/runtime/starpu/control/runtime_async.c +++ b/runtime/starpu/control/runtime_async.c @@ -74,6 +74,5 @@ void RUNTIME_sequence_flush( MORSE_context_t *morse, sequence->request = request; sequence->status = status; request->status = status; - starpu_task_wait_for_all(); return; } -- GitLab From adcc4cc375a1147ea85852d7fcf04e92ab68021e Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 14:38:19 +0100 Subject: [PATCH 05/17] Silent the context warnings --- runtime/parsec/codelets/codelet_zasum.c | 7 ++++--- runtime/parsec/codelets/codelet_zaxpy.c | 6 ++++-- runtime/parsec/codelets/codelet_zbuild.c | 6 ++++-- runtime/parsec/codelets/codelet_zgeadd.c | 6 ++++-- runtime/parsec/codelets/codelet_zgelqt.c | 6 ++++-- runtime/parsec/codelets/codelet_zgemm.c | 8 +++++--- runtime/parsec/codelets/codelet_zgeqrt.c | 6 ++++-- runtime/parsec/codelets/codelet_zgessm.c | 6 ++++-- runtime/parsec/codelets/codelet_zgessq.c | 6 ++++-- runtime/parsec/codelets/codelet_zgetrf.c | 6 ++++-- runtime/parsec/codelets/codelet_zgetrf_incpiv.c | 6 ++++-- runtime/parsec/codelets/codelet_zgetrf_nopiv.c | 6 ++++-- runtime/parsec/codelets/codelet_zhe2ge.c | 7 +++++-- runtime/parsec/codelets/codelet_zhemm.c | 6 ++++-- runtime/parsec/codelets/codelet_zher2k.c | 6 ++++-- runtime/parsec/codelets/codelet_zherfb.c | 7 +++++-- runtime/parsec/codelets/codelet_zherk.c | 6 ++++-- runtime/parsec/codelets/codelet_zhessq.c | 6 ++++-- runtime/parsec/codelets/codelet_zlacpy.c | 6 ++++-- runtime/parsec/codelets/codelet_zlag2c.c | 9 ++++++--- runtime/parsec/codelets/codelet_zlange.c | 12 ++++++++---- runtime/parsec/codelets/codelet_zlanhe.c | 6 ++++-- runtime/parsec/codelets/codelet_zlansy.c | 6 ++++-- runtime/parsec/codelets/codelet_zlantr.c | 6 ++++-- runtime/parsec/codelets/codelet_zlascal.c | 7 +++++-- runtime/parsec/codelets/codelet_zlaset.c | 6 ++++-- runtime/parsec/codelets/codelet_zlaset2.c | 6 ++++-- runtime/parsec/codelets/codelet_zlatro.c | 7 +++++-- runtime/parsec/codelets/codelet_zlauum.c | 6 ++++-- runtime/parsec/codelets/codelet_zpamm.c | 6 ++++-- runtime/parsec/codelets/codelet_zplghe.c | 6 ++++-- runtime/parsec/codelets/codelet_zplgsy.c | 6 ++++-- runtime/parsec/codelets/codelet_zplrnt.c | 6 ++++-- runtime/parsec/codelets/codelet_zplssq.c | 12 ++++++++---- runtime/parsec/codelets/codelet_zpotrf.c | 6 ++++-- runtime/parsec/codelets/codelet_zssssm.c | 6 ++++-- runtime/parsec/codelets/codelet_zsymm.c | 6 ++++-- runtime/parsec/codelets/codelet_zsyr2k.c | 6 ++++-- runtime/parsec/codelets/codelet_zsyrk.c | 6 ++++-- runtime/parsec/codelets/codelet_zsyssq.c | 6 ++++-- runtime/parsec/codelets/codelet_zsytrf_nopiv.c | 6 ++++-- runtime/parsec/codelets/codelet_ztile_zero.c | 12 +++++++----- runtime/parsec/codelets/codelet_ztpmqrt.c | 8 +++++--- runtime/parsec/codelets/codelet_ztpqrt.c | 8 +++++--- runtime/parsec/codelets/codelet_ztradd.c | 6 ++++-- runtime/parsec/codelets/codelet_ztrasm.c | 6 ++++-- runtime/parsec/codelets/codelet_ztrmm.c | 6 ++++-- runtime/parsec/codelets/codelet_ztrsm.c | 6 ++++-- runtime/parsec/codelets/codelet_ztrssq.c | 6 ++++-- runtime/parsec/codelets/codelet_ztrtri.c | 16 +++++++++------- runtime/parsec/codelets/codelet_ztslqt.c | 6 ++++-- runtime/parsec/codelets/codelet_ztsmlq.c | 6 ++++-- runtime/parsec/codelets/codelet_ztsmlq_hetra1.c | 7 +++++-- runtime/parsec/codelets/codelet_ztsmqr.c | 6 ++++-- runtime/parsec/codelets/codelet_ztsmqr_hetra1.c | 7 +++++-- runtime/parsec/codelets/codelet_ztsqrt.c | 6 ++++-- runtime/parsec/codelets/codelet_ztstrf.c | 6 ++++-- runtime/parsec/codelets/codelet_zttlqt.c | 6 ++++-- runtime/parsec/codelets/codelet_zttmlq.c | 6 ++++-- runtime/parsec/codelets/codelet_zttmqr.c | 6 ++++-- runtime/parsec/codelets/codelet_zttqrt.c | 6 ++++-- runtime/parsec/codelets/codelet_zunmlq.c | 6 ++++-- runtime/parsec/codelets/codelet_zunmqr.c | 6 ++++-- 63 files changed, 279 insertions(+), 143 deletions(-) diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c index 8736da15..c3e381f1 100644 --- a/runtime/parsec/codelets/codelet_zasum.c +++ b/runtime/parsec/codelets/codelet_zasum.c @@ -24,9 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_dzasum_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +static inline int +CORE_dzasum_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *storev; MORSE_enum *uplo; @@ -48,6 +48,7 @@ CORE_dzasum_parsec(parsec_execution_stream_t *context, CORE_dzasum(*storev, *uplo, *M, *N, A, *lda, work); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c index ef8400ea..17ee205b 100644 --- a/runtime/parsec/codelets/codelet_zaxpy.c +++ b/runtime/parsec/codelets/codelet_zaxpy.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zaxpy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zaxpy_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *M; MORSE_Complex64_t *alpha; @@ -45,6 +46,7 @@ CORE_zaxpy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zaxpy(*M, *alpha, A, *incA, B, *incB); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c index df154edf..af7271bc 100644 --- a/runtime/parsec/codelets/codelet_zbuild.c +++ b/runtime/parsec/codelets/codelet_zbuild.c @@ -27,8 +27,8 @@ #include "coreblas/coreblas_z.h" static inline int -CORE_zbuild_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_zbuild_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_Complex64_t *A; int lda; @@ -49,6 +49,8 @@ CORE_zbuild_parsec(parsec_execution_stream_t *context, user_build_callback(row_min, row_max, col_min, col_max, A, lda, user_data); + (void)context; + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c index eed82f14..ac432441 100644 --- a/runtime/parsec/codelets/codelet_zgeadd.c +++ b/runtime/parsec/codelets/codelet_zgeadd.c @@ -29,8 +29,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zgeadd_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgeadd_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *trans; int *M; @@ -56,6 +57,7 @@ CORE_zgeadd_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zgeadd(*trans, *M, *N, *alpha, A, *LDA, *beta, B, *LDB); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c index f8283cc8..16fe5e64 100644 --- a/runtime/parsec/codelets/codelet_zgelqt.c +++ b/runtime/parsec/codelets/codelet_zgelqt.c @@ -85,8 +85,9 @@ * \retval <0 if -i, the i-th argument had an illegal value * ******************************************************************************/ -static int -CORE_zgelqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgelqt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -112,6 +113,7 @@ CORE_zgelqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zgelqt(*m, *n, *ib, A, *lda, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index 13ede15f..bbef0712 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -29,9 +29,10 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zgemm_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +static inline int +CORE_zgemm_parsec( parsec_execution_stream_t *context, + + parsec_task_t *this_task ) { MORSE_enum *transA; MORSE_enum *transB; @@ -68,6 +69,7 @@ CORE_zgemm_parsec(parsec_execution_stream_t *context, B, *ldb, *beta, C, *ldc); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c index 19b0d183..cea9b098 100644 --- a/runtime/parsec/codelets/codelet_zgeqrt.c +++ b/runtime/parsec/codelets/codelet_zgeqrt.c @@ -86,8 +86,9 @@ * \retval <0 if -i, the i-th argument had an illegal value * ******************************************************************************/ -static int -CORE_zgeqrt_parsec (parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgeqrt_parsec ( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -113,6 +114,7 @@ CORE_zgeqrt_parsec (parsec_execution_stream_t *context, parsec_task_t *this_task CORE_zgeqrt(*m, *n, *ib, A, *lda, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c index 823c5264..37d4dbf0 100644 --- a/runtime/parsec/codelets/codelet_zgessm.c +++ b/runtime/parsec/codelets/codelet_zgessm.c @@ -69,8 +69,9 @@ * \retval <0 if INFO = -k, the k-th argument had an illegal value * ******************************************************************************/ -static int -CORE_zgessm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgessm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -100,6 +101,7 @@ CORE_zgessm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zgessm(*m, *n, *k, *ib, IPIV, D, *ldd, A, *lda); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c index 8f7f7b12..2b1c9135 100644 --- a/runtime/parsec/codelets/codelet_zgessq.c +++ b/runtime/parsec/codelets/codelet_zgessq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zgessq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgessq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -43,6 +44,7 @@ CORE_zgessq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zgessq( *m, *n, A, *lda, SCALESUMSQ, SCALESUMSQ+1); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c index 4950bb82..077f6b6c 100644 --- a/runtime/parsec/codelets/codelet_zgetrf.c +++ b/runtime/parsec/codelets/codelet_zgetrf.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zgetrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgetrf_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -48,6 +49,7 @@ CORE_zgetrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zgetrf( *m, *n, A, *lda, IPIV, &info ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c index 3322a11f..632a5e04 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c @@ -78,8 +78,9 @@ * to solve a system of equations. * ******************************************************************************/ -static int -CORE_zgetrf_incpiv_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgetrf_incpiv_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -105,6 +106,7 @@ CORE_zgetrf_incpiv_parsec(parsec_execution_stream_t *context, parsec_task_t *thi CORE_zgetrf_incpiv(*m, *n, *ib, A, *lda, IPIV, &info); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c index e35f3f6a..0c32707e 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c @@ -71,8 +71,9 @@ * to solve a system of equations. * ******************************************************************************/ -static int -CORE_zgetrf_nopiv_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zgetrf_nopiv_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -93,6 +94,7 @@ CORE_zgetrf_nopiv_parsec(parsec_execution_stream_t *context, parsec_task_t *this CORE_zgetrf_nopiv(*m, *n, *ib, A, *lda, &info); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c index c9a3d059..a52b05da 100644 --- a/runtime/parsec/codelets/codelet_zhe2ge.c +++ b/runtime/parsec/codelets/codelet_zhe2ge.c @@ -30,8 +30,8 @@ * **/ static inline int -CORE_zhe2ge_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_zhe2ge_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *M; @@ -52,6 +52,9 @@ CORE_zhe2ge_parsec(parsec_execution_stream_t *context, UNPACK_VALUE, &LDB); CORE_zhe2ge(*uplo, *M, *N, A, *LDA, B, *LDB); + + (void)context; + return 0; } diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c index 4686a0df..486d20f6 100644 --- a/runtime/parsec/codelets/codelet_zhemm.c +++ b/runtime/parsec/codelets/codelet_zhemm.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zhemm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zhemm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *uplo; @@ -65,6 +66,7 @@ CORE_zhemm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) B, *LDB, *beta, C, *LDC); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c index 78064708..c4dce1e5 100644 --- a/runtime/parsec/codelets/codelet_zher2k.c +++ b/runtime/parsec/codelets/codelet_zher2k.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zher2k_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zher2k_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -65,6 +66,7 @@ CORE_zher2k_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) B, *ldb, *beta, C, *ldc); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c index d50c874e..3828d4e0 100644 --- a/runtime/parsec/codelets/codelet_zherfb.c +++ b/runtime/parsec/codelets/codelet_zherfb.c @@ -27,8 +27,8 @@ #include "coreblas/coreblas_z.h" static inline int -CORE_zherfb_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_zherfb_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *n; @@ -63,6 +63,9 @@ CORE_zherfb_parsec(parsec_execution_stream_t *context, CORE_zherfb(*uplo, *n, *k, *ib, *nb, A, *lda, T, *ldt, C, *ldc, WORK, *ldwork); + + (void)context; + return 0; } void MORSE_TASK_zherfb(const MORSE_option_t *options, diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c index 73857265..c3253c72 100644 --- a/runtime/parsec/codelets/codelet_zherk.c +++ b/runtime/parsec/codelets/codelet_zherk.c @@ -30,8 +30,9 @@ * **/ -static int -CORE_zherk_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zherk_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -61,6 +62,7 @@ CORE_zherk_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) *alpha, A, *lda, *beta, C, *ldc); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c index 013f8e99..81468fbb 100644 --- a/runtime/parsec/codelets/codelet_zhessq.c +++ b/runtime/parsec/codelets/codelet_zhessq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zhessq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zhessq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *n; @@ -43,6 +44,7 @@ CORE_zhessq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zhessq( *uplo, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c index 6df0728b..7293386f 100644 --- a/runtime/parsec/codelets/codelet_zlacpy.c +++ b/runtime/parsec/codelets/codelet_zlacpy.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zlacpyx_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zlacpyx_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *M; @@ -56,6 +57,7 @@ CORE_zlacpyx_parsec(parsec_execution_stream_t *context, parsec_task_t * this_tas CORE_zlacpy(*uplo, *M, *N, A + (*displA), *LDA, B + (*displB), *LDB); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c index 3f4e8e35..791fba21 100644 --- a/runtime/parsec/codelets/codelet_zlag2c.c +++ b/runtime/parsec/codelets/codelet_zlag2c.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zlag2c_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlag2c_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -51,6 +52,7 @@ CORE_zlag2c_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zlag2c( *m, *n, A, *lda, B, *ldb); + (void)context; return 0; } @@ -76,7 +78,7 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options, * @ingroup CORE_MORSE_Complex64_t * **/ -static int +static inline int CORE_clag2z_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) { int *m; @@ -97,6 +99,7 @@ CORE_clag2z_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_clag2z( *m, *n, A, *lda, B, *ldb ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c index 25e1708a..f3b4c5f0 100644 --- a/runtime/parsec/codelets/codelet_zlange.c +++ b/runtime/parsec/codelets/codelet_zlange.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zlange_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlange_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *norm; int *M; @@ -47,6 +48,7 @@ CORE_zlange_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zlange( *norm, *M, *N, A, *LDA, work, normA ); + (void)context; return 0; } @@ -72,8 +74,9 @@ void MORSE_TASK_zlange(const MORSE_option_t *options, } #if defined(PRECISION_d) || defined(PRECISION_s) -static int -CORE_zlange_max_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlange_max_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { double *A; double *normA; @@ -86,6 +89,7 @@ CORE_zlange_max_parsec(parsec_execution_stream_t *context, parsec_task_t *this_t if ( *A > *normA ) *normA = *A; + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c index 8e1f0d88..8609d3b5 100644 --- a/runtime/parsec/codelets/codelet_zlanhe.c +++ b/runtime/parsec/codelets/codelet_zlanhe.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zlanhe_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlanhe_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *norm; MORSE_enum *uplo; @@ -47,6 +48,7 @@ CORE_zlanhe_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zlanhe( *norm, *uplo, *N, A, *LDA, work, normA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c index 79840521..9abb3895 100644 --- a/runtime/parsec/codelets/codelet_zlansy.c +++ b/runtime/parsec/codelets/codelet_zlansy.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zlansy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlansy_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *norm; MORSE_enum *uplo; @@ -47,6 +48,7 @@ CORE_zlansy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zlansy( *norm, *uplo, *N, A, *LDA, work, normA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c index 18dea979..75f3020f 100644 --- a/runtime/parsec/codelets/codelet_zlantr.c +++ b/runtime/parsec/codelets/codelet_zlantr.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zlantr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlantr_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *norm, *uplo, *diag; int *M; @@ -49,6 +50,7 @@ CORE_zlantr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zlantr( *norm, *uplo, *diag, *M, *N, A, *LDA, work, normA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c index 3bb8c7d3..1b20522a 100644 --- a/runtime/parsec/codelets/codelet_zlascal.c +++ b/runtime/parsec/codelets/codelet_zlascal.c @@ -39,8 +39,8 @@ * **/ static inline int -CORE_zlascal_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_zlascal_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *M; @@ -59,6 +59,9 @@ CORE_zlascal_parsec(parsec_execution_stream_t *context, UNPACK_VALUE, &LDA); CORE_zlascal(*uplo, *M, *N, *alpha, A, *LDA); + + (void)context; + return 0; } void MORSE_TASK_zlascal(const MORSE_option_t *options, diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c index 01d3bb02..b40535f6 100644 --- a/runtime/parsec/codelets/codelet_zlaset.c +++ b/runtime/parsec/codelets/codelet_zlaset.c @@ -59,8 +59,9 @@ * The leading dimension of the array A. LDA >= max(1,M). * **/ -static int -CORE_zlaset_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zlaset_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *M; @@ -82,6 +83,7 @@ CORE_zlaset_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zlaset(*uplo, *M, *N, *alpha, *beta, A, *LDA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c index 625fefcf..59c2aa09 100644 --- a/runtime/parsec/codelets/codelet_zlaset2.c +++ b/runtime/parsec/codelets/codelet_zlaset2.c @@ -57,8 +57,9 @@ * The leading dimension of the array A. LDA >= max(1,M). * **/ -static int -CORE_zlaset2_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zlaset2_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *M; @@ -78,6 +79,7 @@ CORE_zlaset2_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task CORE_zlaset2(*uplo, *M, *N, *alpha, A, *LDA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c index ecb99096..9323a399 100644 --- a/runtime/parsec/codelets/codelet_zlatro.c +++ b/runtime/parsec/codelets/codelet_zlatro.c @@ -26,8 +26,8 @@ #include "coreblas/coreblas_z.h" static inline int -CORE_zlatro_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_zlatro_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -51,6 +51,9 @@ CORE_zlatro_parsec(parsec_execution_stream_t *context, CORE_zlatro(*uplo, *trans, *M, *N, A, *LDA, B, *LDB); + + (void)context; + return 0; } /***************************************************************************//** diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c index 4eb005b4..d062a07e 100644 --- a/runtime/parsec/codelets/codelet_zlauum.c +++ b/runtime/parsec/codelets/codelet_zlauum.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zlauum_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zlauum_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *N; @@ -46,6 +47,7 @@ CORE_zlauum_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zlauum(*uplo, *N, A, *LDA); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c index f9efc2d0..14f5b286 100644 --- a/runtime/parsec/codelets/codelet_zpamm.c +++ b/runtime/parsec/codelets/codelet_zpamm.c @@ -168,8 +168,9 @@ /***************************************************************************/ -static int -CORE_zpamm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zpamm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *op; MORSE_enum *side; @@ -207,6 +208,7 @@ CORE_zpamm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zpamm( *op, *side, *storev, *M, *N, *K, *L, A1, *LDA1, A2, *LDA2, V, *LDV, W, *LDW); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c index 13dfda18..6fa2309f 100644 --- a/runtime/parsec/codelets/codelet_zplghe.c +++ b/runtime/parsec/codelets/codelet_zplghe.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zplghe_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zplghe_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { double *bump; int *m; @@ -51,6 +52,7 @@ CORE_zplghe_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zplghe( *bump, *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c index afd91170..e1fc2530 100644 --- a/runtime/parsec/codelets/codelet_zplgsy.c +++ b/runtime/parsec/codelets/codelet_zplgsy.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zplgsy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zplgsy_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_Complex64_t *bump; int *m; @@ -51,6 +52,7 @@ CORE_zplgsy_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zplgsy( *bump, *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c index b0e21a69..589062fe 100644 --- a/runtime/parsec/codelets/codelet_zplrnt.c +++ b/runtime/parsec/codelets/codelet_zplrnt.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zplrnt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zplrnt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -49,6 +50,7 @@ CORE_zplrnt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zplrnt( *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c index 858ce90b..affd9deb 100644 --- a/runtime/parsec/codelets/codelet_zplssq.c +++ b/runtime/parsec/codelets/codelet_zplssq.c @@ -56,8 +56,9 @@ * On exit, result contains scl * sqrt( ssq ) * */ -static int -CORE_zplssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zplssq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { double *SCALESUMSQ; double *SCLSSQ; @@ -74,6 +75,7 @@ CORE_zplssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) SCLSSQ[1] = SCLSSQ[1] + (SCALESUMSQ[1] * (( SCALESUMSQ[0] / SCLSSQ[0] ) * ( SCALESUMSQ[0] / SCLSSQ[0] ))); } + (void)context; return 0; } @@ -90,8 +92,9 @@ void MORSE_TASK_zplssq( const MORSE_option_t *options, 0); } -static int -CORE_zplssq2_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zplssq2_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { double *RESULT; @@ -101,6 +104,7 @@ CORE_zplssq2_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task RESULT[0] = RESULT[0] * sqrt( RESULT[1] ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c index 9cdf2486..df1537d9 100644 --- a/runtime/parsec/codelets/codelet_zpotrf.c +++ b/runtime/parsec/codelets/codelet_zpotrf.c @@ -29,8 +29,9 @@ * @ingroup CORE_MORSE_Complex64_t * **/ -static int -CORE_zpotrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zpotrf_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *tempkm, *ldak, *iinfo; @@ -46,6 +47,7 @@ CORE_zpotrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zpotrf(*uplo, *tempkm, A, *ldak, iinfo); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c index 1285a351..3d174c76 100644 --- a/runtime/parsec/codelets/codelet_zssssm.c +++ b/runtime/parsec/codelets/codelet_zssssm.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zssssm_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zssssm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m1; int *n1; @@ -63,6 +64,7 @@ CORE_zssssm_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zssssm(*m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, L1, *ldl1, L2, *ldl2, IPIV); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c index 8d2db549..4bce0968 100644 --- a/runtime/parsec/codelets/codelet_zsymm.c +++ b/runtime/parsec/codelets/codelet_zsymm.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zsymm_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zsymm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *uplo; @@ -60,6 +61,7 @@ CORE_zsymm_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) B, *LDB, *beta, C, *LDC); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c index a16a874e..cad5669d 100644 --- a/runtime/parsec/codelets/codelet_zsyr2k.c +++ b/runtime/parsec/codelets/codelet_zsyr2k.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zsyr2k_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zsyr2k_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -60,6 +61,7 @@ CORE_zsyr2k_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) B, *ldb, *beta, C, *ldc); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c index 28911f3c..dcee7b23 100644 --- a/runtime/parsec/codelets/codelet_zsyrk.c +++ b/runtime/parsec/codelets/codelet_zsyrk.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zsyrk_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zsyrk_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -55,6 +56,7 @@ CORE_zsyrk_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) *alpha, A, *lda, *beta, C, *ldc); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c index 56c424bc..dd590134 100644 --- a/runtime/parsec/codelets/codelet_zsyssq.c +++ b/runtime/parsec/codelets/codelet_zsyssq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zsyssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zsyssq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *n; @@ -43,6 +44,7 @@ CORE_zsyssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zsyssq( *uplo, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c index 229582c8..7275f907 100644 --- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zsytrf_nopiv_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zsytrf_nopiv_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; int *n; @@ -44,6 +45,7 @@ CORE_zsytrf_nopiv_parsec(parsec_execution_stream_t *context, parsec_task_t *this CORE_zsytf2_nopiv(*uplo, *n, A, *lda); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c index 8cce3597..2e33ebff 100644 --- a/runtime/parsec/codelets/codelet_ztile_zero.c +++ b/runtime/parsec/codelets/codelet_ztile_zero.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztile_zero_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztile_zero_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *X1; int *X2; @@ -48,12 +49,13 @@ CORE_ztile_zero_parsec(parsec_execution_stream_t *context, parsec_task_t *this_t for (y = *Y1; y < *Y2; y++) A[*lda*x+y] = 0.0; + (void)context; return 0; } -void MORSE_TASK_ztile_zero(const 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_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 ) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); diff --git a/runtime/parsec/codelets/codelet_ztpmqrt.c b/runtime/parsec/codelets/codelet_ztpmqrt.c index e718cd14..d0ba9486 100644 --- a/runtime/parsec/codelets/codelet_ztpmqrt.c +++ b/runtime/parsec/codelets/codelet_ztpmqrt.c @@ -26,9 +26,10 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztpmqrt_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +static inline int +CORE_ztpmqrt_parsec( parsec_execution_stream_t *context, + + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -69,6 +70,7 @@ CORE_ztpmqrt_parsec(parsec_execution_stream_t *context, CORE_ztpmqrt( *side, *trans, *M, *N, *K, *L, *ib, V, *ldv, T, *ldt, A, *lda, B, *ldb, WORK ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztpqrt.c b/runtime/parsec/codelets/codelet_ztpqrt.c index 9cd3fb73..3b937e39 100644 --- a/runtime/parsec/codelets/codelet_ztpqrt.c +++ b/runtime/parsec/codelets/codelet_ztpqrt.c @@ -26,9 +26,10 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztpqrt_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +static inline int +CORE_ztpqrt_parsec( parsec_execution_stream_t *context, + + parsec_task_t *this_task ) { int *M; int *N; @@ -59,6 +60,7 @@ CORE_ztpqrt_parsec(parsec_execution_stream_t *context, CORE_ztpqrt( *M, *N, *L, *ib, A, *lda, B, *ldb, T, *ldt, WORK ); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c index a9083f43..1404243b 100644 --- a/runtime/parsec/codelets/codelet_ztradd.c +++ b/runtime/parsec/codelets/codelet_ztradd.c @@ -28,8 +28,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztradd_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztradd_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *trans; @@ -57,6 +58,7 @@ CORE_ztradd_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztradd(*uplo, *trans, *M, *N, *alpha, A, *LDA, *beta, B, *LDB); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c index 375abb2d..48ed7762 100644 --- a/runtime/parsec/codelets/codelet_ztrasm.c +++ b/runtime/parsec/codelets/codelet_ztrasm.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztrasm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztrasm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *storev; MORSE_enum *uplo; @@ -49,6 +50,7 @@ CORE_ztrasm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztrasm(*storev, *uplo, *diag, *M, *N, A, *lda, work); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c index fa278710..8ee8777b 100644 --- a/runtime/parsec/codelets/codelet_ztrmm.c +++ b/runtime/parsec/codelets/codelet_ztrmm.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztrmm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztrmm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *uplo; @@ -59,6 +60,7 @@ CORE_ztrmm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) *alpha, A, *LDA, B, *LDB); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c index fb650e6c..00d75e86 100644 --- a/runtime/parsec/codelets/codelet_ztrsm.c +++ b/runtime/parsec/codelets/codelet_ztrsm.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztrsm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztrsm_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side, *uplo, *trans, *diag; int *tempmm, *nb, *ldak, *ldam; @@ -51,6 +52,7 @@ CORE_ztrsm_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) *tempmm, *nb, *alpha, T, *ldak, C, *ldam); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c index 6cef470b..8f6762fa 100644 --- a/runtime/parsec/codelets/codelet_ztrssq.c +++ b/runtime/parsec/codelets/codelet_ztrssq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztrssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztrssq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *diag; @@ -47,6 +48,7 @@ CORE_ztrssq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztrssq( *uplo, *diag, *m, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c index 34b2c2d5..7ad3e171 100644 --- a/runtime/parsec/codelets/codelet_ztrtri.c +++ b/runtime/parsec/codelets/codelet_ztrtri.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztrtri_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztrtri_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *uplo; MORSE_enum *diag; @@ -46,14 +47,15 @@ CORE_ztrtri_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztrtri(*uplo, *diag, *N, A, *LDA, &info); + (void)context; return 0; } -void MORSE_TASK_ztrtri(const MORSE_option_t *options, - MORSE_enum uplo, MORSE_enum diag, - int n, int nb, - const MORSE_desc_t *A, int Am, int An, int lda, - int iinfo) +void MORSE_TASK_ztrtri( const MORSE_option_t *options, + MORSE_enum uplo, MORSE_enum diag, + int n, int nb, + const MORSE_desc_t *A, int Am, int An, int lda, + int iinfo ) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c index 67587b73..4ad84b4f 100644 --- a/runtime/parsec/codelets/codelet_ztslqt.c +++ b/runtime/parsec/codelets/codelet_ztslqt.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztslqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztslqt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -55,6 +56,7 @@ CORE_ztslqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztslqt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c index 57a596df..001b7f97 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq.c +++ b/runtime/parsec/codelets/codelet_ztsmlq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztsmlq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztsmlq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -70,6 +71,7 @@ CORE_ztsmlq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztsmlq(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c index 13fe37a0..52770519 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c @@ -30,8 +30,8 @@ #include "coreblas/coreblas_z.h" static inline int -CORE_ztsmlq_hetra1_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_ztsmlq_hetra1_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -77,6 +77,9 @@ CORE_ztsmlq_hetra1_parsec(parsec_execution_stream_t *context, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + + (void)context; + return 0; } void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options, diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c index f6edb0f5..2f818f99 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr.c +++ b/runtime/parsec/codelets/codelet_ztsmqr.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztsmqr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztsmqr_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -70,6 +71,7 @@ CORE_ztsmqr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztsmqr(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c index 9fe6acb6..ae21180a 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c @@ -30,8 +30,8 @@ #include "coreblas/coreblas_z.h" static inline int -CORE_ztsmqr_hetra1_parsec(parsec_execution_stream_t *context, - parsec_task_t *this_task) +CORE_ztsmqr_hetra1_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -77,6 +77,9 @@ CORE_ztsmqr_hetra1_parsec(parsec_execution_stream_t *context, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + + (void)context; + return 0; } void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options, diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c index 19ce9c24..c9f45f3c 100644 --- a/runtime/parsec/codelets/codelet_ztsqrt.c +++ b/runtime/parsec/codelets/codelet_ztsqrt.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztsqrt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztsqrt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -55,6 +56,7 @@ CORE_ztsqrt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztsqrt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c index 69504ff4..cf6c8c7f 100644 --- a/runtime/parsec/codelets/codelet_ztstrf.c +++ b/runtime/parsec/codelets/codelet_ztstrf.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_ztstrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_ztstrf_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -65,6 +66,7 @@ CORE_ztstrf_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_ztstrf(*m, *n, *ib, *nb, U, *ldu, A, *lda, L, *ldl, IPIV, WORK, *ldwork, &info); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c index 67f6b710..96fca94d 100644 --- a/runtime/parsec/codelets/codelet_zttlqt.c +++ b/runtime/parsec/codelets/codelet_zttlqt.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zttlqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zttlqt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -55,6 +56,7 @@ CORE_zttlqt_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zttlqt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c index 53c6f379..295f9590 100644 --- a/runtime/parsec/codelets/codelet_zttmlq.c +++ b/runtime/parsec/codelets/codelet_zttmlq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zttmlq_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zttmlq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -70,6 +71,7 @@ CORE_zttmlq_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zttmlq(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c index 70bde8c1..9f3386fc 100644 --- a/runtime/parsec/codelets/codelet_zttmqr.c +++ b/runtime/parsec/codelets/codelet_zttmqr.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zttmqr_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zttmqr_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -70,6 +71,7 @@ CORE_zttmqr_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zttmqr(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c index baab70c8..a8dc01ae 100644 --- a/runtime/parsec/codelets/codelet_zttqrt.c +++ b/runtime/parsec/codelets/codelet_zttqrt.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zttqrt_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task) +static inline int +CORE_zttqrt_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { int *m; int *n; @@ -55,6 +56,7 @@ CORE_zttqrt_parsec(parsec_execution_stream_t *context, parsec_task_t * this_task CORE_zttqrt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c index e590f329..3a61b3b5 100644 --- a/runtime/parsec/codelets/codelet_zunmlq.c +++ b/runtime/parsec/codelets/codelet_zunmlq.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zunmlq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zunmlq_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -62,6 +63,7 @@ CORE_zunmlq_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zunmlq(*side, *trans, *m, *n, *k, *ib, A, *lda, T, *ldt, C, *ldc, WORK, *ldwork); + (void)context; return 0; } diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c index 58ace163..d0361d39 100644 --- a/runtime/parsec/codelets/codelet_zunmqr.c +++ b/runtime/parsec/codelets/codelet_zunmqr.c @@ -24,8 +24,9 @@ #include "chameleon/morse_tasks_z.h" #include "coreblas/coreblas_z.h" -static int -CORE_zunmqr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) +static inline int +CORE_zunmqr_parsec( parsec_execution_stream_t *context, + parsec_task_t *this_task ) { MORSE_enum *side; MORSE_enum *trans; @@ -62,6 +63,7 @@ CORE_zunmqr_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) CORE_zunmqr(*side, *trans, *m, *n, *k, *ib, A, *lda, T, *ldt, C, *ldc, WORK, *ldwork); + (void)context; return 0; } -- GitLab From 3ffac158cbee6d9afd0717437d01c50b84178dde Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 14:38:46 +0100 Subject: [PATCH 06/17] Silent some warning with parsec control directory --- runtime/parsec/control/runtime_async.c | 8 ++++---- runtime/parsec/control/runtime_control.c | 6 +++++- runtime/parsec/control/runtime_descriptor.c | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c index 67661a47..24ed51bb 100644 --- a/runtime/parsec/control/runtime_async.c +++ b/runtime/parsec/control/runtime_async.c @@ -22,7 +22,7 @@ int RUNTIME_sequence_create( MORSE_context_t *morse, MORSE_sequence_t *sequence ) { - parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; + parsec_context_t *parsec = (parsec_context_t *)(morse->schedopt); parsec_taskpool_t *parsec_dtd_tp = parsec_dtd_taskpool_new(); parsec_enqueue( parsec, (parsec_taskpool_t *)parsec_dtd_tp ); @@ -39,9 +39,8 @@ int RUNTIME_sequence_create( MORSE_context_t *morse, int RUNTIME_sequence_destroy( MORSE_context_t *morse, MORSE_sequence_t *sequence ) { - parsec_context_t *parsec = (parsec_context_t *)morse->schedopt; - parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *) sequence->schedopt; - (void)morse; + parsec_context_t *parsec = (parsec_context_t *)(morse->schedopt); + parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *)(sequence->schedopt); assert( parsec_dtd_tp ); @@ -80,5 +79,6 @@ void RUNTIME_sequence_flush( MORSE_context_t *morse, sequence->request = request; sequence->status = status; request->status = status; + (void)morse; return; } diff --git a/runtime/parsec/control/runtime_control.c b/runtime/parsec/control/runtime_control.c index 2063be2c..9b3907b0 100644 --- a/runtime/parsec/control/runtime_control.c +++ b/runtime/parsec/control/runtime_control.c @@ -47,6 +47,8 @@ int RUNTIME_init( MORSE_context_t *morse, } free(argc); + + (void)ncudas; return hres; } @@ -84,7 +86,7 @@ void RUNTIME_resume( MORSE_context_t *morse ) **/ void RUNTIME_barrier( MORSE_context_t *morse ) { - parsec_context_t *parsec = (parsec_context_t*)morse->schedopt; + parsec_context_t *parsec = (parsec_context_t*)(morse->schedopt); // This will be a problem with the fake tasks inserted to detect end of DTD algorithms parsec_context_wait( parsec ); return; @@ -104,6 +106,7 @@ void RUNTIME_progress( MORSE_context_t *morse ) **/ int RUNTIME_thread_rank( MORSE_context_t *morse ) { + (void)morse; return 0; } @@ -114,6 +117,7 @@ int RUNTIME_thread_size( MORSE_context_t *morse ) { // TODO: fixme //return vpmap_get_nb_total_threads(); + (void)morse; return 1; } diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index 88939126..593ae67e 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -118,8 +118,9 @@ morse_parsec_rank_of_key(parsec_data_collection_t *data_collection, parsec_data_ } static inline int32_t -morse_parsec_vpid_of(parsec_data_collection_t *data_collection, ...) +morse_parsec_vpid_of(parsec_data_collection_t *data_collection, ... ) { + (void)data_collection; return 0; } @@ -268,6 +269,9 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) void RUNTIME_desc_destroy( MORSE_desc_t *mdesc ) { morse_parsec_desc_t *pdesc = (morse_parsec_desc_t*)(mdesc->schedopt); + if ( pdesc == NULL ) { + return; + } if ( pdesc->data_map != NULL ) { parsec_data_t **data = pdesc->data_map; @@ -286,6 +290,7 @@ void RUNTIME_desc_destroy( MORSE_desc_t *mdesc ) parsec_dtd_data_collection_fini( (parsec_data_collection_t *)pdesc ); free(pdesc); + mdesc->schedopt = NULL; return; } -- GitLab From f767ebaea6a6a3eb9c55c0b289232e4ce5a294e6 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 14:42:14 +0100 Subject: [PATCH 07/17] Minor --- runtime/parsec/codelets/codelet_zaxpy.c | 2 +- runtime/parsec/codelets/codelet_zgemm.c | 3 +-- runtime/parsec/codelets/codelet_ztpmqrt.c | 1 - runtime/parsec/codelets/codelet_ztpqrt.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c index 17ee205b..4b872545 100644 --- a/runtime/parsec/codelets/codelet_zaxpy.c +++ b/runtime/parsec/codelets/codelet_zaxpy.c @@ -26,7 +26,7 @@ static inline int CORE_zaxpy_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { int *M; MORSE_Complex64_t *alpha; diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index bbef0712..5dc171d0 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -31,8 +31,7 @@ **/ static inline int CORE_zgemm_parsec( parsec_execution_stream_t *context, - - parsec_task_t *this_task ) + parsec_task_t *this_task ) { MORSE_enum *transA; MORSE_enum *transB; diff --git a/runtime/parsec/codelets/codelet_ztpmqrt.c b/runtime/parsec/codelets/codelet_ztpmqrt.c index d0ba9486..61c7f0ec 100644 --- a/runtime/parsec/codelets/codelet_ztpmqrt.c +++ b/runtime/parsec/codelets/codelet_ztpmqrt.c @@ -28,7 +28,6 @@ static inline int CORE_ztpmqrt_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) { MORSE_enum *side; diff --git a/runtime/parsec/codelets/codelet_ztpqrt.c b/runtime/parsec/codelets/codelet_ztpqrt.c index 3b937e39..324eddb3 100644 --- a/runtime/parsec/codelets/codelet_ztpqrt.c +++ b/runtime/parsec/codelets/codelet_ztpqrt.c @@ -28,7 +28,6 @@ static inline int CORE_ztpqrt_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) { int *M; -- GitLab From 6c041b94472e7109e01cfaac8a29072004dc4bc6 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 14:53:11 +0100 Subject: [PATCH 08/17] Cleanup all warnigns in parsec --- runtime/parsec/codelets/codelet_zgeadd.c | 2 ++ runtime/parsec/codelets/codelet_zgemm.c | 2 ++ .../parsec/codelets/codelet_zgetrf_incpiv.c | 19 ++++++++++++------- .../parsec/codelets/codelet_zgetrf_nopiv.c | 2 ++ runtime/parsec/codelets/codelet_zhe2ge.c | 2 ++ runtime/parsec/codelets/codelet_zhemm.c | 2 ++ runtime/parsec/codelets/codelet_zher2k.c | 2 ++ runtime/parsec/codelets/codelet_zherk.c | 2 ++ runtime/parsec/codelets/codelet_zlacpy.c | 1 + runtime/parsec/codelets/codelet_zlange.c | 2 ++ runtime/parsec/codelets/codelet_zlanhe.c | 2 ++ runtime/parsec/codelets/codelet_zlansy.c | 2 ++ runtime/parsec/codelets/codelet_zlantr.c | 2 ++ runtime/parsec/codelets/codelet_zlascal.c | 2 ++ runtime/parsec/codelets/codelet_zlatro.c | 2 ++ runtime/parsec/codelets/codelet_zlauum.c | 2 ++ runtime/parsec/codelets/codelet_zpotrf.c | 2 ++ runtime/parsec/codelets/codelet_zsymm.c | 2 ++ runtime/parsec/codelets/codelet_zsyr2k.c | 2 ++ runtime/parsec/codelets/codelet_zsyrk.c | 2 ++ .../parsec/codelets/codelet_zsytrf_nopiv.c | 5 +++-- runtime/parsec/codelets/codelet_ztradd.c | 2 ++ runtime/parsec/codelets/codelet_ztrmm.c | 2 ++ runtime/parsec/codelets/codelet_ztrsm.c | 2 ++ runtime/parsec/codelets/codelet_ztrtri.c | 2 ++ 25 files changed, 60 insertions(+), 9 deletions(-) diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c index ac432441..e5b59ed5 100644 --- a/runtime/parsec/codelets/codelet_zgeadd.c +++ b/runtime/parsec/codelets/codelet_zgeadd.c @@ -134,4 +134,6 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index 5dc171d0..b51074e0 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -97,4 +97,6 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c index 632a5e04..afa9026c 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c @@ -80,7 +80,7 @@ ******************************************************************************/ static inline int CORE_zgetrf_incpiv_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { int *m; int *n; @@ -110,12 +110,12 @@ CORE_zgetrf_incpiv_parsec( parsec_execution_stream_t *context, return 0; } -void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options, - int m, int n, int ib, int nb, - const MORSE_desc_t *A, int Am, int An, int lda, - const MORSE_desc_t *L, int Lm, int Ln, int ldl, - int *IPIV, - MORSE_bool check_info, int iinfo) +void MORSE_TASK_zgetrf_incpiv( const MORSE_option_t *options, + int m, int n, int ib, int nb, + const MORSE_desc_t *A, int Am, int An, int lda, + const MORSE_desc_t *L, int Lm, int Ln, int ldl, + int *IPIV, + MORSE_bool check_info, int iinfo ) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); @@ -130,4 +130,9 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options, sizeof(int), &check_info, VALUE, sizeof(int), &iinfo, VALUE, 0); + + (void)L; + (void)Lm; + (void)Ln; + (void)ldl; } diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c index 0c32707e..837a5769 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c @@ -114,4 +114,6 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c index a52b05da..e6888e64 100644 --- a/runtime/parsec/codelets/codelet_zhe2ge.c +++ b/runtime/parsec/codelets/codelet_zhe2ge.c @@ -76,4 +76,6 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT, sizeof(int), &ldb, VALUE, 0); + + (void)mb; } diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c index 486d20f6..624501f3 100644 --- a/runtime/parsec/codelets/codelet_zhemm.c +++ b/runtime/parsec/codelets/codelet_zhemm.c @@ -94,4 +94,6 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c index c4dce1e5..64357859 100644 --- a/runtime/parsec/codelets/codelet_zher2k.c +++ b/runtime/parsec/codelets/codelet_zher2k.c @@ -94,4 +94,6 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c index c3253c72..1f05559f 100644 --- a/runtime/parsec/codelets/codelet_zherk.c +++ b/runtime/parsec/codelets/codelet_zherk.c @@ -87,5 +87,7 @@ void MORSE_TASK_zherk(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c index 7293386f..dfe8f352 100644 --- a/runtime/parsec/codelets/codelet_zlacpy.c +++ b/runtime/parsec/codelets/codelet_zlacpy.c @@ -81,6 +81,7 @@ void MORSE_TASK_zlacpyx( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), OUTPUT, sizeof(int), &ldb, VALUE, 0); + (void)nb; } void MORSE_TASK_zlacpy(const MORSE_option_t *options, diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c index f3b4c5f0..c44d8e8f 100644 --- a/runtime/parsec/codelets/codelet_zlange.c +++ b/runtime/parsec/codelets/codelet_zlange.c @@ -71,6 +71,8 @@ void MORSE_TASK_zlange(const MORSE_option_t *options, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, 0); + + (void)NB; } #if defined(PRECISION_d) || defined(PRECISION_s) diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c index 8609d3b5..fcd6a519 100644 --- a/runtime/parsec/codelets/codelet_zlanhe.c +++ b/runtime/parsec/codelets/codelet_zlanhe.c @@ -71,4 +71,6 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, 0); + + (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c index 9abb3895..9b0807de 100644 --- a/runtime/parsec/codelets/codelet_zlansy.c +++ b/runtime/parsec/codelets/codelet_zlansy.c @@ -71,4 +71,6 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, 0); + + (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c index 75f3020f..80df6fbf 100644 --- a/runtime/parsec/codelets/codelet_zlantr.c +++ b/runtime/parsec/codelets/codelet_zlantr.c @@ -76,4 +76,6 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, 0); + + (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c index 1b20522a..575355ad 100644 --- a/runtime/parsec/codelets/codelet_zlascal.c +++ b/runtime/parsec/codelets/codelet_zlascal.c @@ -81,6 +81,8 @@ void MORSE_TASK_zlascal(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INOUT, sizeof(int), &lda, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c index 9323a399..a2b61536 100644 --- a/runtime/parsec/codelets/codelet_zlatro.c +++ b/runtime/parsec/codelets/codelet_zlatro.c @@ -78,4 +78,6 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT, sizeof(int), &ldb, VALUE, 0); + + (void)mb; } diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c index d062a07e..da36150c 100644 --- a/runtime/parsec/codelets/codelet_zlauum.c +++ b/runtime/parsec/codelets/codelet_zlauum.c @@ -64,4 +64,6 @@ void MORSE_TASK_zlauum(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c index df1537d9..5cf402c6 100644 --- a/runtime/parsec/codelets/codelet_zpotrf.c +++ b/runtime/parsec/codelets/codelet_zpotrf.c @@ -66,4 +66,6 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c index 4bce0968..eebb3402 100644 --- a/runtime/parsec/codelets/codelet_zsymm.c +++ b/runtime/parsec/codelets/codelet_zsymm.c @@ -89,4 +89,6 @@ void MORSE_TASK_zsymm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c index cad5669d..ba520eb3 100644 --- a/runtime/parsec/codelets/codelet_zsyr2k.c +++ b/runtime/parsec/codelets/codelet_zsyr2k.c @@ -89,4 +89,6 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c index dcee7b23..cebf30a5 100644 --- a/runtime/parsec/codelets/codelet_zsyrk.c +++ b/runtime/parsec/codelets/codelet_zsyrk.c @@ -81,4 +81,6 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c index 7275f907..db1b17b5 100644 --- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c @@ -26,14 +26,13 @@ static inline int CORE_zsytrf_nopiv_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { MORSE_enum *uplo; int *n; MORSE_Complex64_t *A; int *lda; int *iinfo; - int info; parsec_dtd_unpack_args( this_task, @@ -64,4 +63,6 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c index 1404243b..b306cb27 100644 --- a/runtime/parsec/codelets/codelet_ztradd.c +++ b/runtime/parsec/codelets/codelet_ztradd.c @@ -142,4 +142,6 @@ void MORSE_TASK_ztradd(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c index 8ee8777b..749533ef 100644 --- a/runtime/parsec/codelets/codelet_ztrmm.c +++ b/runtime/parsec/codelets/codelet_ztrmm.c @@ -86,4 +86,6 @@ void MORSE_TASK_ztrmm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c index 00d75e86..3a054e92 100644 --- a/runtime/parsec/codelets/codelet_ztrsm.c +++ b/runtime/parsec/codelets/codelet_ztrsm.c @@ -78,4 +78,6 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &ldb, VALUE, 0); + + (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c index 7ad3e171..f8f7a211 100644 --- a/runtime/parsec/codelets/codelet_ztrtri.c +++ b/runtime/parsec/codelets/codelet_ztrtri.c @@ -68,4 +68,6 @@ void MORSE_TASK_ztrtri( const MORSE_option_t *options, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, 0); + + (void)nb; } -- GitLab From 9d399b76a3370f3a06724ba283d67d3ddfd934a2 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 18:43:21 +0100 Subject: [PATCH 09/17] Fix unititialized value --- runtime/parsec/control/runtime_descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index 593ae67e..d2c7cea9 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -238,6 +238,8 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc ) parsec_dtd_data_collection_init(data_collection); /* arena init */ + pdesc->arena_index = 0; + /* taskpool init to bypass a requirement of PaRSEC */ #if defined(CHAMELEON_USE_MPI) parsec_dtd_taskpool_new(); -- GitLab From 75fd8816d5de282e9917151cac8b41e6d0f67d87 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Wed, 24 Jan 2018 18:43:32 +0100 Subject: [PATCH 10/17] Wait only sequence tasks --- runtime/parsec/control/runtime_async.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c index 24ed51bb..5745eb11 100644 --- a/runtime/parsec/control/runtime_async.c +++ b/runtime/parsec/control/runtime_async.c @@ -43,12 +43,9 @@ int RUNTIME_sequence_destroy( MORSE_context_t *morse, parsec_taskpool_t *parsec_dtd_tp = (parsec_taskpool_t *)(sequence->schedopt); assert( parsec_dtd_tp ); - - // TODO: switch to a partial wait - //parsec_dtd_taskpool_wait(parsec, parsec_dtd_tp); - parsec_context_wait( parsec ); - + parsec_dtd_taskpool_wait( parsec, parsec_dtd_tp ); parsec_taskpool_free( parsec_dtd_tp ); + sequence->schedopt = NULL; return MORSE_SUCCESS; } -- GitLab From 95826f37f76e5a4682ca5424800cd05a6a3b7df1 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 15:25:57 +0100 Subject: [PATCH 11/17] Update codelets to new PaRSEC DTD interface --- runtime/parsec/codelets/codelet_dataflush.c | 47 --------------- runtime/parsec/codelets/codelet_zasum.c | 25 +++----- runtime/parsec/codelets/codelet_zaxpy.c | 24 +++----- runtime/parsec/codelets/codelet_zbuild.c | 18 ++---- runtime/parsec/codelets/codelet_zgeadd.c | 31 ++++------ runtime/parsec/codelets/codelet_zgelqt.c | 27 +++------ runtime/parsec/codelets/codelet_zgemm.c | 57 +++++++----------- runtime/parsec/codelets/codelet_zgeqrt.c | 27 +++------ runtime/parsec/codelets/codelet_zgessm.c | 36 ++++-------- runtime/parsec/codelets/codelet_zgessq.c | 21 +++---- runtime/parsec/codelets/codelet_zgetrf.c | 23 +++----- .../parsec/codelets/codelet_zgetrf_incpiv.c | 30 ++++------ .../parsec/codelets/codelet_zgetrf_nopiv.c | 24 +++----- runtime/parsec/codelets/codelet_zhe2ge.c | 25 +++----- runtime/parsec/codelets/codelet_zhemm.c | 46 ++++++--------- runtime/parsec/codelets/codelet_zher2k.c | 44 +++++--------- runtime/parsec/codelets/codelet_zherfb.c | 43 +++++--------- runtime/parsec/codelets/codelet_zherk.c | 40 +++++-------- runtime/parsec/codelets/codelet_zhessq.c | 19 +++--- runtime/parsec/codelets/codelet_zlacpy.c | 31 ++++------ runtime/parsec/codelets/codelet_zlag2c.c | 44 +++++--------- runtime/parsec/codelets/codelet_zlange.c | 31 ++++------ runtime/parsec/codelets/codelet_zlanhe.c | 23 +++----- runtime/parsec/codelets/codelet_zlansy.c | 23 +++----- runtime/parsec/codelets/codelet_zlantr.c | 25 +++----- runtime/parsec/codelets/codelet_zlascal.c | 24 +++----- runtime/parsec/codelets/codelet_zlaset.c | 27 ++++----- runtime/parsec/codelets/codelet_zlaset2.c | 30 ++++------ runtime/parsec/codelets/codelet_zlatro.c | 30 ++++------ runtime/parsec/codelets/codelet_zlauum.c | 18 +++--- runtime/parsec/codelets/codelet_zpamm.c | 45 +++++--------- runtime/parsec/codelets/codelet_zplghe.c | 33 ++++------- runtime/parsec/codelets/codelet_zplgsy.c | 33 ++++------- runtime/parsec/codelets/codelet_zplrnt.c | 30 ++++------ runtime/parsec/codelets/codelet_zplssq.c | 15 ++--- runtime/parsec/codelets/codelet_zpotrf.c | 22 +++---- runtime/parsec/codelets/codelet_zssssm.c | 43 +++++--------- runtime/parsec/codelets/codelet_zsymm.c | 44 +++++--------- runtime/parsec/codelets/codelet_zsyr2k.c | 44 +++++--------- runtime/parsec/codelets/codelet_zsyrk.c | 40 +++++-------- runtime/parsec/codelets/codelet_zsyssq.c | 19 +++--- .../parsec/codelets/codelet_zsytrf_nopiv.c | 21 +++---- runtime/parsec/codelets/codelet_ztile_zero.c | 28 ++++----- runtime/parsec/codelets/codelet_ztpmqrt.c | 48 +++++---------- runtime/parsec/codelets/codelet_ztpqrt.c | 35 ++++------- runtime/parsec/codelets/codelet_ztradd.c | 34 ++++------- runtime/parsec/codelets/codelet_ztrasm.c | 28 ++++----- runtime/parsec/codelets/codelet_ztrmm.c | 47 ++++++--------- runtime/parsec/codelets/codelet_ztrsm.c | 29 +++------- runtime/parsec/codelets/codelet_ztrssq.c | 25 +++----- runtime/parsec/codelets/codelet_ztrtri.c | 24 +++----- runtime/parsec/codelets/codelet_ztslqt.c | 31 ++++------ runtime/parsec/codelets/codelet_ztsmlq.c | 54 ++++++----------- .../parsec/codelets/codelet_ztsmlq_hetra1.c | 58 +++++++------------ runtime/parsec/codelets/codelet_ztsmqr.c | 54 ++++++----------- .../parsec/codelets/codelet_ztsmqr_hetra1.c | 58 +++++++------------ runtime/parsec/codelets/codelet_ztsqrt.c | 31 ++++------ runtime/parsec/codelets/codelet_ztstrf.c | 41 +++++-------- runtime/parsec/codelets/codelet_zttlqt.c | 31 ++++------ runtime/parsec/codelets/codelet_zttmlq.c | 54 ++++++----------- runtime/parsec/codelets/codelet_zttmqr.c | 54 ++++++----------- runtime/parsec/codelets/codelet_zttqrt.c | 31 ++++------ runtime/parsec/codelets/codelet_zunmlq.c | 44 +++++--------- runtime/parsec/codelets/codelet_zunmqr.c | 44 +++++--------- 64 files changed, 756 insertions(+), 1429 deletions(-) delete mode 100644 runtime/parsec/codelets/codelet_dataflush.c diff --git a/runtime/parsec/codelets/codelet_dataflush.c b/runtime/parsec/codelets/codelet_dataflush.c deleted file mode 100644 index 6f14deb7..00000000 --- a/runtime/parsec/codelets/codelet_dataflush.c +++ /dev/null @@ -1,47 +0,0 @@ -/** - * - * @copyright (c) 2009-2015 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-2016 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. - * - **/ - -/** - * - * MORSE codelets kernel - * MORSE is a software package provided by Univ. of Tennessee, - * Univ. of California Berkeley and Univ. of Colorado Denver - * - * @version 2.5.0 - * @author Reazul Hoque - * @precisions normal z -> c d s - * - **/ -#include "chameleon_parsec.h" -#include "chameleon/morse_tasks.h" - -void MORSE_TASK_flush_data( const MORSE_option_t *options, - const MORSE_desc_t *A, int Am, int An ) -{ - parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); - - parsec_dtd_data_flush( PARSEC_dtd_taskpool, RTBLKADDR( A, MORSE_Complex64_t, Am, An ) ); -} - -void MORSE_TASK_flush_desc( const MORSE_option_t *options, - MORSE_enum uplo, const MORSE_desc_t *A ) -{ - /* parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); */ - - /* parsec_dtd_data_flush_all( PARSEC_dtd_taskpool, (parsec_data_collection_t*)(A->schedopt) ); */ - - (void)options; - (void)uplo; - (void)A; -} - -void MORSE_TASK_flush_all() -{ -} diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c index c3e381f1..24a926f4 100644 --- a/runtime/parsec/codelets/codelet_zasum.c +++ b/runtime/parsec/codelets/codelet_zasum.c @@ -28,28 +28,21 @@ static inline int CORE_dzasum_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *storev; - MORSE_enum *uplo; - int *M; - int *N; + MORSE_enum storev; + MORSE_enum uplo; + int M; + int N; MORSE_Complex64_t *A; - int *lda; + int lda; double *work; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &storev, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &work ); + this_task, &storev, &uplo, &M, &N, &A, &lda, &work ); - CORE_dzasum(*storev, *uplo, *M, *N, A, *lda, work); + CORE_dzasum( storev, uplo, M, N, A, lda, work ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_dzasum(const MORSE_option_t *options, @@ -68,5 +61,5 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c index 4b872545..2c06d26f 100644 --- a/runtime/parsec/codelets/codelet_zaxpy.c +++ b/runtime/parsec/codelets/codelet_zaxpy.c @@ -28,30 +28,24 @@ static inline int CORE_zaxpy_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *M; - MORSE_Complex64_t *alpha; + int M; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *incA; + int incA; MORSE_Complex64_t *B; - int *incB; + int incB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &M, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &incA, - UNPACK_DATA, &B, - UNPACK_VALUE, &incB ); + this_task, &M, &alpha, &A, &incA, &B, &incB ); - CORE_zaxpy(*M, *alpha, A, *incA, B, *incB); + CORE_zaxpy( M, alpha, A, incA, B, incB ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zaxpy(const MORSE_option_t *options, - int M, MORSE_Complex64_t *alpha, + int M, MORSE_Complex64_t alpha, const MORSE_desc_t *A, int Am, int An, int incA, const MORSE_desc_t *B, int Bm, int Bn, int incB) { @@ -65,5 +59,5 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options, sizeof(int), &incA, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &incB, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c index af7271bc..f0a3bbd1 100644 --- a/runtime/parsec/codelets/codelet_zbuild.c +++ b/runtime/parsec/codelets/codelet_zbuild.c @@ -33,25 +33,17 @@ CORE_zbuild_parsec( parsec_execution_stream_t *context, MORSE_Complex64_t *A; int lda; void *user_data; - void (*user_build_callback)(int row_min, int row_max, int col_min, int col_max, void *buffer, int ld, void *user_data) ; + void (*user_build_callback)( int row_min, int row_max, int col_min, int col_max, + void *buffer, int ld, void *user_data ); int row_min, row_max, col_min, col_max; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &row_min, - UNPACK_VALUE, &row_max, - UNPACK_VALUE, &col_min, - UNPACK_VALUE, &col_max, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &user_data, - UNPACK_VALUE, &user_build_callback ); + this_task, &row_min, &row_max, &col_min, &col_max, &A, &lda, &user_data, &user_build_callback ); user_build_callback(row_min, row_max, col_min, col_max, A, lda, user_data); (void)context; - (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zbuild( const MORSE_option_t *options, @@ -75,5 +67,5 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options, sizeof(int), &lda, VALUE, sizeof(void*), &user_data, VALUE, sizeof(void*), &user_build_callback, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c index e5b59ed5..3e90e8ff 100644 --- a/runtime/parsec/codelets/codelet_zgeadd.c +++ b/runtime/parsec/codelets/codelet_zgeadd.c @@ -33,32 +33,23 @@ static inline int CORE_zgeadd_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *trans; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum trans; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; - MORSE_Complex64_t *beta; + int LDA; + MORSE_Complex64_t beta; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_VALUE, &beta, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB ); + this_task, &trans, &M, &N, &alpha, &A, &LDA, &beta, &B, &LDB ); - CORE_zgeadd(*trans, *M, *N, *alpha, A, *LDA, *beta, B, *LDB); + CORE_zgeadd( trans, M, N, alpha, A, LDA, beta, B, LDB ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } /** @@ -133,7 +124,7 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c index 16fe5e64..e827cca9 100644 --- a/runtime/parsec/codelets/codelet_zgelqt.c +++ b/runtime/parsec/codelets/codelet_zgelqt.c @@ -89,32 +89,23 @@ static inline int CORE_zgelqt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A, &lda, &T, &ldt, &TAU, &WORK ); - CORE_zgelqt(*m, *n, *ib, A, *lda, T, *ldt, TAU, WORK); + CORE_zgelqt( m, n, ib, A, lda, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgelqt(const MORSE_option_t *options, @@ -135,5 +126,5 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c index b51074e0..18ae8cd7 100644 --- a/runtime/parsec/codelets/codelet_zgemm.c +++ b/runtime/parsec/codelets/codelet_zgemm.c @@ -33,51 +33,38 @@ static inline int CORE_zgemm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *transA; - MORSE_enum *transB; - int *m; - int *n; - int *k; - MORSE_Complex64_t *alpha; + MORSE_enum transA; + MORSE_enum transB; + int m; + int n; + int k; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; - MORSE_Complex64_t *beta; + int ldb; + MORSE_Complex64_t beta; MORSE_Complex64_t *C; - int *ldc; + int ldc; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &transA, - UNPACK_VALUE, &transB, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc ); + this_task, &transA, &transB, &m, &n, &k, &alpha, &A, &lda, &B, &ldb, &beta, &C, &ldc ); - CORE_zgemm(*transA, *transB, *m, *n, *k, - *alpha, A, *lda, - B, *ldb, - *beta, C, *ldc); + CORE_zgemm( transA, transB, m, n, k, + alpha, A, lda, + B, ldb, + beta, C, ldc); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } -void MORSE_TASK_zgemm(const MORSE_option_t *options, - MORSE_enum transA, int transB, - int m, int n, int k, int nb, - MORSE_Complex64_t alpha, const MORSE_desc_t *A, int Am, int An, int lda, +void MORSE_TASK_zgemm( const MORSE_option_t *options, + MORSE_enum transA, int transB, + int m, int n, int k, int nb, + MORSE_Complex64_t alpha, const MORSE_desc_t *A, int Am, int An, int lda, const MORSE_desc_t *B, int Bm, int Bn, int ldb, - MORSE_Complex64_t beta, const MORSE_desc_t *C, int Cm, int Cn, int ldc) + MORSE_Complex64_t beta, const MORSE_desc_t *C, int Cm, int Cn, int ldc ) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); @@ -96,7 +83,7 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c index cea9b098..f3881733 100644 --- a/runtime/parsec/codelets/codelet_zgeqrt.c +++ b/runtime/parsec/codelets/codelet_zgeqrt.c @@ -90,32 +90,23 @@ static inline int CORE_zgeqrt_parsec ( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A, &lda, &T, &ldt, &TAU, &WORK ); - CORE_zgeqrt(*m, *n, *ib, A, *lda, T, *ldt, TAU, WORK); + CORE_zgeqrt( m, n, ib, A, lda, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgeqrt(const MORSE_option_t *options, @@ -136,5 +127,5 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c index 37d4dbf0..d7196b78 100644 --- a/runtime/parsec/codelets/codelet_zgessm.c +++ b/runtime/parsec/codelets/codelet_zgessm.c @@ -73,41 +73,29 @@ static inline int CORE_zgessm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *k; - int *ib; + int m; + int n; + int k; + int ib; int *IPIV; MORSE_Complex64_t *L; - int *ldl; + int ldl; MORSE_Complex64_t *D; - int *ldd; + int ldd; MORSE_Complex64_t *A; - int *lda; + int lda; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_SCRATCH, &IPIV, - UNPACK_DATA, &L, - UNPACK_VALUE, &ldl, - UNPACK_DATA, &D, - UNPACK_VALUE, &ldd, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda ); + this_task, &m, &n, &k, &ib, &IPIV, &L, &ldl, &D, &ldd, &A, &lda ); - CORE_zgessm(*m, *n, *k, *ib, IPIV, D, *ldd, A, *lda); + CORE_zgessm( m, n, k, ib, IPIV, D, ldd, A, lda ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgessm(const MORSE_option_t *options, - int m, int n, int k, int ib, int nb, - int *IPIV, + int m, int n, int k, int ib, int nb, int *IPIV, const MORSE_desc_t *L, int Lm, int Ln, int ldl, const MORSE_desc_t *D, int Dm, int Dn, int ldd, const MORSE_desc_t *A, int Am, int An, int lda) @@ -127,5 +115,5 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options, sizeof(int), &ldd, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c index 2b1c9135..999adb36 100644 --- a/runtime/parsec/codelets/codelet_zgessq.c +++ b/runtime/parsec/codelets/codelet_zgessq.c @@ -28,24 +28,19 @@ static inline int CORE_zgessq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; + int m; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; double *SCALESUMSQ; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &SCALESUMSQ ); + this_task, &m, &n, &A, &lda, &SCALESUMSQ ); - CORE_zgessq( *m, *n, A, *lda, SCALESUMSQ, SCALESUMSQ+1); + CORE_zgessq( m, n, A, lda, SCALESUMSQ, SCALESUMSQ+1 ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgessq( const MORSE_option_t *options, @@ -59,8 +54,8 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options, PARSEC_dtd_taskpool, CORE_zgessq_parsec, options->priority, "gessq", sizeof(int), &m, VALUE, sizeof(int), &n, VALUE, - PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, + PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c index 077f6b6c..d62a7c01 100644 --- a/runtime/parsec/codelets/codelet_zgetrf.c +++ b/runtime/parsec/codelets/codelet_zgetrf.c @@ -28,29 +28,22 @@ static inline int CORE_zgetrf_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; + int m; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; int *IPIV; MORSE_bool *check_info; - int *iinfo; + int iinfo; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_SCRATCH, &IPIV, - UNPACK_VALUE, &check_info, - UNPACK_VALUE, &iinfo ); + this_task, &m, &n, &A, &lda, &IPIV, &check_info, &iinfo ); - CORE_zgetrf( *m, *n, A, *lda, IPIV, &info ); + CORE_zgetrf( m, n, A, lda, IPIV, &info ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgetrf(const MORSE_option_t *options, @@ -70,5 +63,5 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options, sizeof(int)*nb, IPIV, SCRATCH, sizeof(MORSE_bool), &check_info, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c index afa9026c..0f257167 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c @@ -29,7 +29,7 @@ * @ingroup CORE_MORSE_Complex64_t * * CORE_zgetrf_incpiv computes an LU factorization of a general M-by-N tile A - * using partial pivoting with row interchanges. + * using partial pivoting with row int erchanges. * * The factorization has the form * @@ -62,7 +62,7 @@ * * @param[out] IPIV * The pivot indices; for 1 <= i <= min(M,N), row i of the - * tile was interchanged with row IPIV(i). + * tile was int erchanged with row IPIV(i). * * @param[out] INFO * See returned value. @@ -82,32 +82,24 @@ static inline int CORE_zgetrf_incpiv_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; int *IPIV; MORSE_bool *check_info; - int *iinfo; + int iinfo; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_SCRATCH, &IPIV, - UNPACK_VALUE, &check_info, - UNPACK_VALUE, &iinfo ); + this_task, &m, &n, &ib, &A, &lda, &IPIV, &check_info, &iinfo ); - CORE_zgetrf_incpiv(*m, *n, *ib, A, *lda, IPIV, &info); + CORE_zgetrf_incpiv( m, n, ib, A, lda, IPIV, &info ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgetrf_incpiv( const MORSE_option_t *options, @@ -129,7 +121,7 @@ void MORSE_TASK_zgetrf_incpiv( const MORSE_option_t *options, sizeof(int)*nb, IPIV, SCRATCH, sizeof(int), &check_info, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)L; (void)Lm; diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c index 837a5769..9896dfc3 100644 --- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c @@ -75,27 +75,21 @@ static inline int CORE_zgetrf_nopiv_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A; - int *lda; - int *iinfo; + int lda; + int iinfo; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &iinfo ); + this_task, &m, &n, &ib, &A, &lda, &iinfo ); - CORE_zgetrf_nopiv(*m, *n, *ib, A, *lda, &info); + CORE_zgetrf_nopiv( m, n, ib, A, lda, &info ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options, @@ -113,7 +107,7 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c index e6888e64..5b81955a 100644 --- a/runtime/parsec/codelets/codelet_zhe2ge.c +++ b/runtime/parsec/codelets/codelet_zhe2ge.c @@ -33,28 +33,21 @@ static inline int CORE_zhe2ge_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *M; - int *N; + MORSE_enum uplo; + int M; + int N; const MORSE_Complex64_t *A; - int *LDA; + int LDA; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB); + this_task, &uplo, &M, &N, &A, &LDA, &B, &LDB); - CORE_zhe2ge(*uplo, *M, *N, A, *LDA, B, *LDB); + CORE_zhe2ge( uplo, M, N, A, LDA, B, LDB ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } @@ -75,7 +68,7 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)mb; } diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c index 624501f3..5e45bb6a 100644 --- a/runtime/parsec/codelets/codelet_zhemm.c +++ b/runtime/parsec/codelets/codelet_zhemm.c @@ -31,43 +31,31 @@ **/ static inline int CORE_zhemm_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *uplo; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum side; + MORSE_enum uplo; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; + int LDA; MORSE_Complex64_t *B; - int *LDB; - MORSE_Complex64_t *beta; + int LDB; + MORSE_Complex64_t beta; MORSE_Complex64_t *C; - int *LDC; + int LDC; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &LDC ); + this_task, &side, &uplo, &M, &N, &alpha, &A, &LDA, &B, &LDB, &beta, &C, &LDC ); - CORE_zhemm(*side, *uplo, *M, *N, - *alpha, A, *LDA, - B, *LDB, - *beta, C, *LDC); + CORE_zhemm( side, uplo, M, N, + alpha, A, LDA, + B, LDB, + beta, C, LDC); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zhemm(const MORSE_option_t *options, @@ -93,7 +81,7 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c index 64357859..bfbbb681 100644 --- a/runtime/parsec/codelets/codelet_zher2k.c +++ b/runtime/parsec/codelets/codelet_zher2k.c @@ -33,41 +33,29 @@ static inline int CORE_zher2k_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *n; - int *k; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + MORSE_enum trans; + int n; + int k; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; - double *beta; + int ldb; + double beta; MORSE_Complex64_t *C; - int *ldc; + int ldc; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc ); + this_task, &uplo, &trans, &n, &k, &alpha, &A, &lda, &B, &ldb, &beta, &C, &ldc ); - CORE_zher2k(*uplo, *trans, *n, *k, - *alpha, A, *lda, - B, *ldb, - *beta, C, *ldc); + CORE_zher2k( uplo, trans, n, k, + alpha, A, lda, + B, ldb, + beta, C, ldc); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zher2k(const MORSE_option_t *options, @@ -93,7 +81,7 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options, sizeof(double), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c index 3828d4e0..c90a7bc8 100644 --- a/runtime/parsec/codelets/codelet_zherfb.c +++ b/runtime/parsec/codelets/codelet_zherfb.c @@ -30,42 +30,29 @@ static inline int CORE_zherfb_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *n; - int *k; - int *ib; - int *nb; + MORSE_enum uplo; + int n; + int k; + int ib; + int nb; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *C; - int *ldc; + int ldc; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_VALUE, &nb, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork); + this_task, &uplo, &n, &k, &ib, &nb, &A, &lda, &T, &ldt, &C, &ldc, &WORK, &ldwork); - CORE_zherfb(*uplo, *n, *k, *ib, *nb, - A, *lda, T, *ldt, - C, *ldc, WORK, *ldwork); + CORE_zherfb( uplo, n, k, ib, nb, + A, lda, T, ldt, + C, ldc, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zherfb(const MORSE_option_t *options, @@ -92,5 +79,5 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options, sizeof(int), &ldc, VALUE, sizeof(MORSE_Complex64_t)*2*nb*nb, NULL, SCRATCH, sizeof(int), &nb, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c index 1f05559f..7a0959d4 100644 --- a/runtime/parsec/codelets/codelet_zherk.c +++ b/runtime/parsec/codelets/codelet_zherk.c @@ -32,38 +32,28 @@ static inline int CORE_zherk_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *n; - int *k; - double *alpha; + MORSE_enum uplo; + MORSE_enum trans; + int n; + int k; + double alpha; MORSE_Complex64_t *A; - int *lda; - double *beta; + int lda; + double beta; MORSE_Complex64_t *C; - int *ldc; + int ldc; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc ); + this_task, &uplo, &trans, &n, &k, &alpha, &A, &lda, &beta, &C, &ldc ); - CORE_zherk(*uplo, *trans, *n, *k, - *alpha, A, *lda, - *beta, C, *ldc); + CORE_zherk( uplo, trans, n, k, + alpha, A, lda, + beta, C, ldc); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zherk(const MORSE_option_t *options, @@ -86,7 +76,7 @@ void MORSE_TASK_zherk(const MORSE_option_t *options, sizeof(double), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c index 81468fbb..be38a4f6 100644 --- a/runtime/parsec/codelets/codelet_zhessq.c +++ b/runtime/parsec/codelets/codelet_zhessq.c @@ -28,24 +28,19 @@ static inline int CORE_zhessq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *n; + MORSE_enum uplo; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; double *SCALESUMSQ; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &SCALESUMSQ ); + this_task, &uplo, &n, &A, &lda, &SCALESUMSQ ); - CORE_zhessq( *uplo, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + CORE_zhessq( uplo, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zhessq( const MORSE_option_t *options, @@ -62,5 +57,5 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c index dfe8f352..702f414d 100644 --- a/runtime/parsec/codelets/codelet_zlacpy.c +++ b/runtime/parsec/codelets/codelet_zlacpy.c @@ -33,32 +33,23 @@ static inline int CORE_zlacpyx_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *M; - int *N; - int *displA; + MORSE_enum uplo; + int M; + int N; + int displA; MORSE_Complex64_t *A; - int *LDA; - int *displB; + int LDA; + int displB; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &displA, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_VALUE, &displB, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB ); + this_task, &uplo, &M, &N, &displA, &A, &LDA, &displB, &B, &LDB ); - CORE_zlacpy(*uplo, *M, *N, A + (*displA), *LDA, B + (*displB), *LDB); + CORE_zlacpy( uplo, M, N, A + (displA), LDA, B + (displB), LDB ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlacpyx( const MORSE_option_t *options, @@ -80,7 +71,7 @@ void MORSE_TASK_zlacpyx( const MORSE_option_t *options, sizeof(int), &displB, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), OUTPUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c index 791fba21..c6c0f334 100644 --- a/runtime/parsec/codelets/codelet_zlag2c.c +++ b/runtime/parsec/codelets/codelet_zlag2c.c @@ -33,27 +33,21 @@ static inline int CORE_zlag2c_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; + int m; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex32_t *B; - int *ldb; + int ldb; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb ); + this_task, &m, &n, &A, &lda, &B, &ldb ); - CORE_zlag2c( *m, *n, A, *lda, B, *ldb); + CORE_zlag2c( m, n, A, lda, B, ldb ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlag2c(const MORSE_option_t *options, @@ -70,7 +64,7 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex32_t, Bm, Bn ), OUTPUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); } /***************************************************************************//** @@ -81,26 +75,20 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options, static inline int CORE_clag2z_parsec(parsec_execution_stream_t *context, parsec_task_t *this_task) { - int *m; - int *n; + int m; + int n; MORSE_Complex32_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; + int ldb; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb ); + this_task, &m, &n, &A, &lda, &B, &ldb ); - CORE_clag2z( *m, *n, A, *lda, B, *ldb ); + CORE_clag2z( m, n, A, lda, B, ldb ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_clag2z(const MORSE_option_t *options, @@ -118,5 +106,5 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c index c44d8e8f..ef7df0b7 100644 --- a/runtime/parsec/codelets/codelet_zlange.c +++ b/runtime/parsec/codelets/codelet_zlange.c @@ -28,28 +28,21 @@ static inline int CORE_zlange_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *norm; - int *M; - int *N; + MORSE_enum norm; + int M; + int N; MORSE_Complex64_t *A; - int *LDA; + int LDA; double *work; double *normA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &norm, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_SCRATCH, &work, - UNPACK_DATA, &normA ); + this_task, &norm, &M, &N, &A, &LDA, &work, &normA ); - CORE_zlange( *norm, *M, *N, A, *LDA, work, normA ); + CORE_zlange( norm, M, N, A, LDA, work, normA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlange(const MORSE_option_t *options, @@ -70,7 +63,7 @@ void MORSE_TASK_zlange(const MORSE_option_t *options, sizeof(int), &LDA, VALUE, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, - 0); + PARSEC_DTD_ARG_END ); (void)NB; } @@ -84,15 +77,13 @@ CORE_zlange_max_parsec( parsec_execution_stream_t *context, double *normA; parsec_dtd_unpack_args( - this_task, - UNPACK_DATA, &A, - UNPACK_DATA, &normA ); + this_task, &A, &normA ); if ( *A > *normA ) *normA = *A; (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlange_max(const MORSE_option_t *options, @@ -105,7 +96,7 @@ void MORSE_TASK_zlange_max(const MORSE_option_t *options, PARSEC_dtd_taskpool, CORE_zlange_max_parsec, options->priority, "lange_max", PASSED_BY_REF, RTBLKADDR( A, double, Am, An ), INPUT, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, - 0); + PARSEC_DTD_ARG_END ); } #endif /* defined(PRECISION_d) || defined(PRECISION_s) */ diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c index fcd6a519..58efac9f 100644 --- a/runtime/parsec/codelets/codelet_zlanhe.c +++ b/runtime/parsec/codelets/codelet_zlanhe.c @@ -28,28 +28,21 @@ static inline int CORE_zlanhe_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *norm; - MORSE_enum *uplo; - int *N; + MORSE_enum norm; + MORSE_enum uplo; + int N; MORSE_Complex64_t *A; - int *LDA; + int LDA; double *work; double *normA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &norm, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_SCRATCH, &work, - UNPACK_DATA, &normA ); + this_task, &norm, &uplo, &N, &A, &LDA, &work, &normA ); - CORE_zlanhe( *norm, *uplo, *N, A, *LDA, work, normA); + CORE_zlanhe( norm, uplo, N, A, LDA, work, normA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlanhe(const MORSE_option_t *options, @@ -70,7 +63,7 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options, sizeof(int), &LDA, VALUE, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, - 0); + PARSEC_DTD_ARG_END ); (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c index 9b0807de..748b6806 100644 --- a/runtime/parsec/codelets/codelet_zlansy.c +++ b/runtime/parsec/codelets/codelet_zlansy.c @@ -28,28 +28,21 @@ static inline int CORE_zlansy_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *norm; - MORSE_enum *uplo; - int *N; + int norm; + MORSE_enum uplo; + int N; MORSE_Complex64_t *A; - int *LDA; + int LDA; double *work; double *normA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &norm, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_SCRATCH, &work, - UNPACK_DATA, &normA ); + this_task, &norm, &uplo, &N, &A, &LDA, &work, &normA ); - CORE_zlansy( *norm, *uplo, *N, A, *LDA, work, normA); + CORE_zlansy( norm, uplo, N, A, LDA, work, normA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlansy(const MORSE_option_t *options, @@ -70,7 +63,7 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options, sizeof(int), &LDA, VALUE, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, - 0); + PARSEC_DTD_ARG_END ); (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c index 80df6fbf..03da6c4c 100644 --- a/runtime/parsec/codelets/codelet_zlantr.c +++ b/runtime/parsec/codelets/codelet_zlantr.c @@ -28,30 +28,21 @@ static inline int CORE_zlantr_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *norm, *uplo, *diag; - int *M; - int *N; + MORSE_enum norm, uplo, diag; + int M; + int N; MORSE_Complex64_t *A; - int *LDA; + int LDA; double *work; double *normA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &norm, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_SCRATCH, &work, - UNPACK_DATA, &normA ); + this_task, &norm, &uplo, &diag, &M, &N, &A, &LDA, &work, &normA ); - CORE_zlantr( *norm, *uplo, *diag, *M, *N, A, *LDA, work, normA); + CORE_zlantr( norm, uplo, diag, M, N, A, LDA, work, normA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlantr(const MORSE_option_t *options, @@ -75,7 +66,7 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options, sizeof(int), &LDA, VALUE, sizeof(double)*szeW, NULL, SCRATCH, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT, - 0); + PARSEC_DTD_ARG_END ); (void)NB; } diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c index 575355ad..5f6d2a23 100644 --- a/runtime/parsec/codelets/codelet_zlascal.c +++ b/runtime/parsec/codelets/codelet_zlascal.c @@ -42,26 +42,20 @@ static inline int CORE_zlascal_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; + int LDA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA); + this_task, &uplo, &M, &N, &alpha, &A, &LDA); - CORE_zlascal(*uplo, *M, *N, *alpha, A, *LDA); + CORE_zlascal( uplo, M, N, alpha, A, LDA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlascal(const MORSE_option_t *options, @@ -80,7 +74,7 @@ void MORSE_TASK_zlascal(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &alpha, VALUE, PASSED_BY_REF, RTBLKADDR(A, MORSE_Complex64_t, Am, An), INOUT, sizeof(int), &lda, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c index b40535f6..626286c0 100644 --- a/runtime/parsec/codelets/codelet_zlaset.c +++ b/runtime/parsec/codelets/codelet_zlaset.c @@ -63,28 +63,21 @@ static inline int CORE_zlaset_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *M; - int *N; - MORSE_Complex64_t *alpha; - MORSE_Complex64_t *beta; + MORSE_enum uplo; + int M; + int N; + MORSE_Complex64_t alpha; + MORSE_Complex64_t beta; MORSE_Complex64_t *A; - int *LDA; + int LDA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_VALUE, &beta, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA ); + this_task, &uplo, &M, &N, &alpha, &beta, &A, &LDA ); - CORE_zlaset(*uplo, *M, *N, *alpha, *beta, A, *LDA); + CORE_zlaset( uplo, M, N, alpha, beta, A, LDA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlaset(const MORSE_option_t *options, @@ -103,5 +96,5 @@ void MORSE_TASK_zlaset(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT, sizeof(int), &LDA, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c index 59c2aa09..648d99e9 100644 --- a/runtime/parsec/codelets/codelet_zlaset2.c +++ b/runtime/parsec/codelets/codelet_zlaset2.c @@ -59,33 +59,27 @@ **/ static inline int CORE_zlaset2_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; + int LDA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA ); + this_task, &uplo, &M, &N, &alpha, &A, &LDA ); - CORE_zlaset2(*uplo, *M, *N, *alpha, A, *LDA); + CORE_zlaset2( uplo, M, N, alpha, A, LDA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlaset2(const MORSE_option_t *options, - MORSE_enum uplo, int M, int N, - MORSE_Complex64_t alpha, const MORSE_desc_t *A, int Am, int An, int LDA) + MORSE_enum uplo, int M, int N, + MORSE_Complex64_t alpha, const MORSE_desc_t *A, int Am, int An, int LDA) { parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(options->sequence->schedopt); @@ -97,5 +91,5 @@ void MORSE_TASK_zlaset2(const MORSE_option_t *options, sizeof(MORSE_enum), &alpha, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT, sizeof(int), &LDA, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c index a2b61536..04887c3a 100644 --- a/runtime/parsec/codelets/codelet_zlatro.c +++ b/runtime/parsec/codelets/codelet_zlatro.c @@ -29,31 +29,23 @@ static inline int CORE_zlatro_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *M; - int *N; + MORSE_enum uplo; + MORSE_enum trans; + int M; + int N; const MORSE_Complex64_t *A; - int *LDA; + int LDA; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB); + this_task, &uplo, &trans, &M, &N, &A, &LDA, &B, &LDB); - CORE_zlatro(*uplo, *trans, *M, *N, - A, *LDA, B, *LDB); + CORE_zlatro( uplo, trans, M, N, + A, LDA, B, LDB); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } /***************************************************************************//** @@ -77,7 +69,7 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR(B, MORSE_Complex64_t, Bm, Bn), OUTPUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)mb; } diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c index da36150c..e63854da 100644 --- a/runtime/parsec/codelets/codelet_zlauum.c +++ b/runtime/parsec/codelets/codelet_zlauum.c @@ -33,22 +33,18 @@ static inline int CORE_zlauum_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *N; + MORSE_enum uplo; + int N; MORSE_Complex64_t *A; - int *LDA; + int LDA; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA ); + this_task, &uplo, &N, &A, &LDA ); - CORE_zlauum(*uplo, *N, A, *LDA); + CORE_zlauum( uplo, N, A, LDA ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zlauum(const MORSE_option_t *options, @@ -63,7 +59,7 @@ void MORSE_TASK_zlauum(const MORSE_option_t *options, sizeof(int), &n, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c index 14f5b286..53a7407d 100644 --- a/runtime/parsec/codelets/codelet_zpamm.c +++ b/runtime/parsec/codelets/codelet_zpamm.c @@ -172,44 +172,29 @@ static inline int CORE_zpamm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *op; - MORSE_enum *side; - int *storev; - int *M; - int *N; - int *K; - int *L; + int op; + MORSE_enum side; + int storev; + int M; + int N; + int K; + int L; MORSE_Complex64_t *A1; - int *LDA1; + int LDA1; MORSE_Complex64_t *A2; - int *LDA2; + int LDA2; MORSE_Complex64_t *V; - int *LDV; + int LDV; MORSE_Complex64_t *W; - int *LDW; + int LDW; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &op, - UNPACK_VALUE, &side, - UNPACK_VALUE, &storev, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &K, - UNPACK_VALUE, &L, - UNPACK_DATA, &A1, - UNPACK_VALUE, &LDA1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &LDA2, - UNPACK_DATA, &V, - UNPACK_VALUE, &LDV, - UNPACK_DATA, &W, - UNPACK_VALUE, &LDW ); + this_task, &op, &side, &storev, &M, &N, &K, &L, &A1, &LDA1, &A2, &LDA2, &V, &LDV, &W, &LDW ); - CORE_zpamm( *op, *side, *storev, *M, *N, *K, *L, A1, *LDA1, A2, *LDA2, V, *LDV, W, *LDW); + CORE_zpamm( op, side, storev, M, N, K, L, A1, LDA1, A2, LDA2, V, LDV, W, LDW ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void @@ -240,5 +225,5 @@ MORSE_TASK_zpamm(const MORSE_option_t *options, sizeof(int), &ldv, VALUE, PASSED_BY_REF, RTBLKADDR( W, MORSE_Complex64_t, Wm, Wn ), INOUT, sizeof(int), &ldw, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c index 6fa2309f..9f56b393 100644 --- a/runtime/parsec/codelets/codelet_zplghe.c +++ b/runtime/parsec/codelets/codelet_zplghe.c @@ -28,32 +28,23 @@ static inline int CORE_zplghe_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - double *bump; - int *m; - int *n; + double bump; + int m; + int n; MORSE_Complex64_t *A; - int *lda; - int *bigM; - int *m0; - int *n0; - unsigned long long int *seed; + int lda; + int bigM; + int m0; + int n0; + unsigned long long int seed; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &bump, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &bigM, - UNPACK_VALUE, &m0, - UNPACK_VALUE, &n0, - UNPACK_VALUE, &seed ); + this_task, &bump, &m, &n, &A, &lda, &bigM, &m0, &n0, &seed ); - CORE_zplghe( *bump, *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + CORE_zplghe( bump, m, n, A, lda, bigM, m0, n0, seed ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zplghe( const MORSE_option_t *options, @@ -73,5 +64,5 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options, sizeof(int), &m0, VALUE, sizeof(int), &n0, VALUE, sizeof(unsigned long long int), &seed, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c index e1fc2530..5c78e20a 100644 --- a/runtime/parsec/codelets/codelet_zplgsy.c +++ b/runtime/parsec/codelets/codelet_zplgsy.c @@ -28,32 +28,23 @@ static inline int CORE_zplgsy_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_Complex64_t *bump; - int *m; - int *n; + MORSE_Complex64_t bump; + int m; + int n; MORSE_Complex64_t *A; - int *lda; - int *bigM; - int *m0; - int *n0; - unsigned long long int *seed; + int lda; + int bigM; + int m0; + int n0; + unsigned long long int seed; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &bump, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &bigM, - UNPACK_VALUE, &m0, - UNPACK_VALUE, &n0, - UNPACK_VALUE, &seed ); + this_task, &bump, &m, &n, &A, &lda, &bigM, &m0, &n0, &seed ); - CORE_zplgsy( *bump, *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + CORE_zplgsy( bump, m, n, A, lda, bigM, m0, n0, seed ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zplgsy( const MORSE_option_t *options, @@ -73,5 +64,5 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options, sizeof(int), &m0, VALUE, sizeof(int), &n0, VALUE, sizeof(unsigned long long int), &seed, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c index 589062fe..61ecdf37 100644 --- a/runtime/parsec/codelets/codelet_zplrnt.c +++ b/runtime/parsec/codelets/codelet_zplrnt.c @@ -28,30 +28,22 @@ static inline int CORE_zplrnt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; + int m; + int n; MORSE_Complex64_t *A; - int *lda; - int *bigM; - int *m0; - int *n0; - unsigned long long int *seed; + int lda; + int bigM; + int m0; + int n0; + unsigned long long int seed; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &bigM, - UNPACK_VALUE, &m0, - UNPACK_VALUE, &n0, - UNPACK_VALUE, &seed ); + this_task, &m, &n, &A, &lda, &bigM, &m0, &n0, &seed ); - CORE_zplrnt( *m, *n, A, *lda, *bigM, *m0, *n0, *seed ); + CORE_zplrnt( m, n, A, lda, bigM, m0, n0, seed ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zplrnt( const MORSE_option_t *options, @@ -70,5 +62,5 @@ void MORSE_TASK_zplrnt( const MORSE_option_t *options, sizeof(int), &m0, VALUE, sizeof(int), &n0, VALUE, sizeof(unsigned long long int), &seed, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c index affd9deb..9200e65b 100644 --- a/runtime/parsec/codelets/codelet_zplssq.c +++ b/runtime/parsec/codelets/codelet_zplssq.c @@ -64,9 +64,7 @@ CORE_zplssq_parsec( parsec_execution_stream_t *context, double *SCLSSQ; parsec_dtd_unpack_args( - this_task, - UNPACK_DATA, &SCALESUMSQ, - UNPACK_DATA, &SCLSSQ ); + this_task, &SCALESUMSQ, &SCLSSQ ); if( SCLSSQ[0] < SCALESUMSQ[0] ) { SCLSSQ[1] = SCALESUMSQ[1] + (SCLSSQ[1] * (( SCLSSQ[0] / SCALESUMSQ[0] ) * ( SCLSSQ[0] / SCALESUMSQ[0] ))); @@ -76,7 +74,7 @@ CORE_zplssq_parsec( parsec_execution_stream_t *context, } (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zplssq( const MORSE_option_t *options, @@ -89,7 +87,7 @@ void MORSE_TASK_zplssq( const MORSE_option_t *options, PARSEC_dtd_taskpool, CORE_zplssq_parsec, options->priority, "plssq", PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INPUT, PASSED_BY_REF, RTBLKADDR( SCLSSQ, double, SCLSSQm, SCLSSQn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } static inline int @@ -99,13 +97,12 @@ CORE_zplssq2_parsec( parsec_execution_stream_t *context, double *RESULT; parsec_dtd_unpack_args( - this_task, - UNPACK_DATA, &RESULT ); + this_task, &RESULT ); RESULT[0] = RESULT[0] * sqrt( RESULT[1] ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zplssq2( const MORSE_option_t *options, @@ -116,5 +113,5 @@ void MORSE_TASK_zplssq2( const MORSE_option_t *options, parsec_dtd_taskpool_insert_task( PARSEC_dtd_taskpool, CORE_zplssq2_parsec, options->priority, "plssq2", PASSED_BY_REF, RTBLKADDR( RESULT, double, RESULTm, RESULTn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c index 5cf402c6..a8618e06 100644 --- a/runtime/parsec/codelets/codelet_zpotrf.c +++ b/runtime/parsec/codelets/codelet_zpotrf.c @@ -33,22 +33,22 @@ static inline int CORE_zpotrf_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *tempkm, *ldak, *iinfo; + MORSE_enum uplo; + int tempkm, ldak, iinfo, info; MORSE_Complex64_t *A; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &tempkm, - UNPACK_DATA, &A, - UNPACK_VALUE, &ldak, - UNPACK_VALUE, &iinfo ); + this_task, &uplo, &tempkm, &A, &ldak, &iinfo ); - CORE_zpotrf(*uplo, *tempkm, A, *ldak, iinfo); + CORE_zpotrf( uplo, tempkm, A, ldak, &info ); + /* if ( (sequence->status == MORSE_SUCCESS) && (info != 0) ) { */ + /* RUNTIME_sequence_flush( (MORSE_context_t*)quark, sequence, request, iinfo+info ); */ + /* } */ (void)context; - return 0; + (void)info; + (void)iinfo; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zpotrf(const MORSE_option_t *options, @@ -65,7 +65,7 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c index 3d174c76..71998f8f 100644 --- a/runtime/parsec/codelets/codelet_zssssm.c +++ b/runtime/parsec/codelets/codelet_zssssm.c @@ -28,44 +28,29 @@ static inline int CORE_zssssm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *L1; - int *ldl1; + int ldl1; MORSE_Complex64_t *L2; - int *ldl2; + int ldl2; int *IPIV; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &L1, - UNPACK_VALUE, &ldl1, - UNPACK_DATA, &L2, - UNPACK_VALUE, &ldl2, - UNPACK_SCRATCH, &IPIV ); + this_task, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &L1, &ldl1, &L2, &ldl2, &IPIV ); - CORE_zssssm(*m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, A2, *lda2, L1, *ldl1, L2, *ldl2, IPIV); + CORE_zssssm( m1, n1, m2, n2, k, ib, A1, lda1, A2, lda2, L1, ldl1, L2, ldl2, IPIV ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zssssm(const MORSE_option_t *options, @@ -95,5 +80,5 @@ void MORSE_TASK_zssssm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( L2, MORSE_Complex64_t, L2m, L2n ), INPUT, sizeof(int), &ldl2, VALUE, sizeof(int)*nb, IPIV, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c index eebb3402..292ab02e 100644 --- a/runtime/parsec/codelets/codelet_zsymm.c +++ b/runtime/parsec/codelets/codelet_zsymm.c @@ -28,41 +28,29 @@ static inline int CORE_zsymm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *uplo; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum side; + MORSE_enum uplo; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; + int LDA; MORSE_Complex64_t *B; - int *LDB; - MORSE_Complex64_t *beta; + int LDB; + MORSE_Complex64_t beta; MORSE_Complex64_t *C; - int *LDC; + int LDC; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &LDC ); + this_task, &side, &uplo, &M, &N, &alpha, &A, &LDA, &B, &LDB, &beta, &C, &LDC ); - CORE_zsymm(*side, *uplo, *M, *N, - *alpha, A, *LDA, - B, *LDB, - *beta, C, *LDC); + CORE_zsymm( side, uplo, M, N, + alpha, A, LDA, + B, LDB, + beta, C, LDC); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zsymm(const MORSE_option_t *options, @@ -88,7 +76,7 @@ void MORSE_TASK_zsymm(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c index ba520eb3..16ba7273 100644 --- a/runtime/parsec/codelets/codelet_zsyr2k.c +++ b/runtime/parsec/codelets/codelet_zsyr2k.c @@ -28,41 +28,29 @@ static inline int CORE_zsyr2k_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *n; - int *k; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + MORSE_enum trans; + int n; + int k; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; - MORSE_Complex64_t *beta; + int ldb; + MORSE_Complex64_t beta; MORSE_Complex64_t *C; - int *ldc; + int ldc; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc ); + this_task, &uplo, &trans, &n, &k, &alpha, &A, &lda, &B, &ldb, &beta, &C, &ldc ); - CORE_zsyr2k(*uplo, *trans, *n, *k, - *alpha, A, *lda, - B, *ldb, - *beta, C, *ldc); + CORE_zsyr2k( uplo, trans, n, k, + alpha, A, lda, + B, ldb, + beta, C, ldc); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zsyr2k(const MORSE_option_t *options, @@ -88,7 +76,7 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c index cebf30a5..0d313d8a 100644 --- a/runtime/parsec/codelets/codelet_zsyrk.c +++ b/runtime/parsec/codelets/codelet_zsyrk.c @@ -26,38 +26,28 @@ static inline int CORE_zsyrk_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *n; - int *k; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + MORSE_enum trans; + int n; + int k; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *lda; - MORSE_Complex64_t *beta; + int lda; + MORSE_Complex64_t beta; MORSE_Complex64_t *C; - int *ldc; + int ldc; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &beta, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc ); + this_task, &uplo, &trans, &n, &k, &alpha, &A, &lda, &beta, &C, &ldc ); - CORE_zsyrk(*uplo, *trans, *n, *k, - *alpha, A, *lda, - *beta, C, *ldc); + CORE_zsyrk( uplo, trans, n, k, + alpha, A, lda, + beta, C, ldc); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zsyrk(const MORSE_option_t *options, @@ -80,7 +70,7 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( C, MORSE_Complex64_t, Cm, Cn ), INOUT | morse_parsec_get_arena_index(C) | AFFINITY, sizeof(int), &ldc, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c index dd590134..0dc91bbb 100644 --- a/runtime/parsec/codelets/codelet_zsyssq.c +++ b/runtime/parsec/codelets/codelet_zsyssq.c @@ -28,24 +28,19 @@ static inline int CORE_zsyssq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *n; + MORSE_enum uplo; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; double *SCALESUMSQ; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &SCALESUMSQ ); + this_task, &uplo, &n, &A, &lda, &SCALESUMSQ ); - CORE_zsyssq( *uplo, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + CORE_zsyssq( uplo, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zsyssq( const MORSE_option_t *options, @@ -62,5 +57,5 @@ void MORSE_TASK_zsyssq( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c index db1b17b5..e28a4d23 100644 --- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c +++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c @@ -28,24 +28,19 @@ static inline int CORE_zsytrf_nopiv_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - int *n; + MORSE_enum uplo; + int n; MORSE_Complex64_t *A; - int *lda; - int *iinfo; + int lda; + int iinfo; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_VALUE, &iinfo ); + this_task, &uplo, &n, &A, &lda, &iinfo ); - CORE_zsytf2_nopiv(*uplo, *n, A, *lda); + CORE_zsytf2_nopiv( uplo, n, A, lda ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options, @@ -62,7 +57,7 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c index 2e33ebff..e55afa23 100644 --- a/runtime/parsec/codelets/codelet_ztile_zero.c +++ b/runtime/parsec/codelets/codelet_ztile_zero.c @@ -28,29 +28,23 @@ static inline int CORE_ztile_zero_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *X1; - int *X2; - int *Y1; - int *Y2; + int X1; + int X2; + int Y1; + int Y2; MORSE_Complex64_t *A; - int *lda; + int lda; int x, y; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &X1, - UNPACK_VALUE, &X2, - UNPACK_VALUE, &Y1, - UNPACK_VALUE, &Y2, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda ); + this_task, &X1, &X2, &Y1, &Y2, &A, &lda ); - for (x = *X1; x < *X2; x++) - for (y = *Y1; y < *Y2; y++) - A[*lda*x+y] = 0.0; + for (x = X1; x < X2; x++) + for (y = Y1; y < Y2; y++) + A[lda * x + y] = 0.0; (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztile_zero( const MORSE_option_t *options, @@ -67,5 +61,5 @@ void MORSE_TASK_ztile_zero( const MORSE_option_t *options, sizeof(int), &Y2, VALUE, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT, sizeof(int), &lda, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztpmqrt.c b/runtime/parsec/codelets/codelet_ztpmqrt.c index 61c7f0ec..62fda5c0 100644 --- a/runtime/parsec/codelets/codelet_ztpmqrt.c +++ b/runtime/parsec/codelets/codelet_ztpmqrt.c @@ -30,47 +30,31 @@ static inline int CORE_ztpmqrt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *M; - int *N; - int *K; - int *L; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int M; + int N; + int K; + int L; + int ib; const MORSE_Complex64_t *V; - int *ldv; + int ldv; const MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; + int ldb; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &K, - UNPACK_VALUE, &L, - UNPACK_VALUE, &ib, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb, - UNPACK_SCRATCH, &WORK ); + this_task, &side, &trans, &M, &N, &K, &L, &ib, &V, &ldv, &T, &ldt, &A, &lda, &B, &ldb, &WORK ); - CORE_ztpmqrt( *side, *trans, *M, *N, *K, *L, *ib, - V, *ldv, T, *ldt, A, *lda, B, *ldb, WORK ); + CORE_ztpmqrt( side, trans, M, N, K, L, ib, + V, ldv, T, ldt, A, lda, B, ldb, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztpmqrt( const MORSE_option_t *options, @@ -101,5 +85,5 @@ void MORSE_TASK_ztpmqrt( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztpqrt.c b/runtime/parsec/codelets/codelet_ztpqrt.c index 324eddb3..e60b1ef5 100644 --- a/runtime/parsec/codelets/codelet_ztpqrt.c +++ b/runtime/parsec/codelets/codelet_ztpqrt.c @@ -30,37 +30,26 @@ static inline int CORE_ztpqrt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *M; - int *N; - int *L; - int *ib; + int M; + int N; + int L; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *B; - int *ldb; + int ldb; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &L, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &B, - UNPACK_VALUE, &ldb, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK ); + this_task, &M, &N, &L, &ib, &A, &lda, &B, &ldb, &T, &ldt, &WORK ); - CORE_ztpqrt( *M, *N, *L, *ib, - A, *lda, B, *ldb, T, *ldt, WORK ); + CORE_ztpqrt( M, N, L, ib, + A, lda, B, ldb, T, ldt, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztpqrt( const MORSE_option_t *options, @@ -84,5 +73,5 @@ void MORSE_TASK_ztpqrt( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( T, MORSE_Complex64_t, Tm, Tn ), OUTPUT, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c index b306cb27..29b6cb93 100644 --- a/runtime/parsec/codelets/codelet_ztradd.c +++ b/runtime/parsec/codelets/codelet_ztradd.c @@ -32,34 +32,24 @@ static inline int CORE_ztradd_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *trans; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum uplo; + MORSE_enum trans; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; - MORSE_Complex64_t *beta; + int LDA; + MORSE_Complex64_t beta; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_VALUE, &beta, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB ); + this_task, &uplo, &trans, &M, &N, &alpha, &A, &LDA, &beta, &B, &LDB ); - CORE_ztradd(*uplo, *trans, *M, *N, *alpha, A, *LDA, *beta, B, *LDB); + CORE_ztradd( uplo, trans, M, N, alpha, A, LDA, beta, B, LDB ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } /** @@ -141,7 +131,7 @@ void MORSE_TASK_ztradd(const MORSE_option_t *options, sizeof(MORSE_Complex64_t), &beta, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c index 48ed7762..3ca5dcf2 100644 --- a/runtime/parsec/codelets/codelet_ztrasm.c +++ b/runtime/parsec/codelets/codelet_ztrasm.c @@ -28,30 +28,22 @@ static inline int CORE_ztrasm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *storev; - MORSE_enum *uplo; - MORSE_enum *diag; - int *M; - int *N; + MORSE_enum storev; + MORSE_enum uplo; + MORSE_enum diag; + int M; + int N; MORSE_Complex64_t *A; - int *lda; + int lda; double *work; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &storev, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &work ); + this_task, &storev, &uplo, &diag, &M, &N, &A, &lda, &work ); - CORE_ztrasm(*storev, *uplo, *diag, *M, *N, A, *lda, work); + CORE_ztrasm( storev, uplo, diag, M, N, A, lda, work ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztrasm(const MORSE_option_t *options, @@ -71,5 +63,5 @@ void MORSE_TASK_ztrasm(const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c index 749533ef..ce0608f4 100644 --- a/runtime/parsec/codelets/codelet_ztrmm.c +++ b/runtime/parsec/codelets/codelet_ztrmm.c @@ -26,42 +26,31 @@ static inline int CORE_ztrmm_parsec( parsec_execution_stream_t *context, - parsec_task_t *this_task ) + parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *uplo; - MORSE_enum *transA; - MORSE_enum *diag; - int *M; - int *N; - MORSE_Complex64_t *alpha; + MORSE_enum side; + MORSE_enum uplo; + MORSE_enum transA; + MORSE_enum diag; + int M; + int N; + MORSE_Complex64_t alpha; MORSE_Complex64_t *A; - int *LDA; + int LDA; MORSE_Complex64_t *B; - int *LDB; + int LDB; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &transA, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &M, - UNPACK_VALUE, &N, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_DATA, &B, - UNPACK_VALUE, &LDB ); + this_task, &side, &uplo, &transA, &diag, &M, &N, &alpha, &A, &LDA, &B, &LDB ); - CORE_ztrmm(*side, *uplo, - *transA, *diag, - *M, *N, - *alpha, A, *LDA, - B, *LDB); + CORE_ztrmm( side, uplo, + transA, diag, + M, N, + alpha, A, LDA, + B, LDB); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztrmm(const MORSE_option_t *options, @@ -85,7 +74,7 @@ void MORSE_TASK_ztrmm(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c index 3a054e92..deaace6b 100644 --- a/runtime/parsec/codelets/codelet_ztrsm.c +++ b/runtime/parsec/codelets/codelet_ztrsm.c @@ -28,32 +28,21 @@ static inline int CORE_ztrsm_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side, *uplo, *trans, *diag; - int *tempmm, *nb, *ldak, *ldam; - MORSE_Complex64_t *alpha; + MORSE_enum side, uplo, trans, diag; + int tempmm, nb, ldak, ldam; + MORSE_Complex64_t alpha; MORSE_Complex64_t *T; MORSE_Complex64_t *C; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &tempmm, - UNPACK_VALUE, &nb, - UNPACK_VALUE, &alpha, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldak, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldam ); + this_task, &side, &uplo, &trans, &diag, &tempmm, &nb, &alpha, &T, &ldak, &C, &ldam ); - CORE_ztrsm(*side, *uplo, *trans, *diag, - *tempmm, *nb, *alpha, T, *ldak, - C, *ldam); + CORE_ztrsm( side, uplo, trans, diag, + tempmm, nb, alpha, + T, ldak, C, ldam ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztrsm(const MORSE_option_t *options, @@ -77,7 +66,7 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( B, MORSE_Complex64_t, Bm, Bn ), INOUT | morse_parsec_get_arena_index(A) | AFFINITY, sizeof(int), &ldb, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c index 8f6762fa..66c57d74 100644 --- a/runtime/parsec/codelets/codelet_ztrssq.c +++ b/runtime/parsec/codelets/codelet_ztrssq.c @@ -28,28 +28,21 @@ static inline int CORE_ztrssq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *diag; - int *m; - int *n; + MORSE_enum uplo; + MORSE_enum diag; + int m; + int n; MORSE_Complex64_t *A; - int *lda; + int lda; double *SCALESUMSQ; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &SCALESUMSQ ); + this_task, &uplo, &diag, &m, &n, &A, &lda, &SCALESUMSQ ); - CORE_ztrssq( *uplo, *diag, *m, *n, A, *lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); + CORE_ztrssq( uplo, diag, m, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1]); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztrssq( const MORSE_option_t *options, @@ -69,5 +62,5 @@ void MORSE_TASK_ztrssq( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT, sizeof(int), &lda, VALUE, PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INOUT, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c index f8f7a211..cd14186b 100644 --- a/runtime/parsec/codelets/codelet_ztrtri.c +++ b/runtime/parsec/codelets/codelet_ztrtri.c @@ -28,27 +28,21 @@ static inline int CORE_ztrtri_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *uplo; - MORSE_enum *diag; - int *N; + MORSE_enum uplo; + MORSE_enum diag; + int N; MORSE_Complex64_t *A; - int *LDA; - int *iinfo; + int LDA; + int iinfo; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &uplo, - UNPACK_VALUE, &diag, - UNPACK_VALUE, &N, - UNPACK_DATA, &A, - UNPACK_VALUE, &LDA, - UNPACK_VALUE, &iinfo ); + this_task, &uplo, &diag, &N, &A, &LDA, &iinfo ); - CORE_ztrtri(*uplo, *diag, *N, A, *LDA, &info); + CORE_ztrtri( uplo, diag, N, A, LDA, &info ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztrtri( const MORSE_option_t *options, @@ -67,7 +61,7 @@ void MORSE_TASK_ztrtri( const MORSE_option_t *options, PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT, sizeof(int), &lda, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); (void)nb; } diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c index 4ad84b4f..3bb06310 100644 --- a/runtime/parsec/codelets/codelet_ztslqt.c +++ b/runtime/parsec/codelets/codelet_ztslqt.c @@ -28,36 +28,25 @@ static inline int CORE_ztslqt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A1, &lda1, &A2, &lda2, &T, &ldt, &TAU, &WORK ); - CORE_ztslqt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + CORE_ztslqt( m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztslqt(const MORSE_option_t *options, @@ -81,5 +70,5 @@ void MORSE_TASK_ztslqt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c index 001b7f97..4335db82 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq.c +++ b/runtime/parsec/codelets/codelet_ztsmlq.c @@ -28,51 +28,33 @@ static inline int CORE_ztsmlq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork ); - CORE_ztsmlq(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, - A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + CORE_ztsmlq( side, trans, m1, n1, m2, n2, k, ib, + A1, lda1, A2, lda2, V, ldv, T, ldt, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztsmlq(const MORSE_option_t *options, @@ -107,5 +89,5 @@ void MORSE_TASK_ztsmlq(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c index 52770519..f60300f8 100644 --- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c @@ -33,53 +33,35 @@ static inline int CORE_ztsmlq_hetra1_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork); - CORE_ztsmlq_hetra1(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, - A1, *lda1, A2, *lda2, - V, *ldv, T, *ldt, - WORK, *ldwork); + CORE_ztsmlq_hetra1( side, trans, m1, n1, m2, n2, k, ib, + A1, lda1, A2, lda2, + V, ldv, T, ldt, + WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options, @@ -113,5 +95,5 @@ void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c index 2f818f99..a0beb9f8 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr.c +++ b/runtime/parsec/codelets/codelet_ztsmqr.c @@ -28,51 +28,33 @@ static inline int CORE_ztsmqr_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork ); - CORE_ztsmqr(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, - A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + CORE_ztsmqr( side, trans, m1, n1, m2, n2, k, ib, + A1, lda1, A2, lda2, V, ldv, T, ldt, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztsmqr(const MORSE_option_t *options, @@ -107,5 +89,5 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c index ae21180a..0a83e4b5 100644 --- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c +++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c @@ -33,53 +33,35 @@ static inline int CORE_ztsmqr_hetra1_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork); - CORE_ztsmqr_hetra1(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, - A1, *lda1, A2, *lda2, - V, *ldv, T, *ldt, - WORK, *ldwork); + CORE_ztsmqr_hetra1( side, trans, m1, n1, m2, n2, k, ib, + A1, lda1, A2, lda2, + V, ldv, T, ldt, + WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options, @@ -113,5 +95,5 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c index c9f45f3c..e4c98309 100644 --- a/runtime/parsec/codelets/codelet_ztsqrt.c +++ b/runtime/parsec/codelets/codelet_ztsqrt.c @@ -28,36 +28,25 @@ static inline int CORE_ztsqrt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A1, &lda1, &A2, &lda2, &T, &ldt, &TAU, &WORK ); - CORE_ztsqrt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + CORE_ztsqrt( m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztsqrt(const MORSE_option_t *options, @@ -81,5 +70,5 @@ void MORSE_TASK_ztsqrt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c index cf6c8c7f..7dd96544 100644 --- a/runtime/parsec/codelets/codelet_ztstrf.c +++ b/runtime/parsec/codelets/codelet_ztstrf.c @@ -28,46 +28,31 @@ static inline int CORE_ztstrf_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; - int *nb; + int m; + int n; + int ib; + int nb; MORSE_Complex64_t *U; - int *ldu; + int ldu; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *L; - int *ldl; + int ldl; int *IPIV; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; MORSE_bool *check_info; - int *iinfo; + int iinfo; int info; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_VALUE, &nb, - UNPACK_DATA, &U, - UNPACK_VALUE, &ldu, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &L, - UNPACK_VALUE, &ldl, - UNPACK_SCRATCH, &IPIV, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork, - UNPACK_VALUE, &check_info, - UNPACK_VALUE, &iinfo ); + this_task, &m, &n, &ib, &nb, &U, &ldu, &A, &lda, &L, &ldl, &IPIV, &WORK, &ldwork, &check_info, &iinfo ); - CORE_ztstrf(*m, *n, *ib, *nb, U, *ldu, A, *lda, L, *ldl, IPIV, WORK, *ldwork, &info); + CORE_ztstrf( m, n, ib, nb, U, ldu, A, lda, L, ldl, IPIV, WORK, ldwork, &info ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_ztstrf(const MORSE_option_t *options, @@ -97,5 +82,5 @@ void MORSE_TASK_ztstrf(const MORSE_option_t *options, sizeof(int), &nb, VALUE, sizeof(int), &check_info, VALUE, sizeof(int), &iinfo, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c index 96fca94d..ec4d4bb2 100644 --- a/runtime/parsec/codelets/codelet_zttlqt.c +++ b/runtime/parsec/codelets/codelet_zttlqt.c @@ -28,36 +28,25 @@ static inline int CORE_zttlqt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A1, &lda1, &A2, &lda2, &T, &ldt, &TAU, &WORK ); - CORE_zttlqt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + CORE_zttlqt( m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zttlqt(const MORSE_option_t *options, @@ -82,5 +71,5 @@ void MORSE_TASK_zttlqt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c index 295f9590..430f594b 100644 --- a/runtime/parsec/codelets/codelet_zttmlq.c +++ b/runtime/parsec/codelets/codelet_zttmlq.c @@ -28,51 +28,33 @@ static inline int CORE_zttmlq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork ); - CORE_zttmlq(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, A1, *lda1, - A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + CORE_zttmlq( side, trans, m1, n1, m2, n2, k, ib, A1, lda1, + A2, lda2, V, ldv, T, ldt, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zttmlq(const MORSE_option_t *options, @@ -107,5 +89,5 @@ void MORSE_TASK_zttmlq(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c index 9f3386fc..578107bc 100644 --- a/runtime/parsec/codelets/codelet_zttmqr.c +++ b/runtime/parsec/codelets/codelet_zttmqr.c @@ -28,51 +28,33 @@ static inline int CORE_zttmqr_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m1; - int *n1; - int *m2; - int *n2; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m1; + int n1; + int m2; + int n2; + int k; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *V; - int *ldv; + int ldv; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m1, - UNPACK_VALUE, &n1, - UNPACK_VALUE, &m2, - UNPACK_VALUE, &n2, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &V, - UNPACK_VALUE, &ldv, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m1, &n1, &m2, &n2, &k, &ib, &A1, &lda1, &A2, &lda2, &V, &ldv, &T, &ldt, &WORK, &ldwork ); - CORE_zttmqr(*side, *trans, *m1, *n1, *m2, *n2, *k, *ib, - A1, *lda1, A2, *lda2, V, *ldv, T, *ldt, WORK, *ldwork); + CORE_zttmqr( side, trans, m1, n1, m2, n2, k, ib, + A1, lda1, A2, lda2, V, ldv, T, ldt, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } @@ -108,5 +90,5 @@ void MORSE_TASK_zttmqr(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &ldwork, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c index a8dc01ae..6f61cbf5 100644 --- a/runtime/parsec/codelets/codelet_zttqrt.c +++ b/runtime/parsec/codelets/codelet_zttqrt.c @@ -28,36 +28,25 @@ static inline int CORE_zttqrt_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - int *m; - int *n; - int *ib; + int m; + int n; + int ib; MORSE_Complex64_t *A1; - int *lda1; + int lda1; MORSE_Complex64_t *A2; - int *lda2; + int lda2; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *TAU; MORSE_Complex64_t *WORK; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A1, - UNPACK_VALUE, &lda1, - UNPACK_DATA, &A2, - UNPACK_VALUE, &lda2, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_SCRATCH, &TAU, - UNPACK_SCRATCH, &WORK ); + this_task, &m, &n, &ib, &A1, &lda1, &A2, &lda2, &T, &ldt, &TAU, &WORK ); - CORE_zttqrt(*m, *n, *ib, A1, *lda1, A2, *lda2, T, *ldt, TAU, WORK); + CORE_zttqrt( m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK ); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zttqrt(const MORSE_option_t *options, @@ -81,5 +70,5 @@ void MORSE_TASK_zttqrt(const MORSE_option_t *options, sizeof(int), &ldt, VALUE, sizeof(MORSE_Complex64_t)*nb, NULL, SCRATCH, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c index 3a61b3b5..362d499b 100644 --- a/runtime/parsec/codelets/codelet_zunmlq.c +++ b/runtime/parsec/codelets/codelet_zunmlq.c @@ -28,43 +28,29 @@ static inline int CORE_zunmlq_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m; - int *n; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m; + int n; + int k; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *C; - int *ldc; + int ldc; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m, &n, &k, &ib, &A, &lda, &T, &ldt, &C, &ldc, &WORK, &ldwork ); - CORE_zunmlq(*side, *trans, *m, *n, *k, *ib, - A, *lda, T, *ldt, C, *ldc, WORK, *ldwork); + CORE_zunmlq( side, trans, m, n, k, ib, + A, lda, T, ldt, C, ldc, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zunmlq(const MORSE_option_t *options, @@ -92,5 +78,5 @@ void MORSE_TASK_zunmlq(const MORSE_option_t *options, sizeof(int), &ldc, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &nb, VALUE, - 0); + PARSEC_DTD_ARG_END ); } diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c index d0361d39..77381132 100644 --- a/runtime/parsec/codelets/codelet_zunmqr.c +++ b/runtime/parsec/codelets/codelet_zunmqr.c @@ -28,43 +28,29 @@ static inline int CORE_zunmqr_parsec( parsec_execution_stream_t *context, parsec_task_t *this_task ) { - MORSE_enum *side; - MORSE_enum *trans; - int *m; - int *n; - int *k; - int *ib; + MORSE_enum side; + MORSE_enum trans; + int m; + int n; + int k; + int ib; MORSE_Complex64_t *A; - int *lda; + int lda; MORSE_Complex64_t *T; - int *ldt; + int ldt; MORSE_Complex64_t *C; - int *ldc; + int ldc; MORSE_Complex64_t *WORK; - int *ldwork; + int ldwork; parsec_dtd_unpack_args( - this_task, - UNPACK_VALUE, &side, - UNPACK_VALUE, &trans, - UNPACK_VALUE, &m, - UNPACK_VALUE, &n, - UNPACK_VALUE, &k, - UNPACK_VALUE, &ib, - UNPACK_DATA, &A, - UNPACK_VALUE, &lda, - UNPACK_DATA, &T, - UNPACK_VALUE, &ldt, - UNPACK_DATA, &C, - UNPACK_VALUE, &ldc, - UNPACK_SCRATCH, &WORK, - UNPACK_VALUE, &ldwork ); + this_task, &side, &trans, &m, &n, &k, &ib, &A, &lda, &T, &ldt, &C, &ldc, &WORK, &ldwork ); - CORE_zunmqr(*side, *trans, *m, *n, *k, *ib, - A, *lda, T, *ldt, C, *ldc, WORK, *ldwork); + CORE_zunmqr( side, trans, m, n, k, ib, + A, lda, T, ldt, C, ldc, WORK, ldwork); (void)context; - return 0; + return PARSEC_HOOK_RETURN_DONE; } void MORSE_TASK_zunmqr(const MORSE_option_t *options, @@ -92,5 +78,5 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options, sizeof(int), &ldc, VALUE, sizeof(MORSE_Complex64_t)*ib*nb, NULL, SCRATCH, sizeof(int), &nb, VALUE, - 0); + PARSEC_DTD_ARG_END ); } -- GitLab From 62b14f815d554184e50035c977fe1dfc021277d1 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 15:26:22 +0100 Subject: [PATCH 12/17] Disable dataflush in Parsec to avoid freeing a data before it's fully used in the sequence --- runtime/parsec/control/runtime_descriptor.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c index d2c7cea9..8f01af0a 100644 --- a/runtime/parsec/control/runtime_descriptor.c +++ b/runtime/parsec/control/runtime_descriptor.c @@ -332,9 +332,16 @@ void RUNTIME_desc_flush( const MORSE_desc_t *desc, void RUNTIME_data_flush( const MORSE_sequence_t *sequence, const MORSE_desc_t *A, int Am, int An ) { - parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(sequence->schedopt); - - parsec_dtd_data_flush( PARSEC_dtd_taskpool, RTBLKADDR( A, MORSE_Complex64_t, Am, An ) ); + /* + * For now, we do nothing in this function as in PaRSEC, once the data is + * flushed it cannot be reused in the same sequence, when this issue will be + * fixed, we will uncomment this function + */ + /* parsec_taskpool_t* PARSEC_dtd_taskpool = (parsec_taskpool_t *)(sequence->schedopt); */ + /* parsec_dtd_data_flush( PARSEC_dtd_taskpool, RTBLKADDR( A, MORSE_Complex64_t, Am, An ) ); */ + + (void)sequence; (void)A; (void)Am; (void)An; + return; } /******************************************************************************* -- GitLab From e3bdbf60b8ec9e9c980beee6973e2d09de67c38e Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 16:10:30 +0100 Subject: [PATCH 13/17] Modify gesv to match QR algorithms --- compute/pzgetrf_incpiv.c | 37 ++++++++++++++++++++----------------- compute/pztrsmpl.c | 4 ++-- compute/zgesv_incpiv.c | 20 +++++++++++++++++++- compute/zgetrf_incpiv.c | 19 ++++++++++++++++++- 4 files changed, 59 insertions(+), 21 deletions(-) diff --git a/compute/pzgetrf_incpiv.c b/compute/pzgetrf_incpiv.c index 092d258f..b5c23f6d 100644 --- a/compute/pzgetrf_incpiv.c +++ b/compute/pzgetrf_incpiv.c @@ -35,9 +35,9 @@ #define A(_m_,_n_) A, _m_, _n_ #if defined(CHAMELEON_COPY_DIAG) -#define DIAG(_k_) DIAG, _k_, 0 +#define D(k) D, k, 0 #else -#define DIAG(_k_) A, _k_, _k_ +#define D(k) A, k, k #endif #define L(_m_,_n_) L, _m_, _n_ #define IPIV(_m_,_n_) &(IPIV[(int64_t)A->mb*((int64_t)(_m_)+(int64_t)A->mt*(int64_t)(_n_))]) @@ -45,13 +45,13 @@ /******************************************************************************* * Parallel tile LU factorization - dynamic scheduling **/ -void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, - MORSE_sequence_t *sequence, MORSE_request_t *request) +void morse_pzgetrf_incpiv( MORSE_desc_t *A, MORSE_desc_t *L, MORSE_desc_t *D, int *IPIV, + MORSE_sequence_t *sequence, MORSE_request_t *request ) { - MORSE_desc_t *DIAG = NULL; MORSE_context_t *morse; MORSE_option_t options; - size_t h_work_size, d_work_size; + size_t ws_worker = 0; + size_t ws_host = 0; int k, m, n; int ldak, ldam; @@ -65,14 +65,19 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, RUNTIME_options_init(&options, morse, sequence, request); ib = MORSE_IB; - h_work_size = sizeof(MORSE_Complex64_t)*( ib*L->nb ); - d_work_size = 0; - RUNTIME_options_ws_alloc( &options, h_work_size, d_work_size ); + /* + * zgetrf_incpiv = 0 + * zgessm = 0 + * ztstrf = A->mb * ib + * zssssm = 0 + */ + ws_worker = A->mb * ib; - /* necessary to avoid dependencies between tasks regarding the diag tile */ - DIAG = (MORSE_desc_t*)malloc(sizeof(MORSE_desc_t)); - morse_zdesc_alloc_diag(*DIAG, A->mb, A->nb, chameleon_min(A->m, A->n), A->nb, 0, 0, chameleon_min(A->m, A->n), A->nb, A->p, A->q); + ws_worker *= sizeof(MORSE_Complex64_t); + ws_host *= sizeof(MORSE_Complex64_t); + + RUNTIME_options_ws_alloc( &options, ws_worker, ws_host ); for (k = 0; k < minMNT; k++) { RUNTIME_iteration_push(morse, k); @@ -94,7 +99,7 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, &options, MorseUpperLower, tempkm, tempkn, A->nb, A(k, k), ldak, - DIAG(k), ldak); + D(k), ldak); #endif } @@ -105,7 +110,7 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, tempkm, tempnn, tempkm, ib, L->nb, IPIV(k, k), L(k, k), L->mb, - DIAG(k), ldak, + D(k), ldak, A(k, n), ldak); } for (m = k+1; m < A->mt; m++) { @@ -138,7 +143,5 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, RUNTIME_options_ws_free(&options); RUNTIME_options_finalize(&options, morse); - - morse_desc_mat_free(DIAG); - free(DIAG); + (void)D; } diff --git a/compute/pztrsmpl.c b/compute/pztrsmpl.c index 7314ad60..a96db629 100644 --- a/compute/pztrsmpl.c +++ b/compute/pztrsmpl.c @@ -37,8 +37,8 @@ /******************************************************************************* * Parallel forward substitution for tile LU - dynamic scheduling **/ -void morse_pztrsmpl(MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *L, int *IPIV, - MORSE_sequence_t *sequence, MORSE_request_t *request) +void morse_pztrsmpl( MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *L, int *IPIV, + MORSE_sequence_t *sequence, MORSE_request_t *request ) { MORSE_context_t *morse; MORSE_option_t options; diff --git a/compute/zgesv_incpiv.c b/compute/zgesv_incpiv.c index 700f6b02..9808488c 100644 --- a/compute/zgesv_incpiv.c +++ b/compute/zgesv_incpiv.c @@ -267,6 +267,7 @@ int MORSE_zgesv_incpiv_Tile_Async( MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request ) { MORSE_context_t *morse; + MORSE_desc_t D, *Dptr = NULL; morse = morse_context_self(); if (morse == NULL) { @@ -313,11 +314,28 @@ int MORSE_zgesv_incpiv_Tile_Async( MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, return MORSE_SUCCESS; */ - morse_pzgetrf_incpiv( A, L, IPIV, sequence, request ); +#if defined(CHAMELEON_COPY_DIAG) + { + int n = chameleon_min(A->mt, A->nt) * A->nb; + morse_zdesc_alloc(D, A->mb, A->nb, A->m, n, 0, 0, A->m, n, ); + Dptr = &D; + } +#endif + + morse_pzgetrf_incpiv( A, L, Dptr, IPIV, sequence, request ); morse_pztrsmpl( A, B, L, IPIV, sequence, request ); morse_pztrsm( MorseLeft, MorseUpper, MorseNoTrans, MorseNonUnit, (MORSE_Complex64_t)1.0, A, B, sequence, request ); + if (Dptr != NULL) { + MORSE_Desc_Flush( A, sequence ); + MORSE_Desc_Flush( L, sequence ); + MORSE_Desc_Flush( Dptr, sequence ); + MORSE_Desc_Flush( B, sequence ); + morse_sequence_wait( morse, sequence ); + morse_desc_mat_free( Dptr ); + } + (void)D; return MORSE_SUCCESS; } diff --git a/compute/zgetrf_incpiv.c b/compute/zgetrf_incpiv.c index a86915d0..63ead568 100644 --- a/compute/zgetrf_incpiv.c +++ b/compute/zgetrf_incpiv.c @@ -244,6 +244,7 @@ int MORSE_zgetrf_incpiv_Tile_Async( MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request ) { MORSE_context_t *morse; + MORSE_desc_t D, *Dptr = NULL; morse = morse_context_self(); if (morse == NULL) { @@ -286,7 +287,23 @@ int MORSE_zgetrf_incpiv_Tile_Async( MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, return MORSE_SUCCESS; */ - morse_pzgetrf_incpiv( A, L, IPIV, sequence, request ); +#if defined(CHAMELEON_COPY_DIAG) + { + int n = chameleon_min(A->mt, A->nt) * A->nb; + morse_zdesc_alloc(D, A->mb, A->nb, A->m, n, 0, 0, A->m, n, ); + Dptr = &D; + } +#endif + + morse_pzgetrf_incpiv( A, L, Dptr, IPIV, sequence, request ); + if (Dptr != NULL) { + MORSE_Desc_Flush( A, sequence ); + MORSE_Desc_Flush( L, sequence ); + MORSE_Desc_Flush( Dptr, sequence ); + morse_sequence_wait( morse, sequence ); + morse_desc_mat_free( Dptr ); + } + (void)D; return MORSE_SUCCESS; } -- GitLab From 2e728b00962b81abbe6501e1d98315d03b5a2586 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 18:51:04 +0100 Subject: [PATCH 14/17] Add missing flush in QR functions --- compute/pzgeqrfrh.c | 4 ++-- compute/zgelqf.c | 1 + compute/zgelqf_param.c | 2 ++ compute/zgelqs.c | 1 + compute/zgelqs_param.c | 2 ++ compute/zgels.c | 1 + compute/zgels_param.c | 2 ++ compute/zgeqrf.c | 1 + compute/zgeqrf_param.c | 2 ++ compute/zgeqrs.c | 1 + compute/zgeqrs_param.c | 2 ++ compute/zgesv_incpiv.c | 1 + compute/zgetrf_incpiv.c | 1 + compute/zgetrs_incpiv.c | 1 + compute/ztpgqrt.c | 2 ++ compute/ztpqrt.c | 1 + compute/zunglq.c | 1 + compute/zunglq_param.c | 2 ++ compute/zungqr.c | 1 + compute/zungqr_param.c | 2 ++ compute/zunmlq.c | 1 + compute/zunmlq_param.c | 2 ++ compute/zunmqr.c | 1 + compute/zunmqr_param.c | 2 ++ 24 files changed, 35 insertions(+), 2 deletions(-) diff --git a/compute/pzgeqrfrh.c b/compute/pzgeqrfrh.c index a2ea808b..30d6a127 100644 --- a/compute/pzgeqrfrh.c +++ b/compute/pzgeqrfrh.c @@ -31,8 +31,8 @@ **/ #include "control/common.h" -#define A(m,n) A, (m), (n) -#define T(m,n) T, (m), (n) +#define A(m,n) A, (m), (n) +#define T(m,n) T, (m), (n) #define T2(m,n) T, (m), ((n)+A->nt) #if defined(CHAMELEON_COPY_DIAG) #define D(m,n) D, ((m)/BS), 0 diff --git a/compute/zgelqf.c b/compute/zgelqf.c index bcab0855..3e9529be 100644 --- a/compute/zgelqf.c +++ b/compute/zgelqf.c @@ -132,6 +132,7 @@ int MORSE_zgelqf( int M, int N, /* Submit the matrix conversion back */ morse_ztile2lap( morse, &descAl, &descAt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgelqf_param.c b/compute/zgelqf_param.c index fe0623cb..76e11f6b 100644 --- a/compute/zgelqf_param.c +++ b/compute/zgelqf_param.c @@ -129,6 +129,8 @@ int MORSE_zgelqf_param( const libhqr_tree_t *qrtree, int M, int N, /* Submit the matrix conversion back */ morse_ztile2lap( morse, &descAl, &descAt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgelqs.c b/compute/zgelqs.c index ccf89614..75bf9db2 100644 --- a/compute/zgelqs.c +++ b/compute/zgelqs.c @@ -152,6 +152,7 @@ int MORSE_zgelqs( int M, int N, int NRHS, MorseDescInput, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgelqs_param.c b/compute/zgelqs_param.c index ffac93d2..6171fd70 100644 --- a/compute/zgelqs_param.c +++ b/compute/zgelqs_param.c @@ -154,6 +154,8 @@ int MORSE_zgelqs_param( const libhqr_tree_t *qrtree, int M, int N, int NRHS, MorseDescInput, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgels.c b/compute/zgels.c index 74d65ca4..22af1ab7 100644 --- a/compute/zgels.c +++ b/compute/zgels.c @@ -194,6 +194,7 @@ int MORSE_zgels( MORSE_enum trans, int M, int N, int NRHS, MorseDescInout, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgels_param.c b/compute/zgels_param.c index 5619b004..d965a089 100644 --- a/compute/zgels_param.c +++ b/compute/zgels_param.c @@ -195,6 +195,8 @@ int MORSE_zgels_param( const libhqr_tree_t *qrtree, MORSE_enum trans, int M, int MorseDescInout, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgeqrf.c b/compute/zgeqrf.c index 6695351d..e5869472 100644 --- a/compute/zgeqrf.c +++ b/compute/zgeqrf.c @@ -131,6 +131,7 @@ int MORSE_zgeqrf( int M, int N, /* Submit the matrix conversion back */ morse_ztile2lap( morse, &descAl, &descAt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgeqrf_param.c b/compute/zgeqrf_param.c index 5e5b220f..0586e463 100644 --- a/compute/zgeqrf_param.c +++ b/compute/zgeqrf_param.c @@ -134,6 +134,8 @@ int MORSE_zgeqrf_param( const libhqr_tree_t *qrtree, int M, int N, /* Submit the matrix conversion back */ morse_ztile2lap( morse, &descAl, &descAt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgeqrs.c b/compute/zgeqrs.c index d8de43c6..db7fb9e7 100644 --- a/compute/zgeqrs.c +++ b/compute/zgeqrs.c @@ -152,6 +152,7 @@ int MORSE_zgeqrs( int M, int N, int NRHS, MorseDescInput, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgeqrs_param.c b/compute/zgeqrs_param.c index cd7f17b6..26d98eb2 100644 --- a/compute/zgeqrs_param.c +++ b/compute/zgeqrs_param.c @@ -147,6 +147,8 @@ int MORSE_zgeqrs_param( const libhqr_tree_t *qrtree, int M, int N, int NRHS, MorseDescInput, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgesv_incpiv.c b/compute/zgesv_incpiv.c index 9808488c..a3e9c8c3 100644 --- a/compute/zgesv_incpiv.c +++ b/compute/zgesv_incpiv.c @@ -151,6 +151,7 @@ int MORSE_zgesv_incpiv( int N, int NRHS, MorseDescInout, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descL, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgetrf_incpiv.c b/compute/zgetrf_incpiv.c index 63ead568..8c1c9edd 100644 --- a/compute/zgetrf_incpiv.c +++ b/compute/zgetrf_incpiv.c @@ -133,6 +133,7 @@ int MORSE_zgetrf_incpiv( int M, int N, /* Submit the matrix conversion back */ morse_ztile2lap( morse, &descAl, &descAt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descL, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zgetrs_incpiv.c b/compute/zgetrs_incpiv.c index f877c8aa..e22d55f2 100644 --- a/compute/zgetrs_incpiv.c +++ b/compute/zgetrs_incpiv.c @@ -157,6 +157,7 @@ int MORSE_zgetrs_incpiv( MORSE_enum trans, int N, int NRHS, MorseDescInput, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descL, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/ztpgqrt.c b/compute/ztpgqrt.c index d28a5309..7763b413 100644 --- a/compute/ztpgqrt.c +++ b/compute/ztpgqrt.c @@ -232,6 +232,8 @@ int MORSE_ztpgqrt( int M, int N, int K, int L, MorseDescInout, MorseUpperLower, sequence, &request ); morse_ztile2lap( morse, &descQ2l, &descQ2t, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT1, sequence ); + MORSE_Desc_Flush( descT2, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/ztpqrt.c b/compute/ztpqrt.c index 9f5f60bb..af70716d 100644 --- a/compute/ztpqrt.c +++ b/compute/ztpqrt.c @@ -200,6 +200,7 @@ int MORSE_ztpqrt( int M, int N, int L, MorseDescInout, MorseUpper, sequence, &request ); morse_ztile2lap( morse, &descBl, &descBt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunglq.c b/compute/zunglq.c index f8738d76..ca9ed653 100644 --- a/compute/zunglq.c +++ b/compute/zunglq.c @@ -151,6 +151,7 @@ int MORSE_zunglq( int M, int N, int K, MorseDescInput, MorseUpper, sequence, &request ); morse_ztile2lap( morse, &descQl, &descQt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunglq_param.c b/compute/zunglq_param.c index 45110d3f..39f63a41 100644 --- a/compute/zunglq_param.c +++ b/compute/zunglq_param.c @@ -148,6 +148,8 @@ int MORSE_zunglq_param( const libhqr_tree_t *qrtree, int M, int N, int K, MorseDescInput, MorseUpper, sequence, &request ); morse_ztile2lap( morse, &descQl, &descQt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zungqr.c b/compute/zungqr.c index 954f2da5..331a5b35 100644 --- a/compute/zungqr.c +++ b/compute/zungqr.c @@ -150,6 +150,7 @@ int MORSE_zungqr( int M, int N, int K, MorseDescInput, MorseLower, sequence, &request ); morse_ztile2lap( morse, &descQl, &descQt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zungqr_param.c b/compute/zungqr_param.c index 8621b781..1f70aad4 100644 --- a/compute/zungqr_param.c +++ b/compute/zungqr_param.c @@ -149,6 +149,8 @@ int MORSE_zungqr_param( const libhqr_tree_t *qrtree, MorseDescInput, MorseLower, sequence, &request ); morse_ztile2lap( morse, &descQl, &descQt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunmlq.c b/compute/zunmlq.c index 5901868c..33e73eb1 100644 --- a/compute/zunmlq.c +++ b/compute/zunmlq.c @@ -188,6 +188,7 @@ int MORSE_zunmlq( MORSE_enum side, MORSE_enum trans, int M, int N, int K, MorseDescInput, MorseUpper, sequence, &request ); morse_ztile2lap( morse, &descCl, &descCt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunmlq_param.c b/compute/zunmlq_param.c index 4a637513..7b46fbb8 100644 --- a/compute/zunmlq_param.c +++ b/compute/zunmlq_param.c @@ -187,6 +187,8 @@ int MORSE_zunmlq_param( const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_enum MorseDescInput, MorseUpper, sequence, &request ); morse_ztile2lap( morse, &descCl, &descCt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunmqr.c b/compute/zunmqr.c index 7e836f91..89f33de1 100644 --- a/compute/zunmqr.c +++ b/compute/zunmqr.c @@ -191,6 +191,7 @@ int MORSE_zunmqr( MORSE_enum side, MORSE_enum trans, int M, int N, int K, MorseDescInput, MorseLower, sequence, &request ); morse_ztile2lap( morse, &descCl, &descCt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descT, sequence ); morse_sequence_wait( morse, sequence ); diff --git a/compute/zunmqr_param.c b/compute/zunmqr_param.c index 45c88e57..f1d31036 100644 --- a/compute/zunmqr_param.c +++ b/compute/zunmqr_param.c @@ -192,6 +192,8 @@ int MORSE_zunmqr_param( const libhqr_tree_t *qrtree, MorseDescInput, MorseLower, sequence, &request ); morse_ztile2lap( morse, &descCl, &descCt, MorseDescInout, MorseUpperLower, sequence, &request ); + MORSE_Desc_Flush( descTS, sequence ); + MORSE_Desc_Flush( descTT, sequence ); morse_sequence_wait( morse, sequence ); -- GitLab From 2641321ea2cba20e9f3918ae35902f5d40ab33b3 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 18:51:25 +0100 Subject: [PATCH 15/17] Add missing destroy in workspace --- control/workspace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/control/workspace.c b/control/workspace.c index 85240297..931577f2 100644 --- a/control/workspace.c +++ b/control/workspace.c @@ -199,6 +199,8 @@ int MORSE_Dealloc_Workspace(MORSE_desc_t **desc) return MORSE_ERR_UNALLOCATED; } morse_desc_mat_free( *desc ); + RUNTIME_desc_destroy( *desc ); + free(*desc); *desc = NULL; return MORSE_SUCCESS; -- GitLab From 9f57fb181f29c0c086c27a79debd622b1ec1663e Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 18:51:59 +0100 Subject: [PATCH 16/17] Add missing desc in getrf_incpiv declaration --- control/compute_z.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control/compute_z.h b/control/compute_z.h index 168277b4..7ff7a280 100644 --- a/control/compute_z.h +++ b/control/compute_z.h @@ -78,7 +78,7 @@ void morse_pzgemm(MORSE_enum transA, MORSE_enum transB, MORSE_Complex64_t alpha, void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, MORSE_sequence_t *sequence, MORSE_request_t *request); void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS, MORSE_sequence_t *sequence, MORSE_request_t *request); void morse_pzgetmi2(MORSE_enum idep, MORSE_enum odep, MORSE_enum storev, int m, int n, int mb, int nb, MORSE_Complex64_t *A, MORSE_sequence_t *sequence, MORSE_request_t *request); -void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request); +void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, MORSE_desc_t *D, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request); void morse_pzgetrf_nopiv(MORSE_desc_t *A, MORSE_sequence_t *sequence, MORSE_request_t *request); void morse_pzgetrf_reclap(MORSE_desc_t *A, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request); void morse_pzgetrf_rectil(MORSE_desc_t *A, int *IPIV, MORSE_sequence_t *sequence, MORSE_request_t *request); -- GitLab From 59361c0a29196adaf174fdef97919ec288932cbe Mon Sep 17 00:00:00 2001 From: Mathieu Faverge Date: Thu, 25 Jan 2018 18:56:53 +0100 Subject: [PATCH 17/17] forces DIAG off with parsec --- compute/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compute/CMakeLists.txt b/compute/CMakeLists.txt index 45700455..3160f15e 100644 --- a/compute/CMakeLists.txt +++ b/compute/CMakeLists.txt @@ -37,6 +37,10 @@ if ( CHAMELEON_SCHED_QUARK ) # No need for those extra diagonale tiles set( CHAMELEON_COPY_DIAG OFF ) endif() +if ( CHAMELEON_SCHED_PARSEC ) + # Actual DIAG can not be used with PaRSEC + set( CHAMELEON_COPY_DIAG OFF ) +endif() mark_as_advanced(CHAMELEON_COPY_DIAG) -- GitLab