From 961aaec11620644f3e1054817cf277733ffff84c Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 4 Feb 2022 17:38:58 +0100
Subject: [PATCH] starpu/codelets: use the options workerid field
---
runtime/starpu/codelets/codelet_dlag2z.c | 2 +-
runtime/starpu/codelets/codelet_dzasum.c | 2 +-
runtime/starpu/codelets/codelet_map.c | 2 +-
runtime/starpu/codelets/codelet_zaxpy.c | 2 +-
runtime/starpu/codelets/codelet_zbuild.c | 2 +-
runtime/starpu/codelets/codelet_zcesca.c | 2 +-
runtime/starpu/codelets/codelet_zgeadd.c | 2 +-
runtime/starpu/codelets/codelet_zgelqt.c | 2 +-
runtime/starpu/codelets/codelet_zgemm.c | 2 +-
runtime/starpu/codelets/codelet_zgemv.c | 2 +-
runtime/starpu/codelets/codelet_zgeqrt.c | 2 +-
runtime/starpu/codelets/codelet_zgessm.c | 2 +-
runtime/starpu/codelets/codelet_zgessq.c | 2 +-
runtime/starpu/codelets/codelet_zgesum.c | 2 +-
runtime/starpu/codelets/codelet_zgetrf.c | 2 +-
runtime/starpu/codelets/codelet_zgetrf_incpiv.c | 2 +-
runtime/starpu/codelets/codelet_zgetrf_nopiv.c | 2 +-
runtime/starpu/codelets/codelet_zgram.c | 2 +-
runtime/starpu/codelets/codelet_zhe2ge.c | 2 +-
runtime/starpu/codelets/codelet_zhemm.c | 2 +-
runtime/starpu/codelets/codelet_zher2k.c | 2 +-
runtime/starpu/codelets/codelet_zherfb.c | 2 +-
runtime/starpu/codelets/codelet_zherk.c | 2 +-
runtime/starpu/codelets/codelet_zlacpy.c | 2 +-
runtime/starpu/codelets/codelet_zlag2c.c | 4 ++--
runtime/starpu/codelets/codelet_zlange.c | 4 ++--
runtime/starpu/codelets/codelet_zlanhe.c | 2 +-
runtime/starpu/codelets/codelet_zlansy.c | 2 +-
runtime/starpu/codelets/codelet_zlantr.c | 2 +-
runtime/starpu/codelets/codelet_zlascal.c | 2 +-
runtime/starpu/codelets/codelet_zlaset.c | 2 +-
runtime/starpu/codelets/codelet_zlaset2.c | 2 +-
runtime/starpu/codelets/codelet_zlatro.c | 2 +-
runtime/starpu/codelets/codelet_zlauum.c | 2 +-
runtime/starpu/codelets/codelet_zplghe.c | 2 +-
runtime/starpu/codelets/codelet_zplgsy.c | 2 +-
runtime/starpu/codelets/codelet_zplrnt.c | 2 +-
runtime/starpu/codelets/codelet_zplssq.c | 4 ++--
runtime/starpu/codelets/codelet_zpotrf.c | 2 +-
runtime/starpu/codelets/codelet_zssssm.c | 2 +-
runtime/starpu/codelets/codelet_zsymm.c | 2 +-
runtime/starpu/codelets/codelet_zsyr2k.c | 2 +-
runtime/starpu/codelets/codelet_zsyrk.c | 2 +-
runtime/starpu/codelets/codelet_zsyssq.c | 2 +-
runtime/starpu/codelets/codelet_zsytrf_nopiv.c | 2 +-
runtime/starpu/codelets/codelet_ztplqt.c | 2 +-
runtime/starpu/codelets/codelet_ztpmlqt.c | 2 +-
runtime/starpu/codelets/codelet_ztpmqrt.c | 2 +-
runtime/starpu/codelets/codelet_ztpqrt.c | 2 +-
runtime/starpu/codelets/codelet_ztradd.c | 2 +-
runtime/starpu/codelets/codelet_ztrasm.c | 2 +-
runtime/starpu/codelets/codelet_ztrmm.c | 2 +-
runtime/starpu/codelets/codelet_ztrsm.c | 2 +-
runtime/starpu/codelets/codelet_ztrssq.c | 2 +-
runtime/starpu/codelets/codelet_ztrtri.c | 2 +-
runtime/starpu/codelets/codelet_ztsmlq_hetra1.c | 2 +-
runtime/starpu/codelets/codelet_ztsmqr_hetra1.c | 2 +-
runtime/starpu/codelets/codelet_ztstrf.c | 2 +-
runtime/starpu/codelets/codelet_zunmlq.c | 2 +-
runtime/starpu/codelets/codelet_zunmqr.c | 2 +-
60 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/runtime/starpu/codelets/codelet_dlag2z.c b/runtime/starpu/codelets/codelet_dlag2z.c
index 6d53318ae..50bb09452 100644
--- a/runtime/starpu/codelets/codelet_dlag2z.c
+++ b/runtime/starpu/codelets/codelet_dlag2z.c
@@ -55,7 +55,7 @@ void INSERT_TASK_dlag2z( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_dlag2z;
void (*callback)(void*) = options->profiling ? cl_dlag2z_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_dzasum.c b/runtime/starpu/codelets/codelet_dzasum.c
index 3bf8d3d87..1ffee91e4 100644
--- a/runtime/starpu/codelets/codelet_dzasum.c
+++ b/runtime/starpu/codelets/codelet_dzasum.c
@@ -56,7 +56,7 @@ void INSERT_TASK_dzasum( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_dzasum;
void (*callback)(void*) = options->profiling ? cl_dzasum_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_map.c b/runtime/starpu/codelets/codelet_map.c
index 55c287680..0421c1c86 100644
--- a/runtime/starpu/codelets/codelet_map.c
+++ b/runtime/starpu/codelets/codelet_map.c
@@ -50,7 +50,7 @@ void INSERT_TASK_map( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_map;
void (*callback)(void*) = options->profiling ? cl_map_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index b57eda1da..7c15ae307 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -52,7 +52,7 @@ void INSERT_TASK_zaxpy( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zaxpy;
void (*callback)(void*) = options->profiling ? cl_zaxpy_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
if ( alpha == 0. ) {
return;
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index 305e6019d..592cbf7e5 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -64,7 +64,7 @@ CODELETS_CPU(zbuild, cl_zbuild_cpu_func)
struct starpu_codelet *codelet = &cl_zbuild;
void (*callback)(void*) = options->profiling ? cl_zbuild_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int row_min, row_max, col_min, col_max;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zcesca.c b/runtime/starpu/codelets/codelet_zcesca.c
index 1cf87fe7e..ae7345323 100644
--- a/runtime/starpu/codelets/codelet_zcesca.c
+++ b/runtime/starpu/codelets/codelet_zcesca.c
@@ -71,7 +71,7 @@ void INSERT_TASK_zcesca( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zcesca;
void (*callback)(void*) = options->profiling ? cl_zcesca_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int exec = 0;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 30f4d519e..94f197d96 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -99,7 +99,7 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgeadd;
void (*callback)(void*) = options->profiling ? cl_zgeadd_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessB = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 86ad28b6f..07d5134b7 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -69,7 +69,7 @@ void INSERT_TASK_zgelqt(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgelqt;
void (*callback)(void*) = options->profiling ? cl_zgelqt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_starpu_ws_t *h_work = (CHAMELEON_starpu_ws_t*)(options->ws_host);
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index cac587414..99b3b6d4a 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -148,7 +148,7 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zgemm_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Reduce the C access if needed */
accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
diff --git a/runtime/starpu/codelets/codelet_zgemv.c b/runtime/starpu/codelets/codelet_zgemv.c
index d2220865f..8c85f66bb 100644
--- a/runtime/starpu/codelets/codelet_zgemv.c
+++ b/runtime/starpu/codelets/codelet_zgemv.c
@@ -102,7 +102,7 @@ void INSERT_TASK_zgemv( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgemv;
void (*callback)(void*) = options->profiling ? cl_zgemv_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessY = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index 4f7034bc3..8396f970e 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -70,7 +70,7 @@ void INSERT_TASK_zgeqrt(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgeqrt;
void (*callback)(void*) = options->profiling ? cl_zgeqrt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_starpu_ws_t *h_work = (CHAMELEON_starpu_ws_t*)(options->ws_host);
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index 5dad32c9a..490db9634 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -64,7 +64,7 @@ void INSERT_TASK_zgessm( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgessm;
void (*callback)(void*) = options->profiling ? cl_zgessm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(L, Lm, Ln);
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index 08d43b41b..dedbe5daa 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -55,7 +55,7 @@ void INSERT_TASK_zgessq( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgessq;
void (*callback)(void*) = options->profiling ? cl_zgessq_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zgesum.c b/runtime/starpu/codelets/codelet_zgesum.c
index c851c4ef5..3f04e3a7d 100644
--- a/runtime/starpu/codelets/codelet_zgesum.c
+++ b/runtime/starpu/codelets/codelet_zgesum.c
@@ -52,7 +52,7 @@ void INSERT_TASK_zgesum( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgesum;
void (*callback)(void*) = options->profiling ? cl_zgesum_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int exec = 0;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 04c8d8a8e..483542808 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -66,7 +66,7 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgetrf;
void (*callback)(void*) = options->profiling ? cl_zgetrf_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 9983f5ba3..feab43fd7 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -71,7 +71,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgetrf_incpiv;
void (*callback)(void*) = options->profiling ? cl_zgetrf_incpiv_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_starpu_ws_t *h_work = (CHAMELEON_starpu_ws_t*)(options->ws_host);
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index 74a60c356..e64963859 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -66,7 +66,7 @@ void INSERT_TASK_zgetrf_nopiv(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgetrf_nopiv;
void (*callback)(void*) = options->profiling ? cl_zgetrf_nopiv_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zgram.c b/runtime/starpu/codelets/codelet_zgram.c
index 55f36194c..6afa0186c 100644
--- a/runtime/starpu/codelets/codelet_zgram.c
+++ b/runtime/starpu/codelets/codelet_zgram.c
@@ -56,7 +56,7 @@ void INSERT_TASK_zgram( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zgram;
void (*callback)(void*) = options->profiling ? cl_zgram_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(Di, Dim, Din);
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index 9c918d9ef..a861161d6 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/runtime/starpu/codelets/codelet_zhe2ge.c
@@ -55,7 +55,7 @@ void INSERT_TASK_zhe2ge( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zhe2ge;
void (*callback)(void*) = options->profiling ? cl_zhe2ge_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 779bb9823..f772530ce 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -115,7 +115,7 @@ void INSERT_TASK_zhemm(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zhemm;
void (*callback)(void*) = options->profiling ? cl_zhemm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index a69868e1d..9654ff80e 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -112,7 +112,7 @@ INSERT_TASK_zher2k( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zher2k;
void (*callback)(void*) = options->profiling ? cl_zher2k_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index 9f62c783c..391719c02 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/runtime/starpu/codelets/codelet_zherfb.c
@@ -97,7 +97,7 @@ void INSERT_TASK_zherfb(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zherfb;
void (*callback)(void*) = options->profiling ? cl_zherfb_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index c4b6eedd8..129ce0c5e 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -130,7 +130,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zherk_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Reduce the C access if needed */
accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index b16905509..883fcb2b3 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -97,7 +97,7 @@ void INSERT_TASK_zlacpyx( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zlacpy_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index 27358b138..2814f30f7 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -62,7 +62,7 @@ void INSERT_TASK_zlag2c(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlag2c;
void (*callback)(void*) = options->profiling ? cl_zlag2c_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
@@ -114,7 +114,7 @@ void INSERT_TASK_clag2z(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_clag2z;
void (*callback)(void*) = options->profiling ? cl_clag2z_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R( A, Am, An );
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index cc2608b47..3873cfc28 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -60,7 +60,7 @@ void INSERT_TASK_zlange( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlange;
void (*callback)(void*) = options->profiling ? cl_zlange_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
@@ -116,7 +116,7 @@ void INSERT_TASK_zlange_max(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlange_max;
void (*callback)(void*) = options->profiling ? cl_zlange_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R( A, Am, An );
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 28820e6d2..3743aa6ab 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -59,7 +59,7 @@ void INSERT_TASK_zlanhe(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlanhe;
void (*callback)(void*) = options->profiling ? cl_zlange_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index f5a40708c..d11013d1b 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -60,7 +60,7 @@ void INSERT_TASK_zlansy( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlansy;
void (*callback)(void*) = options->profiling ? cl_zlange_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index b45ca0d12..6b37410dd 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -59,7 +59,7 @@ void INSERT_TASK_zlantr( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlantr;
void (*callback)(void*) = options->profiling ? cl_zlange_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 0dcaa52d5..a8fc1435d 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -91,7 +91,7 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zlascal_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 95805c014..17861bb5b 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -86,7 +86,7 @@ void INSERT_TASK_zlaset( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zlaset_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index c80973145..d826e2be4 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -56,7 +56,7 @@ void INSERT_TASK_zlaset2(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlaset2;
void (*callback)(void*) = options->profiling ? cl_zlaset2_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_W(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index 6ec3e0551..fedce51d8 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -66,7 +66,7 @@ void INSERT_TASK_zlatro( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zlatro;
void (*callback)(void*) = NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 31f801264..c36570882 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -80,7 +80,7 @@ void INSERT_TASK_zlauum( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zlauum_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
#if defined(CHAMELEON_KERNELS_TRACE)
{
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 68bf93fc9..ce5b9c756 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -90,7 +90,7 @@ void INSERT_TASK_zplghe( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zplghe_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 2d342bac3..4f9a5280e 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -90,7 +90,7 @@ void INSERT_TASK_zplgsy( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zplgsy_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 36191f43e..00b2fa3e0 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -89,7 +89,7 @@ void INSERT_TASK_zplrnt( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zplrnt_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Insert the task */
rt_starpu_insert_task(
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 187ceb3e6..ae03dea79 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -59,7 +59,7 @@ void INSERT_TASK_zplssq( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zplssq;
void (*callback)(void*) = options->profiling ? cl_zplssq_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R( IN, INm, INn );
@@ -110,7 +110,7 @@ void INSERT_TASK_zplssq2( const RUNTIME_option_t *options, int N,
struct starpu_codelet *codelet = &cl_zplssq2;
void (*callback)(void*) = options->profiling ? cl_zplssq2_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW( RESULT, RESULTm, RESULTn );
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index b0f42d459..d755b9e77 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -96,7 +96,7 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zpotrf_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
#if defined(CHAMELEON_KERNELS_TRACE)
{
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index abad2f5af..2d6c94891 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -70,7 +70,7 @@ void INSERT_TASK_zssssm( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zssssm;
void (*callback)(void*) = options->profiling ? cl_zssssm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A1, A1m, A1n);
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 5391f0da8..f712b7b10 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -115,7 +115,7 @@ void INSERT_TASK_zsymm(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zsymm;
void (*callback)(void*) = options->profiling ? cl_zsymm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index f26bfd8f4..d5861ed4d 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -111,7 +111,7 @@ void INSERT_TASK_zsyr2k(const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zsyr2k;
void (*callback)(void*) = options->profiling ? cl_zsyr2k_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 49a16f71b..acf0ae854 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -130,7 +130,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
callback = options->profiling ? cl_zsyrk_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Reduce the C access if needed */
accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 0d1fe24bb..8261a35d6 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -53,7 +53,7 @@ void INSERT_TASK_zsyssq( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zsyssq;
void (*callback)(void*) = options->profiling ? cl_zgessq_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index c8f9eb479..422cb39a3 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -56,7 +56,7 @@ void INSERT_TASK_zsytrf_nopiv( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zsytrf_nopiv;
void (*callback)(void*) = options->profiling ? cl_zsytrf_nopiv_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_ztplqt.c b/runtime/starpu/codelets/codelet_ztplqt.c
index 184857254..99cc57589 100644
--- a/runtime/starpu/codelets/codelet_ztplqt.c
+++ b/runtime/starpu/codelets/codelet_ztplqt.c
@@ -60,7 +60,7 @@ void INSERT_TASK_ztplqt( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztplqt;
void (*callback)(void*) = options->profiling ? cl_ztplqt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_ztpmlqt.c b/runtime/starpu/codelets/codelet_ztpmlqt.c
index 52a53739b..62ec9d335 100644
--- a/runtime/starpu/codelets/codelet_ztpmlqt.c
+++ b/runtime/starpu/codelets/codelet_ztpmlqt.c
@@ -106,7 +106,7 @@ void INSERT_TASK_ztpmlqt( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztpmlqt;
void (*callback)(void*) = options->profiling ? cl_ztpmlqt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(V, Vm, Vn);
diff --git a/runtime/starpu/codelets/codelet_ztpmqrt.c b/runtime/starpu/codelets/codelet_ztpmqrt.c
index 78eb481df..e234616c6 100644
--- a/runtime/starpu/codelets/codelet_ztpmqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpmqrt.c
@@ -106,7 +106,7 @@ void INSERT_TASK_ztpmqrt( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztpmqrt;
void (*callback)(void*) = options->profiling ? cl_ztpmqrt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(V, Vm, Vn);
diff --git a/runtime/starpu/codelets/codelet_ztpqrt.c b/runtime/starpu/codelets/codelet_ztpqrt.c
index 3baed4ce7..fb6b5cd20 100644
--- a/runtime/starpu/codelets/codelet_ztpqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpqrt.c
@@ -61,7 +61,7 @@ void INSERT_TASK_ztpqrt( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztpqrt;
void (*callback)(void*) = options->profiling ? cl_ztpqrt_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_RW(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index d59f03a5f..b0aaed724 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -96,7 +96,7 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
callback = options->profiling ? cl_ztradd_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
/* Reduce the B access if needed */
accessB = ( beta == 0. ) ? STARPU_W : STARPU_RW;
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index 5eb7835b2..5fcb0b9bb 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -56,7 +56,7 @@ void INSERT_TASK_ztrasm( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztrasm;
void (*callback)(void*) = options->profiling ? cl_ztrasm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 887ff71d3..73da968e1 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -126,7 +126,7 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
callback = options->profiling ? cl_ztrmm_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
#if defined(CHAMELEON_KERNELS_TRACE)
{
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 2aa43232e..01a957453 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -127,7 +127,7 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
callback = options->profiling ? cl_ztrsm_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
#if defined(CHAMELEON_KERNELS_TRACE)
{
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 07f433a74..4c6118f8c 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -55,7 +55,7 @@ void INSERT_TASK_ztrssq( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztrssq;
void (*callback)(void*) = options->profiling ? cl_ztrasm_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 9605d034e..3f09383b8 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -94,7 +94,7 @@ void INSERT_TASK_ztrtri( const RUNTIME_option_t *options,
callback = options->profiling ? cl_ztrtri_callback : NULL;
/* Fix the worker id */
- workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
#if defined(CHAMELEON_KERNELS_TRACE)
{
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index 882b41c84..74a8f970b 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -76,7 +76,7 @@ void INSERT_TASK_ztsmlq_hetra1( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztsmlq_hetra1;
void (*callback)(void*) = options->profiling ? cl_ztsmlq_hetra1_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int ldWORK = side == ChamLeft ? ib : nb;
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index 586b59e90..7971b3ffb 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -76,7 +76,7 @@ void INSERT_TASK_ztsmqr_hetra1( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztsmqr_hetra1;
void (*callback)(void*) = options->profiling ? cl_ztsmqr_hetra1_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
int ldWORK = side == ChamLeft ? ib : nb;
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 95f47124f..51f357a43 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -83,7 +83,7 @@ void INSERT_TASK_ztstrf( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_ztstrf;
void (*callback)(void*) = options->profiling ? cl_ztstrf_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_starpu_ws_t *d_work = (CHAMELEON_starpu_ws_t*)(options->ws_host);
CHAMELEON_BEGIN_ACCESS_DECLARATION;
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index 18a3b6612..2e8b861e5 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -109,7 +109,7 @@ void INSERT_TASK_zunmlq( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zunmlq;
void (*callback)(void*) = options->profiling ? cl_zunmlq_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index f7f29d45d..8b57dc09c 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -108,7 +108,7 @@ void INSERT_TASK_zunmqr( const RUNTIME_option_t *options,
struct starpu_codelet *codelet = &cl_zunmqr;
void (*callback)(void*) = options->profiling ? cl_zunmqr_callback : NULL;
starpu_option_request_t* schedopt = (starpu_option_request_t *)(options->request->schedopt);
- int workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
+ int workerid = (schedopt == NULL) ? options->workerid : schedopt->workerid;
CHAMELEON_BEGIN_ACCESS_DECLARATION;
CHAMELEON_ACCESS_R(A, Am, An);
--
GitLab