diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c
index 848b9bcd18c276e2c7d1a38b994a60d7957e436e..86e48d8227bfcce92027d4f6e4058f2b17ce2e4b 100644
--- a/runtime/parsec/codelets/codelet_zasum.c
+++ b/runtime/parsec/codelets/codelet_zasum.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c
index 96f8048582998039f07a0aac60f88701bfcb8f88..b54ad014d8187a03124c05bc601a6742cf4033a0 100644
--- a/runtime/parsec/codelets/codelet_zaxpy.c
+++ b/runtime/parsec/codelets/codelet_zaxpy.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c
index d058dcafcddefdf1fd8672a4ee125f29233bb06d..806433bd96746aa1429e2adc3b2e82db64d5f372 100644
--- a/runtime/parsec/codelets/codelet_zbuild.c
+++ b/runtime/parsec/codelets/codelet_zbuild.c
@@ -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);
}
diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c
index 440898f4fc7da0d84f750ca7748a84e86f2aa6ee..962eb5ef8589bff3a0c75b891d858312e097807f 100644
--- a/runtime/parsec/codelets/codelet_zgeadd.c
+++ b/runtime/parsec/codelets/codelet_zgeadd.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c
index 6c71adc8569b703a6ab784a59bd95ec08f9ac5a3..62787e093cd4e9790b28b1afd17e6928608c1047 100644
--- a/runtime/parsec/codelets/codelet_zgelqt.c
+++ b/runtime/parsec/codelets/codelet_zgelqt.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c
index 18f07d9eef28bfbb9a58823254fd2a76b1a3980e..ae5fe1745895cf463981b0bb36e1010d57275ede 100644
--- a/runtime/parsec/codelets/codelet_zgemm.c
+++ b/runtime/parsec/codelets/codelet_zgemm.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c
index 7a5a6724a4d65962fc2cb1afde57dd7ff2c8920d..347d897302a243550fcfae9b599de851e9114984 100644
--- a/runtime/parsec/codelets/codelet_zgeqrt.c
+++ b/runtime/parsec/codelets/codelet_zgeqrt.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c
index d5a5368b7fe849da1b15a727ede0ca818e5d9011..36605cafd621886e06b49e6311c21c03fa1f0d0c 100644
--- a/runtime/parsec/codelets/codelet_zgessm.c
+++ b/runtime/parsec/codelets/codelet_zgessm.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c
index 0f3c41e8b9f3c1100eea646e7125354fd135d03e..a61a5ac404778b6fe641204d7ab267a9fab898ab 100644
--- a/runtime/parsec/codelets/codelet_zgessq.c
+++ b/runtime/parsec/codelets/codelet_zgessq.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c
index 47bcdee98aa12fedf5ba8239f57b53cf045f1fa1..bcdf6f71a2b053447b48b24ffda71fe0820660dd 100644
--- a/runtime/parsec/codelets/codelet_zgetrf.c
+++ b/runtime/parsec/codelets/codelet_zgetrf.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
index 44d5f0c9bed5a031544f5b35f22f0988f71ba9fe..afd98b69e69aec74b3be0258bf7685557868a7f1 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
index 5f101c60d62a5013d8d5bdfcc2fd8e871943e13b..08b6a07b4c8ac94abd620bb9881a7be281c8b0db 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c
index a60718e0208aeab6e19d411f088c4eba3c06e3e5..600f75d551f39b679fb0b2a2c5c2ef155fb65912 100644
--- a/runtime/parsec/codelets/codelet_zhe2ge.c
+++ b/runtime/parsec/codelets/codelet_zhe2ge.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c
index 5659b5a8be41ec8c551c03b812b82df1489dc165..2b2a4bed45960df69f43b27782bdaae6afd9538f 100644
--- a/runtime/parsec/codelets/codelet_zhemm.c
+++ b/runtime/parsec/codelets/codelet_zhemm.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c
index 3209869df627f8731295c0b716386b197793ad01..a2fd88ef4bb3c32be905d70f24700045b54cc876 100644
--- a/runtime/parsec/codelets/codelet_zher2k.c
+++ b/runtime/parsec/codelets/codelet_zher2k.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c
index ab6c58eabc49f2d213c17afd35c426de79a557f1..0af3cbb082645a409b08d3e6ffadc0d4c50b03a1 100644
--- a/runtime/parsec/codelets/codelet_zherfb.c
+++ b/runtime/parsec/codelets/codelet_zherfb.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c
index 8630b0eb47012e478afab767afd21002afa7776d..5c220476c4f532c5a69d1398cb882e5ce2e8d1d9 100644
--- a/runtime/parsec/codelets/codelet_zherk.c
+++ b/runtime/parsec/codelets/codelet_zherk.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c
index f88d0638e1b3b988ae1939ea55cfa8c53f2b72d8..71a4499102e21a5924c43317692ea522f0663f93 100644
--- a/runtime/parsec/codelets/codelet_zhessq.c
+++ b/runtime/parsec/codelets/codelet_zhessq.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c
index bde5319f7bcd5bf1bc18b6cbb144e2a0a8348bb9..abf5c8391c766061e0658620559f37cfc12ce017 100644
--- a/runtime/parsec/codelets/codelet_zlacpy.c
+++ b/runtime/parsec/codelets/codelet_zlacpy.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c
index cd7f2f8da374ac086751edc9e46ea36c542c105c..3a2e79059f0ccb9973d06ad5bcb9f1a5b661b77e 100644
--- a/runtime/parsec/codelets/codelet_zlag2c.c
+++ b/runtime/parsec/codelets/codelet_zlag2c.c
@@ -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,
diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c
index 031c9d189252d61a6e91be50543826f8d9075926..3467d9f7cf7abb67497705377c7aadaac312e048 100644
--- a/runtime/parsec/codelets/codelet_zlange.c
+++ b/runtime/parsec/codelets/codelet_zlange.c
@@ -58,7 +58,7 @@ void MORSE_TASK_zlange(const MORSE_option_t *options,
int szeW = max( M, N );
- insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlange_parsec, "lange",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlange_parsec, "lange",
sizeof(MORSE_enum), &norm, VALUE,
sizeof(int), &M, VALUE,
sizeof(int), &N, VALUE,
@@ -94,7 +94,7 @@ void MORSE_TASK_zlange_max(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_zlange_max_parsec, "lange_max",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlange_max_parsec, "lange_max",
PASSED_BY_REF, RTBLKADDR( A, double, Am, An ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( B, double, Bm, Bn ), OUTPUT | REGION_FULL,
0);
diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c
index 78540b6e10046a0915dc6e8f77878925c1fdda09..4f958cff5a960caa5f70f426b29854f064036a75 100644
--- a/runtime/parsec/codelets/codelet_zlanhe.c
+++ b/runtime/parsec/codelets/codelet_zlanhe.c
@@ -57,7 +57,7 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options,
int szeW = max( 1, N );
- insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlanhe_parsec, "LANHE",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlanhe_parsec, "LANHE",
sizeof(MORSE_enum), &norm, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &N, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c
index fde4b15a6934048b837d558eb554fb1e0095d3bf..fd461728853c9933d568cc08ca0e7dfe593ac264 100644
--- a/runtime/parsec/codelets/codelet_zlansy.c
+++ b/runtime/parsec/codelets/codelet_zlansy.c
@@ -58,7 +58,7 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options,
int szeW = max( 1, N );
- insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlansy_parsec, "lansy",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlansy_parsec, "lansy",
sizeof(MORSE_enum), &norm, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &N, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c
index 8e4e22c9416e5c63d772633e4c6ea8a7582b176a..1b08e058237608fed639f77a1eb97c9657938883 100644
--- a/runtime/parsec/codelets/codelet_zlantr.c
+++ b/runtime/parsec/codelets/codelet_zlantr.c
@@ -60,7 +60,7 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options,
int szeW = max( 1, N );
- insert_task_generic_fptr(DAGUE_dtd_handle, CORE_zlantr_parsec, "lantr",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlantr_parsec, "lantr",
sizeof(MORSE_enum), &norm, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &diag, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c
index 3cea2ba8bd80cd74d080021092766ace7aaa2014..11afa143eb59eeaa152625d78ca7fce7edeb0a37 100644
--- a/runtime/parsec/codelets/codelet_zlascal.c
+++ b/runtime/parsec/codelets/codelet_zlascal.c
@@ -29,7 +29,7 @@
*
**/
-#include "runtime/quark/include/morse_parsec.h"
+#include "runtime/parsec/include/morse_parsec.h"
/***************************************************************************//**
*
@@ -55,7 +55,7 @@ CORE_zlascal_parsec(dague_execution_unit_t *context,
UNPACK_DATA, &A,
UNPACK_VALUE, &LDA);
- CORE_zlascal(uplo, M, N, alpha, A, LDA);
+ CORE_zlascal(*uplo, *M, *N, *alpha, A, *LDA);
}
void MORSE_TASK_zlascal(const MORSE_option_t *options,
@@ -66,7 +66,7 @@ void MORSE_TASK_zlascal(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_zlascal_parsec, "lascal",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c
index 66f540db439435580999d96c30ddf9f55891a408..d8fb1673ad921be863920b470ac7f96f0c5d2dbd 100644
--- a/runtime/parsec/codelets/codelet_zlaset.c
+++ b/runtime/parsec/codelets/codelet_zlaset.c
@@ -92,7 +92,7 @@ void MORSE_TASK_zlaset(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_zlaset_parsec, "laset",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlaset_parsec, "laset",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &M, VALUE,
sizeof(int), &N, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c
index 7ff90dc92d2465aa8fb70d739757da629bfbc556..01eeacd59cdb314cd2c981a1cf5d7a6a5becb3d8 100644
--- a/runtime/parsec/codelets/codelet_zlaset2.c
+++ b/runtime/parsec/codelets/codelet_zlaset2.c
@@ -85,7 +85,7 @@ void MORSE_TASK_zlaset2(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_zlaset2_parsec, "laset2",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlaset2_parsec, "laset2",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &M, VALUE,
sizeof(int), &N, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c
index 6cf3e6297c1cf3f099170ae5d2c1de77c306516d..e67e808d01de4602b617c60b89f4ba01d64b4ed7 100644
--- a/runtime/parsec/codelets/codelet_zlatro.c
+++ b/runtime/parsec/codelets/codelet_zlatro.c
@@ -23,8 +23,7 @@
**/
#include "runtime/parsec/include/morse_parsec.h"
-
-static int
+static inline int
CORE_zlatro_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
@@ -47,8 +46,8 @@ CORE_zlatro_parsec(dague_execution_unit_t *context,
UNPACK_DATA, &B,
UNPACK_VALUE, &LDB);
- CORE_zlatro(uplo, trans, M, N,
- A, LDA, B, LDB);
+ CORE_zlatro(*uplo, *trans, *M, *N,
+ A, *LDA, B, *LDB);
}
/***************************************************************************//**
@@ -62,7 +61,7 @@ void MORSE_TASK_zlatro(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_zlatro_parsec, "latro",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c
index 6c936cc8b3600c04e34b78fbe2b7adc281cd9d7c..0e1c974d0964bac6d35bd20cfd724baefccf10b9 100644
--- a/runtime/parsec/codelets/codelet_zlauum.c
+++ b/runtime/parsec/codelets/codelet_zlauum.c
@@ -54,7 +54,7 @@ void MORSE_TASK_zlauum(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_zlauum_parsec, "lauum",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zlauum_parsec, "lauum",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c
index b15f9eb6842e9bf604fc56608e338ceb612dd249..f0520af592ec17d4f98f7cab1959c0961cfb0b33 100644
--- a/runtime/parsec/codelets/codelet_zpamm.c
+++ b/runtime/parsec/codelets/codelet_zpamm.c
@@ -219,7 +219,7 @@ MORSE_TASK_zpamm(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_zpamm_parsec, "pamm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zpamm_parsec, "pamm",
sizeof(int), &op, VALUE,
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &storev, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c
index 58485eba4fd5c0f883aee0868450745c74bad679..561daa7fbf8f205e214a1994b095b913e3d93e97 100644
--- a/runtime/parsec/codelets/codelet_zplghe.c
+++ b/runtime/parsec/codelets/codelet_zplghe.c
@@ -59,7 +59,7 @@ void MORSE_TASK_zplghe( 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_zplghe_parsec, "zplghe",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zplghe_parsec, "zplghe",
sizeof(double), &bump, VALUE,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c
index d3a11a4bc2c95f221ed8888c2237170466502889..d702861464ddc41e87adf92473e3d7582a61ab85 100644
--- a/runtime/parsec/codelets/codelet_zplgsy.c
+++ b/runtime/parsec/codelets/codelet_zplgsy.c
@@ -58,7 +58,7 @@ void MORSE_TASK_zplgsy( 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_zplgsy_parsec, "zplgsy",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zplgsy_parsec, "zplgsy",
sizeof(MORSE_Complex64_t), &bump, VALUE,
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c
index 7f0231912c5774a6223413c1f0d384ed6a915f51..1cfc25b1ae28332a22623923e4628a1dcf779783 100644
--- a/runtime/parsec/codelets/codelet_zplrnt.c
+++ b/runtime/parsec/codelets/codelet_zplrnt.c
@@ -57,7 +57,7 @@ void MORSE_TASK_zplrnt( 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_zplrnt_parsec, "zplrnt",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zplrnt_parsec, "zplrnt",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), OUTPUT | REGION_FULL,
diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c
index 662e9b7755d3b77b5310571f9236486760cb6964..3c570c4bbdc1fe919fef55c0cea3d7d77cc76d10 100644
--- a/runtime/parsec/codelets/codelet_zplssq.c
+++ b/runtime/parsec/codelets/codelet_zplssq.c
@@ -81,7 +81,7 @@ void MORSE_TASK_zplssq( 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_zplssq_parsec, "plssq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zplssq_parsec, "plssq",
PASSED_BY_REF, RTBLKADDR( SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn ), INPUT | REGION_FULL,
PASSED_BY_REF, RTBLKADDR( SCLSSQ, double, SCLSSQm, SCLSSQn ), INOUT | REGION_FULL,
0);
@@ -107,7 +107,7 @@ void MORSE_TASK_zplssq2( 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_zplssq2_parsec, "plssq2",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zplssq2_parsec, "plssq2",
PASSED_BY_REF, RTBLKADDR( RESULT, double, RESULTm, RESULTn ), INOUT | REGION_FULL,
0);
}
diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c
index 050b194c0edf4928e1b73df4062b3d957a56e3f8..9befe17ed5d3a2765928289fbd045e213d9d65e1 100644
--- a/runtime/parsec/codelets/codelet_zpotrf.c
+++ b/runtime/parsec/codelets/codelet_zpotrf.c
@@ -55,7 +55,7 @@ void MORSE_TASK_zpotrf(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_zpotrf_parsec, "potrf",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zpotrf_parsec, "potrf",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c
index 3ef48666459c682d599b8037db819f58055ed550..8a71222cf7cb66b5dbde64ace2007f54fdc9b7c2 100644
--- a/runtime/parsec/codelets/codelet_zssssm.c
+++ b/runtime/parsec/codelets/codelet_zssssm.c
@@ -75,7 +75,7 @@ void MORSE_TASK_zssssm(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_zssssm_parsec, "ssssm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zssssm_parsec, "ssssm",
sizeof(int), &m1, VALUE,
sizeof(int), &n1, VALUE,
sizeof(int), &m2, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c
index 70bef988d266fe308caefaaba0a5a40680765701..9d9659d19d81307ee6d032f52eca736424c66676 100644
--- a/runtime/parsec/codelets/codelet_zsymm.c
+++ b/runtime/parsec/codelets/codelet_zsymm.c
@@ -73,7 +73,7 @@ void MORSE_TASK_zsymm(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_zsymm_parsec, "symm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zsymm_parsec, "symm",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &m, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c
index 3cae995d28d1d79be540b760a0000f9516b829aa..95cc655d7e460f45bd13213de3de982ca7a7a00f 100644
--- a/runtime/parsec/codelets/codelet_zsyr2k.c
+++ b/runtime/parsec/codelets/codelet_zsyr2k.c
@@ -71,7 +71,7 @@ void MORSE_TASK_zsyr2k(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_zsyr2k_parsec, "syr2k",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zsyr2k_parsec, "syr2k",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &n, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c
index 123925f3822bcc734690d106007935eee848f1f1..3161bd1c35227c09e60d2e47ffbb1b7056295f87 100644
--- a/runtime/parsec/codelets/codelet_zsyrk.c
+++ b/runtime/parsec/codelets/codelet_zsyrk.c
@@ -65,7 +65,7 @@ void MORSE_TASK_zsyrk(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_zsyrk_parsec, "syrk",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zsyrk_parsec, "syrk",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &n, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c
index d0bf4b4f173ed918daf08a29886d791349185270..0fac3cddcfdd519ad5ace13b01536692d802bbc7 100644
--- a/runtime/parsec/codelets/codelet_zsyssq.c
+++ b/runtime/parsec/codelets/codelet_zsyssq.c
@@ -52,7 +52,7 @@ void MORSE_TASK_zsyssq( 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_zsyssq_parsec, "syssq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zsyssq_parsec, "syssq",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INPUT | REGION_FULL,
diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
index 17f1a26a34b8be53f1efd79f9043c80e74709811..4ab23fb22b203a8ec0d203ce5c5bf5c852c28bb9 100644
--- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
@@ -53,7 +53,7 @@ void MORSE_TASK_zsytrf_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_zsytrf_nopiv_parsec, "sytrf_nopiv",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zsytrf_nopiv_parsec, "sytrf_nopiv",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(int), &n, VALUE,
PASSED_BY_REF, RTBLKADDR( A, MORSE_Complex64_t, Am, An ), INOUT | REGION_FULL,
diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c
index 4503ccff46b7a7bff67e8ac4f1fc86febb58c23e..f3b65ca9e2b1d381a4acf7eae6106bff201eb45c 100644
--- a/runtime/parsec/codelets/codelet_ztile_zero.c
+++ b/runtime/parsec/codelets/codelet_ztile_zero.c
@@ -55,7 +55,7 @@ void MORSE_TASK_ztile_zero(const 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_ztile_zero_parsec, "tile zero",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztile_zero_parsec, "tile zero",
sizeof(int), &X1, VALUE,
sizeof(int), &X2, VALUE,
sizeof(int), &Y1, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c
index 93634fc90e15bfcfc4fe88165a8ab3690931b4aa..7ab8db5c785659f698ce1e015f946df128009219 100644
--- a/runtime/parsec/codelets/codelet_ztradd.c
+++ b/runtime/parsec/codelets/codelet_ztradd.c
@@ -127,7 +127,7 @@ void MORSE_TASK_ztradd(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_ztradd_parsec, "tradd",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c
index 31990e484fbcc4164a00b62c725f14313c5dbbc1..4e3d74c2bee05e91b937def002de3a330bb9df1d 100644
--- a/runtime/parsec/codelets/codelet_ztrasm.c
+++ b/runtime/parsec/codelets/codelet_ztrasm.c
@@ -57,7 +57,7 @@ void MORSE_TASK_ztrasm(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_ztrasm_parsec, "trasm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztrasm_parsec, "trasm",
sizeof(MORSE_enum), &storev, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &diag, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c
index 4061d0e5919eb38ba7171bbedd30c333a6fc7541..436ad1ce947c12573da063d43376a5b4723b8550 100644
--- a/runtime/parsec/codelets/codelet_ztrmm.c
+++ b/runtime/parsec/codelets/codelet_ztrmm.c
@@ -69,7 +69,7 @@ void MORSE_TASK_ztrmm(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_ztrmm_parsec, "trmm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztrmm_parsec, "trmm",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &transA, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c
index d970d10658a5a32cdceb8057d42ef70cd0c9f98e..835714813969688a14be10dfcba8b50213b8dbc2 100644
--- a/runtime/parsec/codelets/codelet_ztrsm.c
+++ b/runtime/parsec/codelets/codelet_ztrsm.c
@@ -60,7 +60,7 @@ void MORSE_TASK_ztrsm(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_ztrsm_parsec, "Trsm",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztrsm_parsec, "Trsm",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &transA, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c
index ee721b67421585d5f768eee3cca49627781b9b0a..b1917044bd8fdd3eca8ad5837c329fa99a75c9b1 100644
--- a/runtime/parsec/codelets/codelet_ztrssq.c
+++ b/runtime/parsec/codelets/codelet_ztrssq.c
@@ -57,7 +57,7 @@ void MORSE_TASK_ztrssq( 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_ztrssq_parsec, "trssq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztrssq_parsec, "trssq",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &diag, VALUE,
sizeof(int), &m, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c
index 0fdc442d2f8d20f53c2dbdf0ffdb14f7379bbb7c..c1a424cc3dadb9fc6c37d22fc2b4c1c65d648537 100644
--- a/runtime/parsec/codelets/codelet_ztrtri.c
+++ b/runtime/parsec/codelets/codelet_ztrtri.c
@@ -56,7 +56,7 @@ void MORSE_TASK_ztrtri(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_ztrtri_parsec, "trtri",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztrtri_parsec, "trtri",
sizeof(MORSE_enum), &uplo, VALUE,
sizeof(MORSE_enum), &diag, VALUE,
sizeof(int), &n, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c
index bea32cbaf9edf3718b1d92f922b7631f3b0651f4..3d8ae072334de6135e033c6416e688aa80073bb7 100644
--- a/runtime/parsec/codelets/codelet_ztslqt.c
+++ b/runtime/parsec/codelets/codelet_ztslqt.c
@@ -66,7 +66,7 @@ void MORSE_TASK_ztslqt(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_ztslqt_parsec, "tslqt",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztslqt_parsec, "tslqt",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c
index 85de91aa0d1e2d6e23c9a519c26ed239b871ddf0..000442c2ab80720fad0599ba49ffcd675bf2ea5a 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq.c
@@ -86,7 +86,7 @@ void MORSE_TASK_ztsmlq(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_ztsmlq_parsec, "tsmlq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztsmlq_parsec, "tsmlq",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m1, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
index ff3d2ce6f6547325421306514b85427fbaee44fb..b25f919c704c53e5454f57baf4d0b0abd5ac1f11 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
@@ -25,9 +25,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_ztsmlq_hetra1_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
@@ -70,10 +70,10 @@ CORE_ztsmlq_hetra1_parsec(dague_execution_unit_t *context,
UNPACK_SCRATCH, &WORK,
UNPACK_VALUE, &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 MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options,
@@ -85,8 +85,9 @@ void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options,
const MORSE_desc_t *T, int Tm, int Tn, int ldt)
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
+ int ldwork = side == MorseLeft ? ib : nb;
- insert_task_generic_fptr(
+ dague_insert_task(
DAGUE_dtd_handle, CORE_ztsmlq_hetra1_parsec, "tsmlq_hetra1",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c
index 4f3e4f6ae53ad9aa4ebfdc9de4e81a86c76c2d3d..0f8f3c5d0f492c365ddf759e4cc46dd5ff4f3231 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr.c
@@ -85,7 +85,7 @@ void MORSE_TASK_ztsmqr(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_ztsmqr_parsec, "tsmqr",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztsmqr_parsec, "tsmqr",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m1, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
index ce428c0f0e93cfcda82693c2b392a201a9127038..7c022007dcee9cc495940ef56c74cda7f3f1a0e5 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
@@ -25,9 +25,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_ztsmqr_hetra1_parsec(dague_execution_unit_t *context,
dague_execution_context_t *this_task)
{
@@ -70,10 +70,10 @@ CORE_ztsmqr_hetra1_parsec(dague_execution_unit_t *context,
UNPACK_SCRATCH, &WORK,
UNPACK_VALUE, &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 MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options,
@@ -85,8 +85,9 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options,
const MORSE_desc_t *T, int Tm, int Tn, int ldt)
{
dague_dtd_handle_t* DAGUE_dtd_handle = (dague_dtd_handle_t *)(options->sequence->schedopt);
+ int ldwork = side == MorseLeft ? ib : nb;
- insert_task_generic_fptr(
+ dague_insert_task(
DAGUE_dtd_handle, CORE_ztsmqr_hetra1_parsec, "tsmqr_hetra1",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c
index 9729db91c97556bc366b5e280f2b65e21960c47b..e209718addba449101ba427019cad9960395d0f6 100644
--- a/runtime/parsec/codelets/codelet_ztsqrt.c
+++ b/runtime/parsec/codelets/codelet_ztsqrt.c
@@ -66,7 +66,7 @@ void MORSE_TASK_ztsqrt(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_ztsqrt_parsec, "tsqrt",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztsqrt_parsec, "tsqrt",
sizeof(MORSE_enum), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c
index 2e4dcccd0ddd503a7c19cda7850ec7f499a8b6d7..9f1e6c1590f74fb8ea523058e0f3fe2df21f4d94 100644
--- a/runtime/parsec/codelets/codelet_ztstrf.c
+++ b/runtime/parsec/codelets/codelet_ztstrf.c
@@ -77,7 +77,7 @@ void MORSE_TASK_ztstrf(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_ztstrf_parsec, "tstrf",
+ dague_insert_task(DAGUE_dtd_handle, CORE_ztstrf_parsec, "tstrf",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c
index bc44ec18c9f6e90e8324605e7d87852ce97b4be1..97e02753f15f3fa483cf59071d04b6c798dabd1f 100644
--- a/runtime/parsec/codelets/codelet_zttlqt.c
+++ b/runtime/parsec/codelets/codelet_zttlqt.c
@@ -66,7 +66,7 @@ void MORSE_TASK_zttlqt(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_zttlqt_parsec, "ttlqt",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zttlqt_parsec, "ttlqt",
sizeof(int), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c
index 140891b18d60360cf63f758a258a6cb75221c933..8a8d03545cbcda6bf3f20596fd15b1f09c700110 100644
--- a/runtime/parsec/codelets/codelet_zttmlq.c
+++ b/runtime/parsec/codelets/codelet_zttmlq.c
@@ -83,7 +83,7 @@ void MORSE_TASK_zttmlq(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_zttmlq_parsec, "ttmlq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zttmlq_parsec, "ttmlq",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m1, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c
index 8de4e5ca33e946d4c20b449957fbe3d0a0200b7d..75863f9a1b74ec8b186cb911974730f089396069 100644
--- a/runtime/parsec/codelets/codelet_zttmqr.c
+++ b/runtime/parsec/codelets/codelet_zttmqr.c
@@ -86,7 +86,7 @@ void MORSE_TASK_zttmqr(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_zttmqr_parsec, "ttmqr",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zttmqr_parsec, "ttmqr",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m1, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c
index ef2dd5c674eb8a06c45ff0e9fbe216fe21c00479..5b831bf193fad7d320c0c764af5c3c247b75f718 100644
--- a/runtime/parsec/codelets/codelet_zttqrt.c
+++ b/runtime/parsec/codelets/codelet_zttqrt.c
@@ -66,7 +66,7 @@ void MORSE_TASK_zttqrt(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_zttqrt_parsec, "ttqrt",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zttqrt_parsec, "ttqrt",
sizeof(MORSE_enum), &m, VALUE,
sizeof(int), &n, VALUE,
sizeof(int), &ib, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c
index a123385136df4cab0c888a92d71103b43b9cd719..b30ccbdbb0d1a89fce509c7c50a69f3a65e4368f 100644
--- a/runtime/parsec/codelets/codelet_zunmlq.c
+++ b/runtime/parsec/codelets/codelet_zunmlq.c
@@ -74,7 +74,7 @@ void MORSE_TASK_zunmlq(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_zunmlq_parsec, "unmlq",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zunmlq_parsec, "unmlq",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m, VALUE,
diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c
index 9bac6d0e72cbb796320e17fcac2ad3b71ac04108..5c08e10fd32d200758f42576be1b5cc391b995dc 100644
--- a/runtime/parsec/codelets/codelet_zunmqr.c
+++ b/runtime/parsec/codelets/codelet_zunmqr.c
@@ -73,7 +73,7 @@ void MORSE_TASK_zunmqr(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_zunmqr_parsec, "unmqr",
+ dague_insert_task(DAGUE_dtd_handle, CORE_zunmqr_parsec, "unmqr",
sizeof(MORSE_enum), &side, VALUE,
sizeof(MORSE_enum), &trans, VALUE,
sizeof(int), &m, VALUE,