options: add the workerid and node fields to the options to defibetter map the tasks

include/chameleon/runtime_struct.h

@@ -83,6 +83,7 @@ typedef struct runtime_option_s {
     int                 profiling; /**< Enable/Disable the profiling of the submitted tasks      */
     int                 parallel;  /**< Enable/Disable the parallel version of submitted tasks   */
     int                 priority;  /**< Define the submitted task priority                       */
+    int                 workerid;  /**< Define the prefered worker id to perform the tasks       */
     size_t              ws_wsize;  /**< Define the worker workspace size                         */
     size_t              ws_hsize;  /**< Define the host workspace size for hybrid CPU/GPU kernel */
     void               *ws_worker; /**< Pointer to the worker workspace (structure)              */

runtime/openmp/control/runtime_options.c

@@ -21,18 +21,19 @@
  */
 #include "chameleon_openmp.h"
 
-void RUNTIME_options_init( RUNTIME_option_t *option, CHAM_context_t *chamctxt,
+void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *chamctxt,
                            RUNTIME_sequence_t *sequence, RUNTIME_request_t *request )
 {
-    option->sequence  = sequence;
-    option->request   = request;
-    option->profiling = CHAMELEON_PROFILING == CHAMELEON_TRUE;
-    option->parallel  = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
-    option->priority  = RUNTIME_PRIORITY_MIN;
-    option->ws_wsize  = 0;
-    option->ws_hsize  = 0;
-    option->ws_worker = NULL;
-    option->ws_host   = NULL;
+    options->sequence  = sequence;
+    options->request   = request;
+    options->profiling = CHAMELEON_PROFILING == CHAMELEON_TRUE;
+    options->parallel  = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
+    options->priority  = RUNTIME_PRIORITY_MIN;
+    options->workerid  = -1;
+    options->ws_wsize  = 0;
+    options->ws_hsize  = 0;
+    options->ws_worker = NULL;
+    options->ws_host   = NULL;
     return;
 }
 

runtime/parsec/control/runtime_options.c

@@ -27,6 +27,7 @@ void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *chamctxt,
     options->profiling  = CHAMELEON_PROFILING == CHAMELEON_TRUE;
     options->parallel   = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
     options->priority   = RUNTIME_PRIORITY_MIN;
+    options->workerid  = -1;
     options->ws_wsize   = 0;
     options->ws_hsize   = 0;
     options->ws_worker  = NULL;

runtime/quark/control/runtime_options.c

@@ -39,6 +39,7 @@ void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *chamctxt,
     options->profiling  = CHAMELEON_PROFILING == CHAMELEON_TRUE;
     options->parallel   = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
     options->priority   = RUNTIME_PRIORITY_MIN;
+    options->workerid   = -1;
 
     options->ws_wsize   = 0;
     options->ws_hsize   = 0;

runtime/starpu/control/runtime_options.c

@@ -21,18 +21,20 @@
  */
 #include "chameleon_starpu.h"
 
-void RUNTIME_options_init( RUNTIME_option_t *option, CHAM_context_t *chamctxt,
+void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *chamctxt,
                            RUNTIME_sequence_t *sequence, RUNTIME_request_t *request )
 {
-    option->sequence   = sequence;
-    option->request    = request;
-    option->profiling  = CHAMELEON_PROFILING == CHAMELEON_TRUE;
-    option->parallel   = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
-    option->priority   = RUNTIME_PRIORITY_MIN;
-    option->ws_wsize   = 0;
-    option->ws_hsize   = 0;
-    option->ws_worker  = NULL;
-    option->ws_host    = NULL;
+    starpu_option_request_t* schedopt = (starpu_option_request_t *)(request->schedopt);
+    options->sequence  = sequence;
+    options->request   = request;
+    options->profiling = CHAMELEON_PROFILING == CHAMELEON_TRUE;
+    options->parallel  = CHAMELEON_PARALLEL == CHAMELEON_TRUE;
+    options->priority  = RUNTIME_PRIORITY_MIN;
+    options->workerid  = (schedopt == NULL) ? -1 : schedopt->workerid;
+    options->ws_wsize  = 0;
+    options->ws_hsize  = 0;
+    options->ws_worker = NULL;
+    options->ws_host   = NULL;
     return;
 }