Browse Source

Partially revert commit 1750: starpu_tag_declare_deps _is_ a public function.

Cédric Augonnet 15 years ago
parent
commit
0984a29d6c

+ 9 - 9
doc/starpu.texi

@@ -830,7 +830,7 @@ This function blocks until all the tasks that were submitted are terminated.
 
 
 @menu
 @menu
 * starpu_tag_t::                   Task identifier
 * starpu_tag_t::                   Task identifier
-* _starpu_tag_declare_deps::        Declare the Dependencies of a Tag
+* starpu_tag_declare_deps::        Declare the Dependencies of a Tag
 * starpu_tag_declare_deps_array::  Declare the Dependencies of a Tag
 * starpu_tag_declare_deps_array::  Declare the Dependencies of a Tag
 * starpu_tag_wait::                Block until a Tag is terminated
 * starpu_tag_wait::                Block until a Tag is terminated
 * starpu_tag_wait_array::          Block until a set of Tags is terminated
 * starpu_tag_wait_array::          Block until a set of Tags is terminated
@@ -848,13 +848,13 @@ dependencies between tasks by the means of those tags. To do so, fill the
 @code{tag_id} field of the @code{starpu_task} structure with a tag number (can
 @code{tag_id} field of the @code{starpu_task} structure with a tag number (can
 be arbitrary) and set the @code{use_tag} field to 1.
 be arbitrary) and set the @code{use_tag} field to 1.
 
 
-If @code{_starpu_tag_declare_deps} is called with that tag number, the task will
+If @code{starpu_tag_declare_deps} is called with that tag number, the task will
 not be started until the task which wears the declared dependency tags are
 not be started until the task which wears the declared dependency tags are
 complete.
 complete.
 @end table
 @end table
 
 
-@node _starpu_tag_declare_deps
-@subsection @code{_starpu_tag_declare_deps} -- Declare the Dependencies of a Tag
+@node starpu_tag_declare_deps
+@subsection @code{starpu_tag_declare_deps} -- Declare the Dependencies of a Tag
 @table @asis
 @table @asis
 @item @emph{Description}:
 @item @emph{Description}:
 Specify the dependencies of the task identified by tag @code{id}. The first
 Specify the dependencies of the task identified by tag @code{id}. The first
@@ -866,19 +866,19 @@ This function must be called before the associated task is submitted to StarPU
 with @code{starpu_submit_task}.
 with @code{starpu_submit_task}.
 
 
 @item @emph{Remark}
 @item @emph{Remark}
-Because of the variable arity of @code{_starpu_tag_declare_deps}, note that the
+Because of the variable arity of @code{starpu_tag_declare_deps}, note that the
 last arguments @emph{must} be of type @code{starpu_tag_t}: constant values
 last arguments @emph{must} be of type @code{starpu_tag_t}: constant values
 typically need to be explicitely casted. Using the
 typically need to be explicitely casted. Using the
 @code{starpu_tag_declare_deps_array} function avoids this hazard.
 @code{starpu_tag_declare_deps_array} function avoids this hazard.
 
 
 @item @emph{Prototype}:
 @item @emph{Prototype}:
-@code{void _starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);}
+@code{void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);}
 
 
 @item @emph{Example}:
 @item @emph{Example}:
 @example
 @example
 @c @cartouche
 @c @cartouche
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
-_starpu_tag_declare_deps((starpu_tag_t)0x1,
+starpu_tag_declare_deps((starpu_tag_t)0x1,
         2, (starpu_tag_t)0x32, (starpu_tag_t)0x52);
         2, (starpu_tag_t)0x32, (starpu_tag_t)0x52);
 
 
 @c @end cartouche
 @c @end cartouche
@@ -891,7 +891,7 @@ _starpu_tag_declare_deps((starpu_tag_t)0x1,
 @subsection @code{starpu_tag_declare_deps_array} -- Declare the Dependencies of a Tag
 @subsection @code{starpu_tag_declare_deps_array} -- Declare the Dependencies of a Tag
 @table @asis
 @table @asis
 @item @emph{Description}:
 @item @emph{Description}:
-This function is similar to @code{_starpu_tag_declare_deps}, except that its
+This function is similar to @code{starpu_tag_declare_deps}, except that its
 does not take a variable number of arguments but an array of tags of size
 does not take a variable number of arguments but an array of tags of size
 @code{ndeps}.
 @code{ndeps}.
 @item @emph{Prototype}:
 @item @emph{Prototype}:
@@ -901,7 +901,7 @@ does not take a variable number of arguments but an array of tags of size
 @c @cartouche
 @c @cartouche
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
 starpu_tag_t tag_array[2] = @{0x32, 0x52@};
 starpu_tag_t tag_array[2] = @{0x32, 0x52@};
-_starpu_tag_declare_deps((starpu_tag_t)0x1, 2, tag_array);
+starpu_tag_declare_deps((starpu_tag_t)0x1, 2, tag_array);
 
 
 @c @end cartouche
 @c @end cartouche
 @end example
 @end example

+ 5 - 5
examples/cholesky/dw_cholesky.c

@@ -64,7 +64,7 @@ static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -99,10 +99,10 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -141,10 +141,10 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG21(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG21(k, i), TAG21(k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG21(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG21(k, i), TAG21(k, j));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 5 - 5
examples/cholesky/dw_cholesky_grain.c

@@ -63,7 +63,7 @@ static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k,
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11_AUX(k, reclevel), 1, TAG22_AUX(k-1, k, k, reclevel));
+		starpu_tag_declare_deps(TAG11_AUX(k, reclevel), 1, TAG22_AUX(k-1, k, k, reclevel));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -98,10 +98,10 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21_AUX(k, j, reclevel), 2, TAG11_AUX(k, reclevel), TAG22_AUX(k-1, k, j, reclevel));
+		starpu_tag_declare_deps(TAG21_AUX(k, j, reclevel), 2, TAG11_AUX(k, reclevel), TAG22_AUX(k-1, k, j, reclevel));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21_AUX(k, j, reclevel), 1, TAG11_AUX(k, reclevel));
+		starpu_tag_declare_deps(TAG21_AUX(k, j, reclevel), 1, TAG11_AUX(k, reclevel));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -140,10 +140,10 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22_AUX(k, i, j, reclevel), 3, TAG22_AUX(k-1, i, j, reclevel), TAG21_AUX(k, i, reclevel), TAG21_AUX(k, j, reclevel));
+		starpu_tag_declare_deps(TAG22_AUX(k, i, j, reclevel), 3, TAG22_AUX(k-1, i, j, reclevel), TAG21_AUX(k, i, reclevel), TAG21_AUX(k, j, reclevel));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22_AUX(k, i, j, reclevel), 2, TAG21_AUX(k, i, reclevel), TAG21_AUX(k, j, reclevel));
+		starpu_tag_declare_deps(TAG22_AUX(k, i, j, reclevel), 2, TAG21_AUX(k, i, reclevel), TAG21_AUX(k, j, reclevel));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 5 - 5
examples/cholesky/dw_cholesky_no_stride.c

@@ -80,7 +80,7 @@ static struct starpu_task * create_task_11(unsigned k, unsigned nblocks, sem_t *
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 
 
 	/* the very last task must be notified */
 	/* the very last task must be notified */
@@ -128,10 +128,10 @@ static void create_task_21(unsigned k, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -177,10 +177,10 @@ static void create_task_22(unsigned k, unsigned i, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG21(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG21(k, i), TAG21(k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG21(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG21(k, i), TAG21(k, j));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 7 - 7
examples/heat/dw_factolu_grain.c

@@ -67,7 +67,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k,
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k, tag_prefix), 1, TAG22(k-1, k, k, tag_prefix));
+		starpu_tag_declare_deps(TAG11(k, tag_prefix), 1, TAG22(k-1, k, k, tag_prefix));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -103,10 +103,10 @@ static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG12(k, i, tag_prefix), 2, TAG11(k, tag_prefix), TAG22(k-1, i, k, tag_prefix));
+		starpu_tag_declare_deps(TAG12(k, i, tag_prefix), 2, TAG11(k, tag_prefix), TAG22(k-1, i, k, tag_prefix));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG12(k, i, tag_prefix), 1, TAG11(k, tag_prefix));
+		starpu_tag_declare_deps(TAG12(k, i, tag_prefix), 1, TAG11(k, tag_prefix));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -140,10 +140,10 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, j, tag_prefix), 2, TAG11(k, tag_prefix), TAG22(k-1, k, j, tag_prefix));
+		starpu_tag_declare_deps(TAG21(k, j, tag_prefix), 2, TAG11(k, tag_prefix), TAG22(k-1, k, j, tag_prefix));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, j, tag_prefix), 1, TAG11(k, tag_prefix));
+		starpu_tag_declare_deps(TAG21(k, j, tag_prefix), 1, TAG11(k, tag_prefix));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -181,10 +181,10 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j, tag_prefix), 3, TAG22(k-1, i, j, tag_prefix), TAG12(k, i, tag_prefix), TAG21(k, j, tag_prefix));
+		starpu_tag_declare_deps(TAG22(k, i, j, tag_prefix), 3, TAG22(k-1, i, j, tag_prefix), TAG12(k, i, tag_prefix), TAG21(k, j, tag_prefix));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j, tag_prefix), 2, TAG12(k, i, tag_prefix), TAG21(k, j, tag_prefix));
+		starpu_tag_declare_deps(TAG22(k, i, j, tag_prefix), 2, TAG12(k, i, tag_prefix), TAG21(k, j, tag_prefix));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 7 - 7
examples/heat/dw_factolu_tag.c

@@ -70,7 +70,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -106,10 +106,10 @@ static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG12(k, i), 2, TAG11(k), TAG22(k-1, i, k));
+		starpu_tag_declare_deps(TAG12(k, i), 2, TAG11(k), TAG22(k-1, i, k));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG12(k, i), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG12(k, i), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -143,10 +143,10 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG21(k, j), 2, TAG11(k), TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG21(k, j), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -184,10 +184,10 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, i), TAG21(k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, i), TAG21(k, j));
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, i), TAG21(k, j));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 7 - 7
examples/heat/dw_sparse_cg.c

@@ -155,7 +155,7 @@ void init_cg(struct cg_problem *problem)
 		task2->buffers[1].handle = problem->ds_vecr;
 		task2->buffers[1].handle = problem->ds_vecr;
 		task2->buffers[1].mode = STARPU_R;
 		task2->buffers[1].mode = STARPU_R;
 	
 	
-	_starpu_tag_declare_deps((starpu_tag_t)2UL, 1, (starpu_tag_t)1UL);
+	starpu_tag_declare_deps((starpu_tag_t)2UL, 1, (starpu_tag_t)1UL);
 
 
 	/* delta_new = trans(r) r */
 	/* delta_new = trans(r) r */
 	struct starpu_task *task3 = create_task(3UL);
 	struct starpu_task *task3 = create_task(3UL);
@@ -173,7 +173,7 @@ void init_cg(struct cg_problem *problem)
 	task3->callback_arg = problem;
 	task3->callback_arg = problem;
 	
 	
 	/* XXX 3 should only depend on 1 ... */
 	/* XXX 3 should only depend on 1 ... */
-	_starpu_tag_declare_deps((starpu_tag_t)3UL, 1, (starpu_tag_t)2UL);
+	starpu_tag_declare_deps((starpu_tag_t)3UL, 1, (starpu_tag_t)2UL);
 
 
 	/* launch the computation now */
 	/* launch the computation now */
 	starpu_submit_task(task1);
 	starpu_submit_task(task1);
@@ -218,7 +218,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task5->buffers[1].handle = problem->ds_vecq;
 		task5->buffers[1].handle = problem->ds_vecq;
 		task5->buffers[1].mode = STARPU_R;
 		task5->buffers[1].mode = STARPU_R;
 
 
-	_starpu_tag_declare_deps((starpu_tag_t)(maskiter | 5UL), 1, (starpu_tag_t)(maskiter | 4UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 5UL), 1, (starpu_tag_t)(maskiter | 4UL));
 
 
 	/* x = x + alpha d */
 	/* x = x + alpha d */
 	struct starpu_task *task6 = create_task(maskiter | 6UL);
 	struct starpu_task *task6 = create_task(maskiter | 6UL);
@@ -234,7 +234,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task6->buffers[1].handle = problem->ds_vecd;
 		task6->buffers[1].handle = problem->ds_vecd;
 		task6->buffers[1].mode = STARPU_R;
 		task6->buffers[1].mode = STARPU_R;
 
 
-	_starpu_tag_declare_deps((starpu_tag_t)(maskiter | 6UL), 1, (starpu_tag_t)(maskiter | 5UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 6UL), 1, (starpu_tag_t)(maskiter | 5UL));
 
 
 	/* r = r - alpha q */
 	/* r = r - alpha q */
 	struct starpu_task *task7 = create_task(maskiter | 7UL);
 	struct starpu_task *task7 = create_task(maskiter | 7UL);
@@ -250,7 +250,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task7->buffers[1].handle = problem->ds_vecq;
 		task7->buffers[1].handle = problem->ds_vecq;
 		task7->buffers[1].mode = STARPU_R;
 		task7->buffers[1].mode = STARPU_R;
 
 
-	_starpu_tag_declare_deps((starpu_tag_t)(maskiter | 7UL), 1, (starpu_tag_t)(maskiter | 6UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 7UL), 1, (starpu_tag_t)(maskiter | 6UL));
 
 
 	/* update delta_* and compute beta */
 	/* update delta_* and compute beta */
 	struct starpu_task *task8 = create_task(maskiter | 8UL);
 	struct starpu_task *task8 = create_task(maskiter | 8UL);
@@ -264,7 +264,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task8->buffers[0].handle = problem->ds_vecr;
 		task8->buffers[0].handle = problem->ds_vecr;
 		task8->buffers[0].mode = STARPU_R;
 		task8->buffers[0].mode = STARPU_R;
 
 
-	_starpu_tag_declare_deps((starpu_tag_t)(maskiter | 8UL), 1, (starpu_tag_t)(maskiter | 7UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 8UL), 1, (starpu_tag_t)(maskiter | 7UL));
 
 
 	/* d = r + beta d */
 	/* d = r + beta d */
 	struct starpu_task *task9 = create_task(maskiter | 9UL);
 	struct starpu_task *task9 = create_task(maskiter | 9UL);
@@ -280,7 +280,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task9->buffers[1].handle = problem->ds_vecr;
 		task9->buffers[1].handle = problem->ds_vecr;
 		task9->buffers[1].mode = STARPU_R;
 		task9->buffers[1].mode = STARPU_R;
 
 
-	_starpu_tag_declare_deps((starpu_tag_t)(maskiter | 9UL), 1, (starpu_tag_t)(maskiter | 8UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 9UL), 1, (starpu_tag_t)(maskiter | 8UL));
 
 
 	task9->callback_func = iteration_cg;
 	task9->callback_func = iteration_cg;
 	task9->callback_arg = problem;
 	task9->callback_arg = problem;

+ 7 - 7
examples/lu/xlu.c

@@ -85,7 +85,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -132,10 +132,10 @@ static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG12(k, j), 2, TAG11(k), TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG12(k, j), 2, TAG11(k), TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG12(k, j), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG12(k, j), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -180,10 +180,10 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned i)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, i), 2, TAG11(k), TAG22(k-1, i, k));
+		starpu_tag_declare_deps(TAG21(k, i), 2, TAG11(k), TAG22(k-1, i, k));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, i), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG21(k, i), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -232,10 +232,10 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, j), TAG21(k, i));
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, j), TAG21(k, i));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, j), TAG21(k, i));
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, j), TAG21(k, i));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 11 - 11
examples/lu/xlu_pivot.c

@@ -91,12 +91,12 @@ static void create_task_pivot(starpu_data_handle *dataAp, unsigned nblocks,
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k == 0) {
 	if (k == 0) {
-		_starpu_tag_declare_deps(PIVOT(k, i), 1, TAG11(k));
+		starpu_tag_declare_deps(PIVOT(k, i), 1, TAG11(k));
 	}
 	}
 	else 
 	else 
 	{
 	{
 		if (i > k) {
 		if (i > k) {
-			_starpu_tag_declare_deps(PIVOT(k, i), 2, TAG11(k), TAG22(k-1, i, k));
+			starpu_tag_declare_deps(PIVOT(k, i), 2, TAG11(k), TAG22(k-1, i, k));
 		}
 		}
 		else {
 		else {
 			starpu_tag_t *tags = malloc((nblocks - k)*sizeof(starpu_tag_t));
 			starpu_tag_t *tags = malloc((nblocks - k)*sizeof(starpu_tag_t));
@@ -157,7 +157,7 @@ static struct starpu_task *create_task_11_pivot(starpu_data_handle *dataAp, unsi
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 
 
 	return task;
 	return task;
@@ -207,13 +207,13 @@ static void create_task_12(starpu_data_handle *dataAp, unsigned nblocks, unsigne
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 #if 0
 #if 0
-	_starpu_tag_declare_deps(TAG12(k, i), 1, PIVOT(k, i));
+	starpu_tag_declare_deps(TAG12(k, i), 1, PIVOT(k, i));
 #endif
 #endif
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG12(k, j), 2, TAG11(k), TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG12(k, j), 2, TAG11(k), TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG12(k, j), 1, TAG11(k));
+		starpu_tag_declare_deps(TAG12(k, j), 1, TAG11(k));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -260,13 +260,13 @@ static void create_task_21(starpu_data_handle *dataAp, unsigned nblocks, unsigne
 	task->cl_arg = (void *)(task->tag_id);
 	task->cl_arg = (void *)(task->tag_id);
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
-	_starpu_tag_declare_deps(TAG21(k, i), 1, PIVOT(k, i));
+	starpu_tag_declare_deps(TAG21(k, i), 1, PIVOT(k, i));
 #if 0
 #if 0
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, i), 3, TAG11(k), TAG22(k-1, k, i), PIVOT(k, i));
+		starpu_tag_declare_deps(TAG21(k, i), 3, TAG11(k), TAG22(k-1, k, i), PIVOT(k, i));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, i), 2, TAG11(k), PIVOT(k, i));
+		starpu_tag_declare_deps(TAG21(k, i), 2, TAG11(k), PIVOT(k, i));
 	}
 	}
 #endif
 #endif
 
 
@@ -319,10 +319,10 @@ static void create_task_22(starpu_data_handle *dataAp, unsigned nblocks, unsigne
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, j), TAG21(k, i));
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), TAG12(k, j), TAG21(k, i));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, j), TAG21(k, i));
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, TAG12(k, j), TAG21(k, i));
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 1 - 1
examples/mult/dw_mult_no_stride.c

@@ -329,7 +329,7 @@ static void submit_new_iter(unsigned x, unsigned y, unsigned iter)
 		task = construct_task(x, y, z, iter);
 		task = construct_task(x, y, z, iter);
 		
 		
 		if (z != 0) {
 		if (z != 0) {
-			_starpu_tag_declare_deps(TAG(z, y, x, iter), 1, TAG(z-1, y, x, iter));
+			starpu_tag_declare_deps(TAG(z, y, x, iter), 1, TAG(z-1, y, x, iter));
 		}
 		}
 
 
 		if (z == nslicesz - 1) {
 		if (z == nslicesz - 1) {

+ 1 - 1
examples/spmv/dw_block_spmv.c

@@ -193,7 +193,7 @@ void launch_spmv_codelets(void)
 				if (index != rowptr[row & ~0x3])
 				if (index != rowptr[row & ~0x3])
 				{
 				{
 					/* this is not the first task in the row */
 					/* this is not the first task in the row */
-					_starpu_tag_declare_deps((starpu_tag_t)taskid, 1, (starpu_tag_t)(taskid-1));
+					starpu_tag_declare_deps((starpu_tag_t)taskid, 1, (starpu_tag_t)(taskid-1));
 
 
 					is_entry_tab[taskid] = 0;
 					is_entry_tab[taskid] = 0;
 				}
 				}

+ 6 - 6
examples/starpufft/starpufftx1d.c

@@ -480,7 +480,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that fft1 depends on twisted1 */
 		/* Tell that fft1 depends on twisted1 */
-		_starpu_tag_declare_deps(STEP_TAG(FFT1),
+		starpu_tag_declare_deps(STEP_TAG(FFT1),
 				1, STEP_TAG(TWIST1));
 				1, STEP_TAG(TWIST1));
 
 
 		/* Create FFT1 task */
 		/* Create FFT1 task */
@@ -500,7 +500,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 
 
 		/* Tell that to be done with first step we need to have
 		/* Tell that to be done with first step we need to have
 		 * finished this fft1 */
 		 * finished this fft1 */
-		_starpu_tag_declare_deps(STEP_TAG_1D(plan, JOIN, 0),
+		starpu_tag_declare_deps(STEP_TAG_1D(plan, JOIN, 0),
 				1, STEP_TAG(FFT1));
 				1, STEP_TAG(FFT1));
 #undef STEP_TAG
 #undef STEP_TAG
 	}
 	}
@@ -530,7 +530,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 
 
 		/* Tell that twisted2 depends on the whole first step to be
 		/* Tell that twisted2 depends on the whole first step to be
 		 * done */
 		 * done */
-		_starpu_tag_declare_deps(STEP_TAG(TWIST2),
+		starpu_tag_declare_deps(STEP_TAG(TWIST2),
 				1, STEP_TAG_1D(plan, JOIN, 0));
 				1, STEP_TAG_1D(plan, JOIN, 0));
 
 
 		/* Create twist2 task */
 		/* Create twist2 task */
@@ -545,7 +545,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that fft2 depends on twisted2 */
 		/* Tell that fft2 depends on twisted2 */
-		_starpu_tag_declare_deps(STEP_TAG(FFT2),
+		starpu_tag_declare_deps(STEP_TAG(FFT2),
 				1, STEP_TAG(TWIST2));
 				1, STEP_TAG(TWIST2));
 
 
 		/* Create FFT2 task */
 		/* Create FFT2 task */
@@ -562,7 +562,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that twist3 depends on fft2 */
 		/* Tell that twist3 depends on fft2 */
-		_starpu_tag_declare_deps(STEP_TAG(TWIST3),
+		starpu_tag_declare_deps(STEP_TAG(TWIST3),
 				1, STEP_TAG(FFT2));
 				1, STEP_TAG(FFT2));
 
 
 		/* Create twist3 tasks */
 		/* Create twist3 tasks */
@@ -577,7 +577,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that to be completely finished we need to have finished this twisted3 */
 		/* Tell that to be completely finished we need to have finished this twisted3 */
-		_starpu_tag_declare_deps(STEP_TAG_1D(plan, END, 0),
+		starpu_tag_declare_deps(STEP_TAG_1D(plan, END, 0),
 				1, STEP_TAG(TWIST3));
 				1, STEP_TAG(TWIST3));
 #undef STEP_TAG
 #undef STEP_TAG
 	}
 	}

+ 6 - 6
examples/starpufft/starpufftx2d.c

@@ -540,7 +540,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that fft1 depends on twisted1 */
 		/* Tell that fft1 depends on twisted1 */
-		_starpu_tag_declare_deps(STEP_TAG(FFT1),
+		starpu_tag_declare_deps(STEP_TAG(FFT1),
 				1, STEP_TAG(TWIST1));
 				1, STEP_TAG(TWIST1));
 
 
 		/* Create FFT1 task */
 		/* Create FFT1 task */
@@ -562,7 +562,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 
 
 		/* Tell that to be done with first step we need to have
 		/* Tell that to be done with first step we need to have
 		 * finished this fft1 */
 		 * finished this fft1 */
-		_starpu_tag_declare_deps(STEP_TAG_2D(plan, JOIN, 0, 0),
+		starpu_tag_declare_deps(STEP_TAG_2D(plan, JOIN, 0, 0),
 				1, STEP_TAG(FFT1));
 				1, STEP_TAG(FFT1));
 #undef STEP_TAG
 #undef STEP_TAG
 	}
 	}
@@ -593,7 +593,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 
 
 		/* Tell that twisted2 depends on the whole first step to be
 		/* Tell that twisted2 depends on the whole first step to be
 		 * done */
 		 * done */
-		_starpu_tag_declare_deps(STEP_TAG(TWIST2),
+		starpu_tag_declare_deps(STEP_TAG(TWIST2),
 				1, STEP_TAG_2D(plan, JOIN, 0, 0));
 				1, STEP_TAG_2D(plan, JOIN, 0, 0));
 
 
 		/* Create twist2 task */
 		/* Create twist2 task */
@@ -608,7 +608,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that fft2 depends on twisted2 */
 		/* Tell that fft2 depends on twisted2 */
-		_starpu_tag_declare_deps(STEP_TAG(FFT2),
+		starpu_tag_declare_deps(STEP_TAG(FFT2),
 				1, STEP_TAG(TWIST2));
 				1, STEP_TAG(TWIST2));
 
 
 		/* Create FFT2 task */
 		/* Create FFT2 task */
@@ -625,7 +625,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that twist3 depends on fft2 */
 		/* Tell that twist3 depends on fft2 */
-		_starpu_tag_declare_deps(STEP_TAG(TWIST3),
+		starpu_tag_declare_deps(STEP_TAG(TWIST3),
 				1, STEP_TAG(FFT2));
 				1, STEP_TAG(FFT2));
 
 
 		/* Create twist3 tasks */
 		/* Create twist3 tasks */
@@ -640,7 +640,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		/* Tell that to be completely finished we need to have finished this twisted3 */
 		/* Tell that to be completely finished we need to have finished this twisted3 */
-		_starpu_tag_declare_deps(STEP_TAG_2D(plan, END, 0, 0),
+		starpu_tag_declare_deps(STEP_TAG_2D(plan, END, 0, 0),
 				1, STEP_TAG(TWIST3));
 				1, STEP_TAG(TWIST3));
 #undef STEP_TAG
 #undef STEP_TAG
 	}
 	}

+ 24 - 24
examples/strassen2/strassen2.c

@@ -627,39 +627,39 @@ void strassen_mult(struct strassen_iter *iter)
 
 
 	if (iter->reclevel == 1)
 	if (iter->reclevel == 1)
 	{
 	{
-		_starpu_tag_declare_deps(tag_c11_a, 1, tag_m1[0]);
-		_starpu_tag_declare_deps(tag_c11_b, 2, tag_m4[0], tag_c11_a);
-		_starpu_tag_declare_deps(tag_c11_c, 2, tag_m5[0], tag_c11_b);
-		_starpu_tag_declare_deps(tag_c11_d, 2, tag_m7[0], tag_c11_c);
+		starpu_tag_declare_deps(tag_c11_a, 1, tag_m1[0]);
+		starpu_tag_declare_deps(tag_c11_b, 2, tag_m4[0], tag_c11_a);
+		starpu_tag_declare_deps(tag_c11_c, 2, tag_m5[0], tag_c11_b);
+		starpu_tag_declare_deps(tag_c11_d, 2, tag_m7[0], tag_c11_c);
 	
 	
-		_starpu_tag_declare_deps(tag_c12_a, 1, tag_m3[0]);
-		_starpu_tag_declare_deps(tag_c12_b, 2, tag_m5[0], tag_c12_a);
+		starpu_tag_declare_deps(tag_c12_a, 1, tag_m3[0]);
+		starpu_tag_declare_deps(tag_c12_b, 2, tag_m5[0], tag_c12_a);
 
 
-		_starpu_tag_declare_deps(tag_c21_a, 1, tag_m2[0]);
-		_starpu_tag_declare_deps(tag_c21_b, 2, tag_m4[0], tag_c21_a);
+		starpu_tag_declare_deps(tag_c21_a, 1, tag_m2[0]);
+		starpu_tag_declare_deps(tag_c21_b, 2, tag_m4[0], tag_c21_a);
 	
 	
-		_starpu_tag_declare_deps(tag_c22_a, 1, tag_m1[0]);
-		_starpu_tag_declare_deps(tag_c22_b, 2, tag_m2[0], tag_c22_a);
-		_starpu_tag_declare_deps(tag_c22_c, 2, tag_m3[0], tag_c22_b);
-		_starpu_tag_declare_deps(tag_c22_d, 2, tag_m6[0], tag_c22_c);
+		starpu_tag_declare_deps(tag_c22_a, 1, tag_m1[0]);
+		starpu_tag_declare_deps(tag_c22_b, 2, tag_m2[0], tag_c22_a);
+		starpu_tag_declare_deps(tag_c22_c, 2, tag_m3[0], tag_c22_b);
+		starpu_tag_declare_deps(tag_c22_d, 2, tag_m6[0], tag_c22_c);
 	}
 	}
 	else
 	else
 	{
 	{
-		_starpu_tag_declare_deps(tag_c11_a, 4, tag_m1[0], tag_m1[1], tag_m1[2], tag_m1[3]);
-		_starpu_tag_declare_deps(tag_c11_b, 5, tag_m4[0], tag_m4[1], tag_m4[2], tag_m4[3], tag_c11_a);
-		_starpu_tag_declare_deps(tag_c11_c, 5, tag_m5[0], tag_m5[1], tag_m5[2], tag_m5[3], tag_c11_b);
-		_starpu_tag_declare_deps(tag_c11_d, 5, tag_m7[0], tag_m7[1], tag_m7[2], tag_m7[3], tag_c11_c);
+		starpu_tag_declare_deps(tag_c11_a, 4, tag_m1[0], tag_m1[1], tag_m1[2], tag_m1[3]);
+		starpu_tag_declare_deps(tag_c11_b, 5, tag_m4[0], tag_m4[1], tag_m4[2], tag_m4[3], tag_c11_a);
+		starpu_tag_declare_deps(tag_c11_c, 5, tag_m5[0], tag_m5[1], tag_m5[2], tag_m5[3], tag_c11_b);
+		starpu_tag_declare_deps(tag_c11_d, 5, tag_m7[0], tag_m7[1], tag_m7[2], tag_m7[3], tag_c11_c);
 
 
-		_starpu_tag_declare_deps(tag_c12_a, 4, tag_m3[0], tag_m3[1], tag_m3[2], tag_m3[3]);
-		_starpu_tag_declare_deps(tag_c12_b, 5, tag_m5[0], tag_m5[1], tag_m5[2], tag_m5[3], tag_c12_a);
+		starpu_tag_declare_deps(tag_c12_a, 4, tag_m3[0], tag_m3[1], tag_m3[2], tag_m3[3]);
+		starpu_tag_declare_deps(tag_c12_b, 5, tag_m5[0], tag_m5[1], tag_m5[2], tag_m5[3], tag_c12_a);
 
 
-		_starpu_tag_declare_deps(tag_c21_a, 4, tag_m2[0], tag_m2[1], tag_m2[2], tag_m2[3]);
-		_starpu_tag_declare_deps(tag_c21_b, 5, tag_m4[0], tag_m4[1], tag_m4[2], tag_m4[3], tag_c21_a);
+		starpu_tag_declare_deps(tag_c21_a, 4, tag_m2[0], tag_m2[1], tag_m2[2], tag_m2[3]);
+		starpu_tag_declare_deps(tag_c21_b, 5, tag_m4[0], tag_m4[1], tag_m4[2], tag_m4[3], tag_c21_a);
 
 
-		_starpu_tag_declare_deps(tag_c22_a, 4, tag_m1[0], tag_m1[1], tag_m1[2], tag_m1[3]);
-		_starpu_tag_declare_deps(tag_c22_b, 5, tag_m2[0], tag_m2[1], tag_m2[2], tag_m2[3], tag_c22_a);
-		_starpu_tag_declare_deps(tag_c22_c, 5, tag_m3[0], tag_m3[1], tag_m3[2], tag_m3[3], tag_c22_b);
-		_starpu_tag_declare_deps(tag_c22_d, 5, tag_m6[0], tag_m6[1], tag_m6[2], tag_m6[3], tag_c22_c);
+		starpu_tag_declare_deps(tag_c22_a, 4, tag_m1[0], tag_m1[1], tag_m1[2], tag_m1[3]);
+		starpu_tag_declare_deps(tag_c22_b, 5, tag_m2[0], tag_m2[1], tag_m2[2], tag_m2[3], tag_c22_a);
+		starpu_tag_declare_deps(tag_c22_c, 5, tag_m3[0], tag_m3[1], tag_m3[2], tag_m3[3], tag_c22_b);
+		starpu_tag_declare_deps(tag_c22_d, 5, tag_m6[0], tag_m6[1], tag_m6[2], tag_m6[3], tag_c22_c);
 	}
 	}
 
 
 	starpu_submit_task(task_c11_a);
 	starpu_submit_task(task_c11_a);

+ 3 - 3
examples/tag_example/tag_example.c

@@ -163,12 +163,12 @@ static void express_deps(unsigned i, unsigned j, unsigned iter)
 		if (j < nj - 1)
 		if (j < nj - 1)
 		{
 		{
 			/* (i,j+1) exists */
 			/* (i,j+1) exists */
-			_starpu_tag_declare_deps(TAG(i,j,iter), 2, TAG(i-1,j-1,iter), TAG(i-1,j+1,iter));
+			starpu_tag_declare_deps(TAG(i,j,iter), 2, TAG(i-1,j-1,iter), TAG(i-1,j+1,iter));
 		}
 		}
 		else 
 		else 
 		{
 		{
 			/* (i,j+1) does not exist */
 			/* (i,j+1) does not exist */
-			_starpu_tag_declare_deps(TAG(i,j,iter), 1, TAG(i-1,j-1,iter));
+			starpu_tag_declare_deps(TAG(i,j,iter), 1, TAG(i-1,j-1,iter));
 		}
 		}
 	}
 	}
 	else {
 	else {
@@ -176,7 +176,7 @@ static void express_deps(unsigned i, unsigned j, unsigned iter)
 		if (j < nj - 1)
 		if (j < nj - 1)
 		{
 		{
 			/* (i,j+1) exists */
 			/* (i,j+1) exists */
-			_starpu_tag_declare_deps(TAG(i,j,iter), 1, TAG(i-1,j+1,iter));
+			starpu_tag_declare_deps(TAG(i,j,iter), 1, TAG(i-1,j+1,iter));
 		}
 		}
 		else 
 		else 
 		{
 		{

+ 1 - 1
examples/tag_example/tag_example2.c

@@ -93,7 +93,7 @@ static void create_task_grid(unsigned iter)
 		task->tag_id = TAG(i, iter);
 		task->tag_id = TAG(i, iter);
 
 
 		if (i != 0)
 		if (i != 0)
-			_starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
+			starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
 
 
 		starpu_submit_task(task);
 		starpu_submit_task(task);
 	}
 	}

+ 1 - 1
examples/tag_example/tag_example3.c

@@ -93,7 +93,7 @@ static void create_task_grid(unsigned iter)
 		task->tag_id = TAG(i, iter);
 		task->tag_id = TAG(i, iter);
 
 
 		if (i != 1)
 		if (i != 1)
-			_starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
+			starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
 
 
 		starpu_submit_task(task);
 		starpu_submit_task(task);
 	}
 	}

+ 1 - 1
examples/tag_example/tag_restartable.c

@@ -87,7 +87,7 @@ static void create_task_grid(unsigned iter)
 		task->destroy = 0;
 		task->destroy = 0;
 
 
 		if (i != 0)
 		if (i != 0)
-			_starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
+			starpu_tag_declare_deps(TAG(i,iter), 1, TAG(i-1,iter));
 	}
 	}
 
 
 }
 }

+ 4 - 4
include/starpu-task.h

@@ -147,22 +147,22 @@ struct starpu_task {
  * To do so, fill the tag_id field with a tag number (can be arbitrary) and set
  * To do so, fill the tag_id field with a tag number (can be arbitrary) and set
  * use_tag to 1.
  * use_tag to 1.
  *
  *
- * If _starpu_tag_declare_deps is called with that tag number, the task will not
+ * If starpu_tag_declare_deps is called with that tag number, the task will not
  * be started until the task which wears the declared dependency tags are
  * be started until the task which wears the declared dependency tags are
  * complete.
  * complete.
  */
  */
 
 
 /*
 /*
  * WARNING ! use with caution ...
  * WARNING ! use with caution ...
- *  In case _starpu_tag_declare_deps is passed constant arguments, the caller
+ *  In case starpu_tag_declare_deps is passed constant arguments, the caller
  *  must make sure that the constants are casted to starpu_tag_t. Otherwise,
  *  must make sure that the constants are casted to starpu_tag_t. Otherwise,
  *  due to integer sizes and argument passing on the stack, the C compiler
  *  due to integer sizes and argument passing on the stack, the C compiler
  *  might consider the tag *  0x200000003 instead of 0x2 and 0x3 when calling:
  *  might consider the tag *  0x200000003 instead of 0x2 and 0x3 when calling:
- *      "_starpu_tag_declare_deps(0x1, 2, 0x2, 0x3)"
+ *      "starpu_tag_declare_deps(0x1, 2, 0x2, 0x3)"
  *  Using starpu_tag_declare_deps_array is a way to avoid this problem.
  *  Using starpu_tag_declare_deps_array is a way to avoid this problem.
  */
  */
 /* make id depend on the list of ids */
 /* make id depend on the list of ids */
-void _starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
 void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t *array);
 void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t *array);
 
 
 /* task depends on the tasks in task array */
 /* task depends on the tasks in task array */

+ 8 - 8
mpi/examples/mpi_lu/pxlu.c

@@ -281,10 +281,10 @@ static void create_task_11_real(unsigned k)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
+		starpu_tag_declare_deps(TAG11(k), 1, TAG22(k-1, k, k));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG11(k), 1, STARPU_TAG_INIT);
+		starpu_tag_declare_deps(TAG11(k), 1, STARPU_TAG_INIT);
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -455,10 +455,10 @@ static void create_task_12_real(unsigned k, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG12(k, j), 2, tag_11_dep, TAG22(k-1, k, j));
+		starpu_tag_declare_deps(TAG12(k, j), 2, tag_11_dep, TAG22(k-1, k, j));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG12(k, j), 1, tag_11_dep);
+		starpu_tag_declare_deps(TAG12(k, j), 1, tag_11_dep);
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -626,10 +626,10 @@ static void create_task_21_real(unsigned k, unsigned i)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG21(k, i), 2, tag_11_dep, TAG22(k-1, i, k));
+		starpu_tag_declare_deps(TAG21(k, i), 2, tag_11_dep, TAG22(k-1, i, k));
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG21(k, i), 1, tag_11_dep);
+		starpu_tag_declare_deps(TAG21(k, i), 1, tag_11_dep);
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);
@@ -746,10 +746,10 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
 
 
 	/* enforce dependencies ... */
 	/* enforce dependencies ... */
 	if (k > 0) {
 	if (k > 0) {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), tag_12_dep, tag_21_dep);
+		starpu_tag_declare_deps(TAG22(k, i, j), 3, TAG22(k-1, i, j), tag_12_dep, tag_21_dep);
 	}
 	}
 	else {
 	else {
-		_starpu_tag_declare_deps(TAG22(k, i, j), 2, tag_12_dep, tag_21_dep);
+		starpu_tag_declare_deps(TAG22(k, i, j), 2, tag_12_dep, tag_21_dep);
 	}
 	}
 
 
 	starpu_submit_task(task);
 	starpu_submit_task(task);

+ 1 - 1
src/core/dependencies/tags.c

@@ -249,7 +249,7 @@ void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t
 	_starpu_spin_unlock(&tag_child->lock);
 	_starpu_spin_unlock(&tag_child->lock);
 }
 }
 
 
-void _starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...)
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...)
 {
 {
 	unsigned i;
 	unsigned i;
 	
 	

+ 1 - 1
src/core/dependencies/tags.h

@@ -56,7 +56,7 @@ struct starpu_tag_s {
 	unsigned is_submitted;
 	unsigned is_submitted;
 };
 };
 
 
-void _starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
 
 
 void _starpu_notify_dependencies(struct starpu_job_s *j);
 void _starpu_notify_dependencies(struct starpu_job_s *j);
 void _starpu_tag_declare(starpu_tag_t id, struct starpu_job_s *job);
 void _starpu_tag_declare(starpu_tag_t id, struct starpu_job_s *job);

+ 3 - 3
tests/core/empty_task_sync_point.c

@@ -65,19 +65,19 @@ int main(int argc, char **argv)
 	taskD->cl = NULL;
 	taskD->cl = NULL;
 	taskD->use_tag = 1;
 	taskD->use_tag = 1;
 	taskD->tag_id = tagD;
 	taskD->tag_id = tagD;
-	_starpu_tag_declare_deps(tagD, 3, tagA, tagB, tagC);
+	starpu_tag_declare_deps(tagD, 3, tagA, tagB, tagC);
 
 
 	struct starpu_task *taskE = starpu_task_create();
 	struct starpu_task *taskE = starpu_task_create();
 	taskE->cl = &dummy_codelet;
 	taskE->cl = &dummy_codelet;
 	taskE->use_tag = 1;
 	taskE->use_tag = 1;
 	taskE->tag_id = tagE;
 	taskE->tag_id = tagE;
-	_starpu_tag_declare_deps(tagE, 1, tagD);
+	starpu_tag_declare_deps(tagE, 1, tagD);
 
 
 	struct starpu_task *taskF = starpu_task_create();
 	struct starpu_task *taskF = starpu_task_create();
 	taskF->cl = &dummy_codelet;
 	taskF->cl = &dummy_codelet;
 	taskF->use_tag = 1;
 	taskF->use_tag = 1;
 	taskF->tag_id = tagF;
 	taskF->tag_id = tagF;
-	_starpu_tag_declare_deps(tagF, 1, tagD);
+	starpu_tag_declare_deps(tagF, 1, tagD);
 
 
 	starpu_submit_task(taskA);
 	starpu_submit_task(taskA);
 	starpu_submit_task(taskB);
 	starpu_submit_task(taskB);

+ 5 - 5
tests/core/tag-wait-api.c

@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	taskB = create_dummy_task(tagB);
 	taskB = create_dummy_task(tagB);
 
 
 	/* B depends on A */
 	/* B depends on A */
-	_starpu_tag_declare_deps(tagB, 1, tagA);
+	starpu_tag_declare_deps(tagB, 1, tagA);
 
 
 	starpu_submit_task(taskB);
 	starpu_submit_task(taskB);
 	starpu_submit_task(taskA);
 	starpu_submit_task(taskA);
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 	taskG = create_dummy_task(tagG);
 	taskG = create_dummy_task(tagG);
 
 
 	/* NB: we could have used starpu_tag_declare_deps_array instead */
 	/* NB: we could have used starpu_tag_declare_deps_array instead */
-	_starpu_tag_declare_deps(tagG, 4, tagC, tagD, tagE, tagF);
+	starpu_tag_declare_deps(tagG, 4, tagC, tagD, tagE, tagF);
 
 
 	starpu_submit_task(taskC);
 	starpu_submit_task(taskC);
 	starpu_submit_task(taskD);
 	starpu_submit_task(taskD);
@@ -121,9 +121,9 @@ int main(int argc, char **argv)
 	taskK = create_dummy_task(tagK);
 	taskK = create_dummy_task(tagK);
 	taskL = create_dummy_task(tagL);
 	taskL = create_dummy_task(tagL);
 
 
-	_starpu_tag_declare_deps(tagJ, 2, tagH, tagI);
-	_starpu_tag_declare_deps(tagK, 2, tagH, tagI);
-	_starpu_tag_declare_deps(tagL, 2, tagH, tagI);
+	starpu_tag_declare_deps(tagJ, 2, tagH, tagI);
+	starpu_tag_declare_deps(tagK, 2, tagH, tagI);
+	starpu_tag_declare_deps(tagL, 2, tagH, tagI);
 
 
 	starpu_tag_t tagJKL[3] = {tagJ, tagK, tagL};
 	starpu_tag_t tagJKL[3] = {tagJ, tagK, tagL};
 
 

+ 1 - 1
tests/microbenchs/tasks-overhead.c

@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 	gettimeofday(&start_submit, NULL);
 	gettimeofday(&start_submit, NULL);
 	for (i = 1; i < ntasks; i++)
 	for (i = 1; i < ntasks; i++)
 	{
 	{
-		_starpu_tag_declare_deps((starpu_tag_t)i, 1, (starpu_tag_t)(i-1));
+		starpu_tag_declare_deps((starpu_tag_t)i, 1, (starpu_tag_t)(i-1));
 
 
 		starpu_submit_task(&tasks[i]);
 		starpu_submit_task(&tasks[i]);
 	}
 	}