Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 3fd5e79f authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Replace insert_task_generic_fptr by dague_insert_task

parent 1accf0e8
......@@ -56,7 +56,7 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_dzasum_parsec, "zasum",
dague_insert_task(DAGUE_dtd_handle, CORE_dzasum_parsec, "zasum",
sizeof(MORSE_enum), &storev, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &M, VALUE,
......
......@@ -54,7 +54,7 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zaxpy_parsec, "axpy",
dague_insert_task(DAGUE_dtd_handle, CORE_zaxpy_parsec, "axpy",
sizeof(int), &M, VALUE,
sizeof(MORSE_Complex64_t), alpha, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
......
......@@ -24,14 +24,15 @@
**/
#include "runtime/parsec/include/morse_parsec.h"
static int
CORE_zbuild_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
static inline int
CORE_zbuild_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
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) ;
int row_min, row_max, col_min, col_max;
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) ;
int row_min, row_max, col_min, col_max;
dague_dtd_unpack_args(this_task,
UNPACK_VALUE, &row_min,
......@@ -41,11 +42,10 @@ CORE_zbuild_parsec(dague_execution_unit_t *context, dague_execution_context_t *t
UNPACK_DATA, &A,
UNPACK_VALUE, &lda,
UNPACK_VALUE, &user_data,
UNPACK_VALUE, &user_build_callback
);
UNPACK_VALUE, &user_build_callback );
user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data);
user_build_callback(row_min, row_max, col_min, col_max, A, lda, user_data);
return 0;
}
......@@ -61,7 +61,7 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
col_min = An*A->nb ;
col_max = An == A->nt-1 ? A->n-1 : col_min+A->nb-1 ;
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zbuild_parsec, "zbuild",
dague_insert_task(DAGUE_dtd_handle, CORE_zbuild_parsec, "zbuild",
sizeof(int), &row_min, VALUE,
sizeof(int), &row_max, VALUE,
sizeof(int), &col_min, VALUE,
......@@ -69,6 +69,6 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | REGION_FULL,
sizeof(int), &lda, VALUE,
sizeof(void*), &user_data, VALUE,
sizeof(void*), &user_build_callback, VALUE
sizeof(void*), &user_build_callback, VALUE,
0);
}
......@@ -118,7 +118,7 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(
dague_insert_task(
DAGUE_dtd_handle, CORE_zgeadd_parsec, "geadd",
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m, VALUE,
......
......@@ -121,7 +121,7 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgelqt_parsec, "gelqt",
dague_insert_task(DAGUE_dtd_handle, CORE_zgelqt_parsec, "gelqt",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
......
......@@ -78,7 +78,7 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgemm_parsec, "Gemm",
dague_insert_task(DAGUE_dtd_handle, CORE_zgemm_parsec, "Gemm",
sizeof(MORSE_enum), &transA, VALUE,
sizeof(MORSE_enum), &transB, VALUE,
sizeof(int), &m, VALUE,
......
......@@ -122,7 +122,7 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgeqrt_parsec, "geqrt",
dague_insert_task(DAGUE_dtd_handle, CORE_zgeqrt_parsec, "geqrt",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
......
......@@ -111,7 +111,7 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgessm_parsec, "gessm",
dague_insert_task(DAGUE_dtd_handle, CORE_zgessm_parsec, "gessm",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &k, VALUE,
......
......@@ -51,7 +51,7 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgessq_parsec, "gessq",
dague_insert_task(DAGUE_dtd_handle, CORE_zgessq_parsec, "gessq",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
......
......@@ -58,7 +58,7 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_parsec, "getrf",
dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_parsec, "getrf",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
......
......@@ -117,7 +117,7 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_incpiv_parsec, "getrf_inc",
dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_incpiv_parsec, "getrf_inc",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
......
......@@ -102,7 +102,7 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zgetrf_nopiv_parsec, "getrf_nopiv",
dague_insert_task(DAGUE_dtd_handle, CORE_zgetrf_nopiv_parsec, "getrf_nopiv",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
......
......@@ -20,14 +20,14 @@
*
**/
#include "runtime/quark/include/morse_parsec.h"
#include "runtime/parsec/include/morse_parsec.h"
/**
*
* @ingroup CORE_MORSE_Complex64_t
*
**/
static inline static int
static inline int
CORE_zhe2ge_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
......@@ -48,7 +48,7 @@ CORE_zhe2ge_parsec(dague_execution_unit_t *context,
UNPACK_DATA, &B,
UNPACK_VALUE, &LDB);
CORE_zhe2ge(uplo, M, N, A, LDA, B, LDB);
CORE_zhe2ge(*uplo, *M, *N, A, *LDA, B, *LDB);
}
......@@ -60,7 +60,7 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(
dague_insert_task(
DAGUE_dtd_handle, CORE_zhe2ge_parsec, "he2ge",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
......
......@@ -76,7 +76,7 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zhemm_parsec, "hemm",
dague_insert_task(DAGUE_dtd_handle, CORE_zhemm_parsec, "hemm",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
......
......@@ -76,7 +76,7 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zher2k_parsec, "her2k",
dague_insert_task(DAGUE_dtd_handle, CORE_zher2k_parsec, "her2k",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &n, VALUE,
......
......@@ -22,9 +22,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/quark/include/morse_parsec.h"
#include "runtime/parsec/include/morse_parsec.h"
static int
static inline int
CORE_zherfb_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
......@@ -57,9 +57,9 @@ CORE_zherfb_parsec(dague_execution_unit_t *context,
UNPACK_SCRATCH, &WORK,
UNPACK_VALUE, &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 MORSE_TASK_zherfb(const MORSE_option_t *options,
......@@ -71,7 +71,7 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(
dague_insert_task(
DAGUE_dtd_handle, CORE_zherfb_parsec, "herfb",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &n, VALUE,
......
......@@ -71,7 +71,7 @@ void MORSE_TASK_zherk(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zherk_parsec, "herk",
dague_insert_task(DAGUE_dtd_handle, CORE_zherk_parsec, "herk",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &n, VALUE,
......
......@@ -51,7 +51,7 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zhessq_parsec, "hessq",
dague_insert_task(DAGUE_dtd_handle, CORE_zhessq_parsec, "hessq",
sizeof(int), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
......
......@@ -62,7 +62,7 @@ void MORSE_TASK_zlacpy(const MORSE_option_t *options,
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlacpy_parsec, "lacpy",
dague_insert_task(DAGUE_dtd_handle, CORE_zlacpy_parsec, "lacpy",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
......
......@@ -59,7 +59,7 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlag2c_parsec, "lag2c",
dague_insert_task(DAGUE_dtd_handle, CORE_zlag2c_parsec, "lag2c",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
......@@ -106,7 +106,7 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options,
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
insert_task_generic_fptr(DAGUE_dtd_handle, CORE_clag2z_parsec, "lag2z",
dague_insert_task(DAGUE_dtd_handle, CORE_clag2z_parsec, "lag2z",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex32_t, Am, An ), INPUT | REGION_FULL,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment