prefix the name of the different access modes (eg. RW -> STARPU_RW).

examples/cholesky/dw_cholesky.c

@@ -56,7 +56,7 @@ static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, k);
-	task->buffers[0].mode = RW;
+	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
 	task->priority = MAX_PRIO;
@@ -88,9 +88,9 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
-	task->buffers[1].mode = RW;
+	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
 		task->priority = MAX_PRIO;
@@ -128,11 +128,11 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, i); 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = get_sub_data(dataA, 2, i, j); 
-	task->buffers[2].mode = RW;
+	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {
 		task->priority = MAX_PRIO;

examples/cholesky/dw_cholesky_no_stride.c

@@ -73,7 +73,7 @@ static struct starpu_task * create_task_11(unsigned k, unsigned nblocks, sem_t *
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = A_state[k][k];
-	task->buffers[0].mode = RW;
+	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
 	task->priority = MAX_PRIO;
@@ -118,9 +118,9 @@ static void create_task_21(unsigned k, unsigned j)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = A_state[k][k]; 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = A_state[j][k]; 
-	task->buffers[1].mode = RW;
+	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
 		task->priority = MAX_PRIO;
@@ -165,11 +165,11 @@ static void create_task_22(unsigned k, unsigned i, unsigned j)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = A_state[i][k]; 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = A_state[j][k]; 
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = A_state[j][i]; 
-	task->buffers[2].mode = RW;
+	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {
 		task->priority = MAX_PRIO;

examples/heat/dw_factolu.c

@@ -101,7 +101,7 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 
 			task->buffers[0].state =
 				get_sub_data(args->dataA, 2, k+1, k+1);
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 	
 		u11arg->dataA = args->dataA;
 		u11arg->i = k + 1;
@@ -140,10 +140,10 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 
 					task21->buffers[0].state = 
 						get_sub_data(args->dataA, 2, u21a->i, u21a->i);
-					task21->buffers[0].mode = R;
+					task21->buffers[0].mode = STARPU_R;
 					task21->buffers[1].state =
 						get_sub_data(args->dataA, 2, u21a->i, u21a->k);
-					task21->buffers[1].mode = RW;
+					task21->buffers[1].mode = STARPU_RW;
 		
 					starpu_submit_task(task21);
 				}
@@ -175,9 +175,9 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 					u12a->sem = args->sem;
 
 					task12->buffers[0].state = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
-					task12->buffers[0].mode = R;
+					task12->buffers[0].mode = STARPU_R;
 					task12->buffers[1].state = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
-					task12->buffers[1].mode = RW;
+					task12->buffers[1].mode = STARPU_RW;
 					
 					starpu_submit_task(task12);
 				}
@@ -228,13 +228,13 @@ void dw_callback_v2_codelet_update_u12(void *argcb)
 				u22a->sem = args->sem;
 
 				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
-				task22->buffers[0].mode = R;
+				task22->buffers[0].mode = STARPU_R;
 
 				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
-				task22->buffers[1].mode = R;
+				task22->buffers[1].mode = STARPU_R;
 
 				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
-				task22->buffers[2].mode = RW;
+				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
 				if (slicey == i+1) 
@@ -288,13 +288,13 @@ void dw_callback_v2_codelet_update_u21(void *argcb)
 				u22a->sem = args->sem;
 
 				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
-				task22->buffers[0].mode = R;
+				task22->buffers[0].mode = STARPU_R;
 
 				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
-				task22->buffers[1].mode = R;
+				task22->buffers[1].mode = STARPU_R;
 
 				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
-				task22->buffers[2].mode = RW;
+				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
 				if (slicex == i+1)
@@ -358,9 +358,9 @@ void dw_callback_v2_codelet_update_u11(void *argcb)
 					u12a->sem = args->sem;
 
 					task12->buffers[0].state = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
-					task12->buffers[0].mode = R;
+					task12->buffers[0].mode = STARPU_R;
 					task12->buffers[1].state = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
-					task12->buffers[1].mode = RW;
+					task12->buffers[1].mode = STARPU_RW;
 
 					if (slice == i +1) 
 						task12->priority = MAX_PRIO;
@@ -396,9 +396,9 @@ void dw_callback_v2_codelet_update_u11(void *argcb)
 					u21a->sem = args->sem;
 
 					task21->buffers[0].state = get_sub_data(args->dataA, 2, u21a->i, u21a->i);
-					task21->buffers[0].mode = R;
+					task21->buffers[0].mode = STARPU_R;
 					task21->buffers[1].state = get_sub_data(args->dataA, 2, u21a->i, u21a->k);
-					task21->buffers[1].mode = RW;
+					task21->buffers[1].mode = STARPU_RW;
 		
 					if (slice == i +1)
 						task21->priority = MAX_PRIO;
@@ -475,17 +475,17 @@ void dw_callback_codelet_update_u11(void *argcb)
 
 			task12->buffers[0].state = 
 				get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
-			task12->buffers[0].mode = R;
+			task12->buffers[0].mode = STARPU_R;
 			task12->buffers[1].state = 
 				get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
-			task12->buffers[1].mode = RW;
+			task12->buffers[1].mode = STARPU_RW;
 
 			task21->buffers[0].state = 
 				get_sub_data(args->dataA, 2, u21a->i, u21a->i);
-			task21->buffers[0].mode = R;
+			task21->buffers[0].mode = STARPU_R;
 			task21->buffers[1].state = 
 				get_sub_data(args->dataA, 2, u21a->i, u21a->k);
-			task21->buffers[1].mode = RW;
+			task21->buffers[1].mode = STARPU_RW;
 		
 			starpu_submit_task(task12);
 			starpu_submit_task(task21);
@@ -513,7 +513,7 @@ void dw_callback_codelet_update_u22(void *argcb)
 			task->cl_arg = u11arg;
 
 			task->buffers[0].state = get_sub_data(args->dataA, 2, args->k + 1, args->k + 1);
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 	
 		u11arg->dataA = args->dataA;
 		u11arg->i = args->k + 1;
@@ -564,13 +564,13 @@ void dw_callback_codelet_update_u12_21(void *argcb)
 				u22a->sem = args->sem;
 
 				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
-				task22->buffers[0].mode = R;
+				task22->buffers[0].mode = STARPU_R;
 
 				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
-				task22->buffers[1].mode = R;
+				task22->buffers[1].mode = STARPU_R;
 
 				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
-				task22->buffers[2].mode = RW;
+				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
 				starpu_submit_task(task22);
@@ -608,7 +608,7 @@ void dw_codelet_facto(starpu_data_handle dataA, unsigned nblocks)
 		task->cl_arg = args;
 
 		task->buffers[0].state = get_sub_data(dataA, 2, 0, 0);
-		task->buffers[0].mode = RW;
+		task->buffers[0].mode = STARPU_RW;
 
 	/* schedule the codelet */
 	starpu_submit_task(task);
@@ -661,7 +661,7 @@ void dw_codelet_facto_v2(starpu_data_handle dataA, unsigned nblocks)
 		task->cl_arg = args;
 
 		task->buffers[0].state = get_sub_data(dataA, 2, 0, 0); 
-		task->buffers[0].mode = RW;
+		task->buffers[0].mode = STARPU_RW;
 
 	/* schedule the codelet */
 	starpu_submit_task(task);

examples/heat/dw_factolu_tag.c

@@ -60,7 +60,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, k);
-	task->buffers[0].mode = RW;
+	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
 	task->priority = MAX_PRIO;
@@ -93,9 +93,9 @@ static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i)
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = get_sub_data(dataA, 2, i, k); 
-	task->buffers[1].mode = RW;
+	task->buffers[1].mode = STARPU_RW;
 
 	if (i == k+1) {
 		task->priority = MAX_PRIO;
@@ -130,9 +130,9 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 	
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
-	task->buffers[1].mode = RW;
+	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
 		task->priority = MAX_PRIO;
@@ -169,11 +169,11 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 
 	/* which sub-data is manipulated ? */
 	task->buffers[0].state = get_sub_data(dataA, 2, i, k); 
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = get_sub_data(dataA, 2, i, j); 
-	task->buffers[2].mode = RW;
+	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {
 		task->priority = MAX_PRIO;

examples/heat/dw_sparse_cg.c

@@ -172,13 +172,13 @@ void init_cg(struct cg_problem *problem)
 	task1->cl->core_func = core_codelet_func_1;
 	task1->cl->nbuffers = 4;
 		task1->buffers[0].state = problem->ds_matrixA;
-		task1->buffers[0].mode = R;
+		task1->buffers[0].mode = STARPU_R;
 		task1->buffers[1].state = problem->ds_vecx;
-		task1->buffers[1].mode = R;
+		task1->buffers[1].mode = STARPU_R;
 		task1->buffers[2].state = problem->ds_vecr;
-		task1->buffers[2].mode = W;
+		task1->buffers[2].mode = STARPU_W;
 		task1->buffers[3].state = problem->ds_vecb;
-		task1->buffers[3].mode = R;
+		task1->buffers[3].mode = STARPU_R;
 
 	/* d = r */
 	struct starpu_task *task2 = create_task(2UL);
@@ -186,9 +186,9 @@ void init_cg(struct cg_problem *problem)
 	task2->cl->core_func = core_codelet_func_2;
 	task2->cl->nbuffers = 2;
 		task2->buffers[0].state = problem->ds_vecd;
-		task2->buffers[0].mode = W;
+		task2->buffers[0].mode = STARPU_W;
 		task2->buffers[1].state = problem->ds_vecr;
-		task2->buffers[1].mode = R;
+		task2->buffers[1].mode = STARPU_R;
 	
 	starpu_tag_declare_deps((starpu_tag_t)2UL, 1, (starpu_tag_t)1UL);
 
@@ -202,7 +202,7 @@ void init_cg(struct cg_problem *problem)
 	task3->cl_arg = problem;
 	task3->cl->nbuffers = 1;
 		task3->buffers[0].state = problem->ds_vecr;
-		task3->buffers[0].mode = R;
+		task3->buffers[0].mode = STARPU_R;
 
 	task3->callback_func = iteration_cg;
 	task3->callback_arg = problem;
@@ -233,11 +233,11 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task4->cl->core_func = core_codelet_func_4;
 	task4->cl->nbuffers = 3;
 		task4->buffers[0].state = problem->ds_matrixA;
-		task4->buffers[0].mode = R;
+		task4->buffers[0].mode = STARPU_R;
 		task4->buffers[1].state = problem->ds_vecd;
-		task4->buffers[1].mode = R;
+		task4->buffers[1].mode = STARPU_R;
 		task4->buffers[2].state = problem->ds_vecq;
-		task4->buffers[2].mode = W;
+		task4->buffers[2].mode = STARPU_W;
 
 	/* alpha = delta_new / ( trans(d) q )*/
 	struct starpu_task *task5 = create_task(maskiter | 5UL);
@@ -249,9 +249,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task5->cl_arg = problem;
 	task5->cl->nbuffers = 2;
 		task5->buffers[0].state = problem->ds_vecd;
-		task5->buffers[0].mode = R;
+		task5->buffers[0].mode = STARPU_R;
 		task5->buffers[1].state = problem->ds_vecq;
-		task5->buffers[1].mode = R;
+		task5->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 5UL), 1, (starpu_tag_t)(maskiter | 4UL));
 
@@ -265,9 +265,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task6->cl_arg = problem;
 	task6->cl->nbuffers = 2;
 		task6->buffers[0].state = problem->ds_vecx;
-		task6->buffers[0].mode = RW;
+		task6->buffers[0].mode = STARPU_RW;
 		task6->buffers[1].state = problem->ds_vecd;
-		task6->buffers[1].mode = R;
+		task6->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 6UL), 1, (starpu_tag_t)(maskiter | 5UL));
 
@@ -281,9 +281,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task7->cl_arg = problem;
 	task7->cl->nbuffers = 2;
 		task7->buffers[0].state = problem->ds_vecr;
-		task7->buffers[0].mode = RW;
+		task7->buffers[0].mode = STARPU_RW;
 		task7->buffers[1].state = problem->ds_vecq;
-		task7->buffers[1].mode = R;
+		task7->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 7UL), 1, (starpu_tag_t)(maskiter | 6UL));
 
@@ -297,7 +297,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task8->cl_arg = problem;
 	task8->cl->nbuffers = 1;
 		task8->buffers[0].state = problem->ds_vecr;
-		task8->buffers[0].mode = R;
+		task8->buffers[0].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 8UL), 1, (starpu_tag_t)(maskiter | 7UL));
 
@@ -311,9 +311,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task9->cl_arg = problem;
 	task9->cl->nbuffers = 2;
 		task9->buffers[0].state = problem->ds_vecd;
-		task9->buffers[0].mode = RW;
+		task9->buffers[0].mode = STARPU_RW;
 		task9->buffers[1].state = problem->ds_vecr;
-		task9->buffers[1].mode = R;
+		task9->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 9UL), 1, (starpu_tag_t)(maskiter | 8UL));
 

examples/incrementer/incrementer.c

@@ -149,9 +149,9 @@ int main(int argc, char **argv)
 		task->cl_arg_size = sizeof(unsigned);
 
 		task->buffers[0].state = my_float_state;
-		task->buffers[0].mode = RW;
+		task->buffers[0].mode = STARPU_RW;
 		task->buffers[1].state = unity_state; 
-		task->buffers[1].mode = R;
+		task->buffers[1].mode = STARPU_R;
 
 		starpu_submit_task(task);
 	}

examples/incrementer/incrementer_runtime.c

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 		task->callback_arg = &counter;
 
 		task->buffers[0].state = float_array_handle;
-		task->buffers[0].mode = RW;
+		task->buffers[0].mode = STARPU_RW;
 
 		starpu_submit_task(task);
 	}

examples/mult/dw_mult.c

@@ -310,12 +310,12 @@ static void launch_codelets(void)
 			task->tag_id = tag;
 
 			task->buffers[0].state = get_sub_data(A_handle, 1, tasky);
-			task->buffers[0].mode = R;
+			task->buffers[0].mode = STARPU_R;
 			task->buffers[1].state = get_sub_data(B_handle, 1, taskx);
-			task->buffers[1].mode = R;
+			task->buffers[1].mode = STARPU_R;
 			task->buffers[2].state = 
 				get_sub_data(C_handle, 2, taskx, tasky);
-			task->buffers[2].mode = RW;
+			task->buffers[2].mode = STARPU_RW;
 
 			starpu_submit_task(task);
 		}

examples/mult/dw_mult_no_stride.c

@@ -372,11 +372,11 @@ static struct starpu_task *construct_task(unsigned x, unsigned y, unsigned z, un
 	task->tag_id = TAG(z, y, x, iter);
 
 	task->buffers[0].state = A_state[y][z];
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = B_state[z][x];
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = C_state[y][x];
-	task->buffers[2].mode = RW;
+	task->buffers[2].mode = STARPU_RW;
 
 	return task;
 }

examples/mult/dw_mult_no_stride_no_tag.c

@@ -398,11 +398,11 @@ static void construct_task(unsigned x, unsigned y, unsigned z, unsigned iter, st
 	task->cl = &cl;
 
 	task->buffers[0].state = A_state[y][z];
-	task->buffers[0].mode = R;
+	task->buffers[0].mode = STARPU_R;
 	task->buffers[1].state = B_state[z][x];
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = C_state[y][x];
-	task->buffers[2].mode = RW;
+	task->buffers[2].mode = STARPU_RW;
 
 	task->callback_func = callback_func_3;
 	task->callback_arg = posp;

examples/pastix-wrappers/starpu-blas-wrapper.c

@@ -335,7 +335,7 @@ void STARPU_CBLK_STRSM(unsigned col)
 	j->nbuffers = 1;
 	/* we could be a little more precise actually */
 	j->buffers[0].state = &cblktab[col];
-	j->buffers[0].mode = RW;
+	j->buffers[0].mode = STARPU_RW;
 	
 	j->cl->model = &starpu_cblk_strsm;
 
@@ -479,11 +479,11 @@ void STARPU_COMPUTE_CONTRIB_COMPACT(unsigned col, int dimi, int dimj, int dima,
 	j->nbuffers = 3;
 	/* we could be a little more precise actually */
 	j->buffers[0].state = &cblktab[col]; // gaik
-	j->buffers[0].mode = R;
+	j->buffers[0].mode = STARPU_R;
 	j->buffers[1].state = get_sub_data(&work_block_1, 1, (ret==2)?0:1);
-	j->buffers[1].mode = R;
+	j->buffers[1].mode = STARPU_R;
 	j->buffers[2].state = get_sub_data(&work_block_2, 1, 0);; 
-	j->buffers[2].mode = RW; // XXX W
+	j->buffers[2].mode = STARPU_RW; // XXX STARPU_W
 	
 	sem_init(&sem, 0, 0U);
 	
@@ -615,11 +615,11 @@ void STARPU_SGEMM (const char *transa, const char *transb, const int m,
 
 	j->nbuffers = 3;
 	j->buffers[0].state = &A_state;
-	j->buffers[0].mode = R;
+	j->buffers[0].mode = STARPU_R;
 	j->buffers[1].state = &B_state;
-	j->buffers[1].mode = R;
+	j->buffers[1].mode = STARPU_R;
 	j->buffers[2].state = &C_state;
-	j->buffers[2].mode = RW;
+	j->buffers[2].mode = STARPU_RW;
 	
 	j->cl->model = NULL;
 

examples/spmv/dw_block_spmv.c

@@ -182,11 +182,11 @@ void launch_spmv_codelets(void)
 				unsigned j = row;
 		
 				task->buffers[0].state = get_sub_data(sparse_matrix, 1, part);
-				task->buffers[0].mode  = R;
+				task->buffers[0].mode  = STARPU_R;
 				task->buffers[1].state = get_sub_data(vector_in, 1, i);
-				task->buffers[1].mode = R;
+				task->buffers[1].mode = STARPU_R;
 				task->buffers[2].state = get_sub_data(vector_out, 1, j);
-				task->buffers[2].mode = RW;
+				task->buffers[2].mode = STARPU_RW;
 
 				/* all tasks in the same row are dependant so that we don't wait too much for data 
 				 * we need to wait on the previous task if we are not the first task of a row */

examples/spmv/dw_spmv.c

@@ -291,11 +291,11 @@ void call_spmv_codelet_filters(void)
 		task->cl_arg = NULL;
 	
 		task->buffers[0].state = get_sub_data(sparse_matrix, 1, part);
-		task->buffers[0].mode  = R;
+		task->buffers[0].mode  = STARPU_R;
 		task->buffers[1].state = vector_in;
-		task->buffers[1].mode = R;
+		task->buffers[1].mode = STARPU_R;
 		task->buffers[2].state = get_sub_data(vector_out, 1, part);
-		task->buffers[2].mode = W;
+		task->buffers[2].mode = STARPU_W;
 	
 		starpu_submit_task(task);
 	}

examples/strassen/strassen.c

@@ -148,11 +148,11 @@ static void compute_add_sub_op(starpu_data_handle A1, operation op,
 		task->use_tag = 0;
 
 	task->buffers[0].state = C;
-	task->buffers[0].mode = W;
+	task->buffers[0].mode = STARPU_W;
 	task->buffers[1].state = A1;
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = A2;
-	task->buffers[2].mode = R;
+	task->buffers[2].mode = STARPU_R;
 	
 	task->callback_func = callback;
 	task->callback_arg = argcallback;
@@ -177,11 +177,11 @@ static void compute_add_sub_op(starpu_data_handle A1, operation op,
 			task->cl = &cl_mult;
 			break;
 		case SELFADD:
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 			task->cl = &cl_self_add;
 			break;
 		case SELFSUB:
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 			task->cl = &cl_self_sub;
 			break;
 		default:

examples/strassen2/strassen2.c

@@ -230,11 +230,11 @@ struct starpu_task *compute_add_sub_op(starpu_data_handle C, enum operation op,
 	uint64_t j_tag = current_tag++;
 
 	task->buffers[0].state = C;
-	task->buffers[0].mode = W;
+	task->buffers[0].mode = STARPU_W;
 	task->buffers[1].state = A;
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 	task->buffers[2].state = B;
-	task->buffers[2].mode = R;
+	task->buffers[2].mode = STARPU_R;
 
 	task->callback_func = NULL;
 
@@ -285,9 +285,9 @@ struct starpu_task *compute_self_add_sub_op(starpu_data_handle C, enum operation
 	uint64_t j_tag = current_tag++;
 
 	task->buffers[0].state = C;
-	task->buffers[0].mode = RW;
+	task->buffers[0].mode = STARPU_RW;
 	task->buffers[1].state = A;
-	task->buffers[1].mode = R;
+	task->buffers[1].mode = STARPU_R;
 
 	task->callback_func = NULL;
 

include/starpu-data.h

@@ -26,9 +26,9 @@
 struct starpu_data_state_t;
 
 typedef enum {
-	R,
-	W,
-	RW
+	STARPU_R,
+	STARPU_W,
+	STARPU_RW
 } starpu_access_mode;
 
 typedef struct starpu_buffer_descr_t {

src/core/dependencies/data-concurrency.c

@@ -48,13 +48,13 @@ static unsigned may_unlock_data_req_list_head(data_state *data)
 	if (data->refcnt == 0)
 		return 1;
 
-	if (data->current_mode == W)
+	if (data->current_mode == STARPU_W)
 		return 0;
 
-	/* data->current_mode == R, so we can process more readers */
+	/* data->current_mode == STARPU_R, so we can process more readers */
 	data_requester_t r = data_requester_list_front(data->req_list);
 	
-	return (r->mode == R);
+	return (r->mode == STARPU_R);
 }
 
 
@@ -77,7 +77,7 @@ unsigned attempt_to_submit_data_request_from_apps(data_state *data, starpu_acces
 	else
 	{
 		/* there is already someone that may access the data */
-		if ( (mode == R) && (data->current_mode == R))
+		if ( (mode == STARPU_R) && (data->current_mode == STARPU_R))
 		{
 			data->refcnt++;
 
@@ -128,7 +128,7 @@ static unsigned attempt_to_submit_data_request_from_job(job_t j, unsigned buffer
 	else
 	{
 		/* there is already someone that may access the data */
-		if ( (mode == R) && (data->current_mode == R))
+		if ( (mode == STARPU_R) && (data->current_mode == STARPU_R))
 		{
 			data->refcnt++;
 

src/datawizard/coherency.c

@@ -44,7 +44,7 @@ static int __attribute__((warn_unused_result)) copy_data_to_node(data_state *sta
 	return ret;
 }
 
-/* this may be called once the data is fetched with header and RW-lock hold */
+/* this may be called once the data is fetched with header and STARPU_RW-lock hold */
 static void update_data_state(data_state *state, uint32_t requesting_node,
 				uint8_t write)
 {
@@ -77,7 +77,7 @@ static void update_data_state(data_state *state, uint32_t requesting_node,
  * This function is called when the data is needed on the local node, this
  * returns a pointer to the local copy 
  *
- *			R 	W 	RW
+ *			R 	STARPU_W 	STARPU_RW
  *	Owner		OK	OK	OK
  *	Shared		OK	1	1
  *	Invalid		2	3	4
@@ -88,8 +88,8 @@ static void update_data_state(data_state *state, uint32_t requesting_node,
  * 	data copy + invalid->shared + owner->shared (STARPU_ASSERT(there is a valid))
  * case 3 : invalid + write : 
  * 	no data copy + invalid->owner + (owner,shared)->invalid
- * case 4 : invalid + R/W : 
- * 	data copy + if (W) (invalid->owner + owner->invalid) 
+ * case 4 : invalid + R/STARPU_W : 
+ * 	data copy + if (STARPU_W) (invalid->owner + owner->invalid) 
  * 		    else (invalid,owner->shared)
  */
 
@@ -166,8 +166,8 @@ static int fetch_data(data_state *state, starpu_access_mode mode)
 	uint32_t requesting_node = get_local_memory_node(); 
 
 	uint8_t read, write;
-	read = (mode != W); /* then R or RW */
-	write = (mode != R); /* then W or RW */
+	read = (mode != STARPU_W); /* then R or STARPU_RW */
+	write = (mode != STARPU_R); /* then STARPU_W or STARPU_RW */
 
 #ifndef NO_DATA_RW_LOCK
 	if (write) {
@@ -327,7 +327,7 @@ static inline void _starpu_sync_data_with_mem_continuation(void *arg)
 
 	data_state *state = statenode->state;
 
-	ret = fetch_data(state, R);
+	ret = fetch_data(state, STARPU_R);
 	
 	STARPU_ASSERT(!ret);
 	
@@ -358,7 +358,7 @@ void starpu_sync_data_with_mem(data_state *state)
 	/* we try to get the data, if we do not succeed immediately, we set a
  	* callback function that will be executed automatically when the data is
  	* available again, otherwise we fetch the data directly */
-	if (!attempt_to_submit_data_request_from_apps(state, R, 
+	if (!attempt_to_submit_data_request_from_apps(state, STARPU_R, 
 			_starpu_sync_data_with_mem_continuation, &statenode))
 	{
 		/* no one has locked this data yet, so we proceed immediately */
@@ -371,9 +371,9 @@ void starpu_sync_data_with_mem(data_state *state)
 		pthread_mutex_unlock(&statenode.lock);
 	}
 #else
-	/* NB: fetch_data automatically grabs the RW-lock so it needs to be
+	/* NB: fetch_data automatically grabs the STARPU_RW-lock so it needs to be
  	 * released explicitely afterward */
-	ret = fetch_data(state, R);
+	ret = fetch_data(state, STARPU_R);
 	STARPU_ASSERT(!ret);
 
 	release_rw_lock(&state->data_lock);
@@ -422,7 +422,7 @@ void starpu_notify_data_modification(data_state *state, uint32_t modifying_node)
 		.finished = 0
 	};
 
-	if (!attempt_to_submit_data_request_from_apps(state, W, _notify_data_modification_continuation, &statenode))
+	if (!attempt_to_submit_data_request_from_apps(state, STARPU_W, _notify_data_modification_continuation, &statenode))
 	{
 		/* we can immediately proceed */
 		do_notify_data_modification(state, modifying_node);

src/drivers/gordon/driver_gordon.c

@@ -108,10 +108,10 @@ static void starpu_to_gordon_buffers(job_t j, struct gordon_ppu_job_s *gordon_jo
 			case R:
 				nin++;
 				break;
-			case W:
+			case STARPU_W:
 				nout++;
 				break;
-			case RW:
+			case STARPU_RW:
 			default:
 				ninout++;
 				break;
@@ -128,10 +128,10 @@ static void starpu_to_gordon_buffers(job_t j, struct gordon_ppu_job_s *gordon_jo
 			case R:
 				gordon_buffer = in++;
 				break;
-			case W:
+			case STARPU_W:
 				gordon_buffer = nin + ninout + out++;
 				break;
-			case RW:
+			case STARPU_RW:
 			default:
 				gordon_buffer = nin + inout++;
 				break;

tests/microbenchs/sync_and_notify_data.c

@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 			task->cl = &cl_inc_a;
 
 			task->buffers[0].state = v_handle;
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 
 			task->synchronous = 1;
 
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 			task->cl = &cl_inc_c;
 
 			task->buffers[0].state = v_handle;
-			task->buffers[0].mode = RW;
+			task->buffers[0].mode = STARPU_RW;
 
 			task->synchronous = 1;