Browse Source

Fix getting dynamic handles on mic

Samuel Thibault 9 years ago
parent
commit
282634e05f
2 changed files with 2 additions and 1 deletions
  1. 1 0
      include/starpu_task.h
  2. 1 1
      src/drivers/mp_common/source_common.c

+ 1 - 0
include/starpu_task.h

@@ -241,6 +241,7 @@ struct starpu_task
 #define STARPU_TASK_GET_NBUFFERS(task) ((unsigned)((task)->cl->nbuffers == STARPU_VARIABLE_NBUFFERS ? ((task)->nbuffers) : ((task)->cl->nbuffers)))
 
 #define STARPU_TASK_GET_HANDLE(task, i) (((task)->dyn_handles) ? (task)->dyn_handles[i] : (task)->handles[i])
+#define STARPU_TASK_GET_HANDLES(task) (((task)->dyn_handles) ? (task)->dyn_handles : (task)->handles)
 #define STARPU_TASK_SET_HANDLE(task, handle, i) do { if ((task)->dyn_handles) (task)->dyn_handles[i] = handle; else (task)->handles[i] = handle; } while(0)
 
 #define STARPU_CODELET_GET_MODE(codelet, i) (((codelet)->dyn_modes) ? (codelet)->dyn_modes[i] : (codelet)->modes[i])

+ 1 - 1
src/drivers/mp_common/source_common.c

@@ -432,7 +432,7 @@ static int _starpu_src_common_execute(struct _starpu_job *j,
 
 	_starpu_src_common_execute_kernel(node, kernel, worker->subworkerid, task->cl->type,
 			(j->task_size > 1),
-			j->combined_workerid, task->handles,
+			j->combined_workerid, STARPU_TASK_GET_HANDLES(task),
 			task->interfaces, STARPU_TASK_GET_NBUFFERS(task),
 			task->cl_arg, task->cl_arg_size);