replace 0 with macro part 3

tests/datawizard/interfaces/bcsr/bcsr_interface.c

@@ -94,7 +94,7 @@ static void
 register_data(void)
 {
 	starpu_bcsr_data_register(&bcsr_handle,
-				  0,
+				  STARPU_MAIN_RAM,
 				  NNZ_BLOCKS,
 				  1, /* nrow */
 				  (uintptr_t) nzval,
@@ -106,7 +106,7 @@ register_data(void)
 				  sizeof(nzval[0]));
 
 	starpu_bcsr_data_register(&bcsr2_handle,
-				  0,
+				  STARPU_MAIN_RAM,
 				  NNZ_BLOCKS,
 				  1, /* nrow */
 				  (uintptr_t) nzval2,

tests/datawizard/interfaces/block/block_interface.c

@@ -71,7 +71,7 @@ register_data(void)
 
 	/* Registering data */
 	starpu_block_data_register(&_block_handle,
-                                    0,
+                                    STARPU_MAIN_RAM,
                                     (uintptr_t)_block,
 				    NX,
 				    NX * NY,
@@ -80,7 +80,7 @@ register_data(void)
 				    NZ,
 				    sizeof(_block[0]));
 	starpu_block_data_register(&_block2_handle,
-                                    0,
+                                    STARPU_MAIN_RAM,
                                     (uintptr_t)_block2,
 				    NX,
 				    NX * NY,

tests/datawizard/interfaces/coo/coo_interface.c

@@ -121,7 +121,7 @@ register_data(void)
 	}
 
 	starpu_coo_data_register(&coo_handle,
-				0,
+				STARPU_MAIN_RAM,
 				NX,
 				NY,
 				MATRIX_SIZE,
@@ -130,7 +130,7 @@ register_data(void)
 				(uintptr_t) values,
 				sizeof(values[0]));
 	starpu_coo_data_register(&coo2_handle,
-				0,
+				STARPU_MAIN_RAM,
 				NX,
 				NY,
 				MATRIX_SIZE,

tests/datawizard/interfaces/copy_interfaces.c

@@ -33,8 +33,8 @@ static int check_copy(starpu_data_handle_t handle, char *header)
 		fprintf(stderr, "\n");
 	}
 
-	old_interface = starpu_data_get_interface_on_node(handle, 0);
-	new_interface = starpu_data_get_interface_on_node(new_handle, 0);
+	old_interface = starpu_data_get_interface_on_node(handle, STARPU_MAIN_RAM);
+	new_interface = starpu_data_get_interface_on_node(new_handle, STARPU_MAIN_RAM);
 
 	if (new_handle->ops->compare(old_interface, new_interface) == 0)
 	{
@@ -57,14 +57,14 @@ int main(int argc, char **argv)
 
 	{
 		int x=42;
-		starpu_variable_data_register(&handle, 0, (uintptr_t)&x, sizeof(x));
+		starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)&x, sizeof(x));
 		ret = check_copy(handle, "variable");
 	}
 
 	if (ret == 0)
 	{
 		int xx[] = {12, 23, 45};
-		starpu_vector_data_register(&handle, 0, (uintptr_t)xx, 3, sizeof(xx[0]));
+		starpu_vector_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)xx, 3, sizeof(xx[0]));
 		ret = check_copy(handle, "vector");
 	}
 
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 		int NX=3;
 		int NY=2;
 		int matrix[NX][NY];
-		starpu_matrix_data_register(&handle, 0, (uintptr_t)matrix, NX, NX, NY, sizeof(matrix[0]));
+		starpu_matrix_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)matrix, NX, NX, NY, sizeof(matrix[0]));
 		ret = check_copy(handle, "matrix");
 	}
 
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 		int NY=2;
 		int NZ=4;
 		int block[NX*NY*NZ];
-		starpu_block_data_register(&handle, 0, (uintptr_t)block, NX, NX*NY, NX, NY, NZ, sizeof(block[0]));
+		starpu_block_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)block, NX, NX*NY, NX, NY, NZ, sizeof(block[0]));
 		ret = check_copy(handle, "block");
 	}
 
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 		float nzvalA[20];
 		uint32_t colind[1];
 		uint32_t rowptr[2];
-		starpu_csr_data_register(&handle, 0, nnz, nrow, (uintptr_t)nzvalA, colind, rowptr, 0, sizeof(float));
+		starpu_csr_data_register(&handle, STARPU_MAIN_RAM, nnz, nrow, (uintptr_t)nzvalA, colind, rowptr, 0, sizeof(float));
 		ret = check_copy(handle, "csr");
 	}
 

tests/datawizard/interfaces/csr/csr_interface.c

@@ -90,7 +90,7 @@ register_data(void)
 	rowptr2[HEIGHT] = rowptr[HEIGHT];
 
 	starpu_csr_data_register(&csr_handle,
-				 0,
+				 STARPU_MAIN_RAM,
 				 NNZ,
 				 HEIGHT,
 				 (uintptr_t) nzval,
@@ -99,7 +99,7 @@ register_data(void)
 				 0,
 				 sizeof(nzval[0]));
 	starpu_csr_data_register(&csr2_handle,
-				 0,
+				 STARPU_MAIN_RAM,
 				 NNZ,
 				 HEIGHT,
 				 (uintptr_t) nzval2,

tests/datawizard/interfaces/matrix/matrix_interface.c

@@ -67,14 +67,14 @@ register_data(void)
 		matrix[i] = i;
 
 	starpu_matrix_data_register(&matrix_handle,
-				    0,
+				    STARPU_MAIN_RAM,
 				    (uintptr_t) matrix,
 				    WIDTH, /* ld */
 				    WIDTH,
 				    HEIGHT,
 				    sizeof(matrix[0]));
 	starpu_matrix_data_register(&matrix2_handle,
-				    0,
+				    STARPU_MAIN_RAM,
 				    (uintptr_t) matrix2,
 				    WIDTH, /* ld */
 				    WIDTH,

tests/datawizard/interfaces/multiformat/advanced/multiformat_cuda_opencl.c

@@ -88,7 +88,7 @@ register_handle(void)
 	int i;
 	for (i = 0; i < NX; i++)
 		vector[i] = i;
-	starpu_multiformat_data_register(&handle, 0, vector, NX, &ops);
+	starpu_multiformat_data_register(&handle, STARPU_MAIN_RAM, vector, NX, &ops);
 }
 
 static void

tests/datawizard/interfaces/multiformat/advanced/multiformat_data_release.c

@@ -34,7 +34,7 @@ register_handle(void)
 	int i;
 	for (i = 0; i < NX; i++)
 		vector[i] = i;
-	starpu_multiformat_data_register(&handle, 0, vector, NX, &ops);
+	starpu_multiformat_data_register(&handle, STARPU_MAIN_RAM, vector, NX, &ops);
 }
 
 static void

tests/datawizard/interfaces/multiformat/advanced/multiformat_handle_conversion.c

@@ -131,8 +131,8 @@ test_cuda(void)
 		vector2[i] = i;
 	}
 
-	starpu_multiformat_data_register(&handles[0], 0, vector1, NX, &ops);
-	starpu_multiformat_data_register(&handles[1], 0, vector2, NX, &ops);
+	starpu_multiformat_data_register(&handles[0], STARPU_MAIN_RAM, vector1, NX, &ops);
+	starpu_multiformat_data_register(&handles[1], STARPU_MAIN_RAM, vector2, NX, &ops);
 
 	memset(&global_stats, 0, sizeof(global_stats));
 	create_and_submit_tasks(STARPU_CUDA, handles);
@@ -181,8 +181,8 @@ test_opencl(void)
 		vector2[i] = i;
 	}
 
-	starpu_multiformat_data_register(&handles[0], 0, vector1, NX, &ops);
-	starpu_multiformat_data_register(&handles[1], 0, vector2, NX, &ops);
+	starpu_multiformat_data_register(&handles[0], STARPU_MAIN_RAM, vector1, NX, &ops);
+	starpu_multiformat_data_register(&handles[1], STARPU_MAIN_RAM, vector2, NX, &ops);
 
 	memset(&global_stats, 0, sizeof(global_stats));
 	create_and_submit_tasks(STARPU_OPENCL, handles);
@@ -231,8 +231,8 @@ test_mic(void)
 		vector2[i] = i;
 	}
 
-	starpu_multiformat_data_register(&handles[0], 0, vector1, NX, &ops);
-	starpu_multiformat_data_register(&handles[1], 0, vector2, NX, &ops);
+	starpu_multiformat_data_register(&handles[0], STARPU_MAIN_RAM, vector1, NX, &ops);
+	starpu_multiformat_data_register(&handles[1], STARPU_MAIN_RAM, vector2, NX, &ops);
 
 	memset(&global_stats, 0, sizeof(global_stats));
 	create_and_submit_tasks(STARPU_MIC, handles);

tests/datawizard/interfaces/multiformat/advanced/multiformat_worker.c

@@ -58,7 +58,7 @@ register_handle(void)
 	int i;
 	for (i = 0; i < NX; i++)
 		vector[i] = i;
-	starpu_multiformat_data_register(&handle, 0, vector, NX, &ops);
+	starpu_multiformat_data_register(&handle, STARPU_MAIN_RAM, vector, NX, &ops);
 }
 
 static void

tests/datawizard/interfaces/multiformat/advanced/same_handle.c

@@ -47,7 +47,7 @@ register_handle(void)
 	int i;
 	for (i = 0; i < NX; i++)
 		vector[i] = i;
-	starpu_multiformat_data_register(&handle, 0, vector, NX, &ops);
+	starpu_multiformat_data_register(&handle, STARPU_MAIN_RAM, vector, NX, &ops);
 }
 
 static void

tests/datawizard/interfaces/multiformat/multiformat_interface.c

@@ -149,12 +149,12 @@ register_data(void)
 		array_of_structs[i].y = i;
 	}
 	starpu_multiformat_data_register(&multiformat_handle,
-					 0,
+					 STARPU_MAIN_RAM,
 					 &array_of_structs,
 					 N_ELEMENTS,
 					 &format_ops);
 	starpu_multiformat_data_register(&multiformat_dummy_handle,
-					 0,
+					 STARPU_MAIN_RAM,
 					 &array_of_structs_dummy,
 					 N_ELEMENTS,
 					 &format_ops);

tests/datawizard/interfaces/test_interfaces.c

@@ -664,12 +664,12 @@ ram_to_ram(void)
 	dst = *current_config->dummy_handle;
 
 	/* We do not care about the nodes */
-	src_interface = starpu_data_get_interface_on_node(src, 0);
-	dst_interface = starpu_data_get_interface_on_node(dst, 0);
+	src_interface = starpu_data_get_interface_on_node(src, STARPU_MAIN_RAM);
+	dst_interface = starpu_data_get_interface_on_node(dst, STARPU_MAIN_RAM);
 	if (src->ops->copy_methods->ram_to_ram)
-		src->ops->copy_methods->ram_to_ram(src_interface, 0, dst_interface, 0);
+		src->ops->copy_methods->ram_to_ram(src_interface, STARPU_MAIN_RAM, dst_interface, STARPU_MAIN_RAM);
 	else
-		src->ops->copy_methods->any_to_any(src_interface, 0, dst_interface, 0, NULL);
+		src->ops->copy_methods->any_to_any(src_interface, STARPU_MAIN_RAM, dst_interface, STARPU_MAIN_RAM, NULL);
 
 	err = create_task(&task, STARPU_CPU_WORKER, -1);
 	if (err != 0)
@@ -764,8 +764,8 @@ compare(void)
 
 	handle = *current_config->handle;
 	dummy_handle = *current_config->dummy_handle;
-	interface_a = starpu_data_get_interface_on_node(handle, 0);
-	interface_b = starpu_data_get_interface_on_node(dummy_handle, 0);
+	interface_a = starpu_data_get_interface_on_node(handle, STARPU_MAIN_RAM);
+	interface_b = starpu_data_get_interface_on_node(dummy_handle, STARPU_MAIN_RAM);
 
 	err = handle->ops->compare(interface_a, interface_b);
 

tests/datawizard/interfaces/variable/variable_interface.c

@@ -77,9 +77,9 @@ void register_data(void)
 	variable = 42;
 	variable2 = 12;
 
-	starpu_variable_data_register(&variable_handle, 0,
+	starpu_variable_data_register(&variable_handle, STARPU_MAIN_RAM,
 				      (uintptr_t) &variable, sizeof(variable));
-	starpu_variable_data_register(&variable2_handle, 0,
+	starpu_variable_data_register(&variable2_handle, STARPU_MAIN_RAM,
 				      (uintptr_t) &variable2, sizeof(variable2));
 }
 

tests/datawizard/interfaces/vector/test_vector_interface.c

@@ -65,12 +65,12 @@ register_data(void)
 
 	/* Registering data */
 	starpu_vector_data_register(&vector_handle,
-                                    0,
+                                    STARPU_MAIN_RAM,
                                     (uintptr_t)vector,
 				    VECTOR_SIZE,
 				    sizeof(int));
 	starpu_vector_data_register(&vector2_handle,
-                                    0,
+                                    STARPU_MAIN_RAM,
                                     (uintptr_t)vector2,
 				    VECTOR_SIZE,
 				    sizeof(int));

tests/datawizard/scratch.c

@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 #endif
 	A = (unsigned *) calloc(VECTORSIZE, sizeof(unsigned));
 
-	starpu_vector_data_register(&A_handle, 0, (uintptr_t)A, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&A_handle, STARPU_MAIN_RAM, (uintptr_t)A, VECTORSIZE, sizeof(unsigned));
 	starpu_vector_data_register(&B_handle, -1, (uintptr_t)NULL, VECTORSIZE, sizeof(unsigned));
 
 	unsigned loop;

tests/datawizard/sync_and_notify_data.c

@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_load_opencl_from_file");
 #endif
 
-        starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
+        starpu_vector_data_register(&v_handle, STARPU_MAIN_RAM, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned iter;
 	for (iter = 0; iter < k; iter++)

tests/datawizard/sync_and_notify_data_implicit.c

@@ -124,7 +124,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_load_opencl_from_file");
 #endif
 
-        starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
+        starpu_vector_data_register(&v_handle, STARPU_MAIN_RAM, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned iter;
 	for (iter = 0; iter < k; iter++)

tests/datawizard/sync_with_data_with_mem.c

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 	{
 		ret = starpu_malloc((void **)&buffer[b], vectorsize);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
-		starpu_vector_data_register(&v_handle[b], 0,
+		starpu_vector_data_register(&v_handle[b], STARPU_MAIN_RAM,
 				(uintptr_t)buffer[b], vectorsize, sizeof(char));
 	}
 

tests/datawizard/sync_with_data_with_mem_non_blocking.c

@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	{
 		ret = starpu_malloc((void **)&buffer[b], vectorsize);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
-		starpu_vector_data_register(&v_handle[b], 0,
+		starpu_vector_data_register(&v_handle[b], STARPU_MAIN_RAM,
 				(uintptr_t)buffer[b], vectorsize, sizeof(char));
 		starpu_data_set_sequential_consistency_flag(v_handle[b], 0);
 	}

tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c

@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	{
 		ret = starpu_malloc((void **)&buffer[b], vectorsize);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
-		starpu_vector_data_register(&v_handle[b], 0,
+		starpu_vector_data_register(&v_handle[b], STARPU_MAIN_RAM,
 				(uintptr_t)buffer[b], vectorsize, sizeof(char));
 	}
 

tests/datawizard/unpartition.c

@@ -75,7 +75,7 @@ int main(int argc, char **argv)
 	ret = starpu_malloc((void **)&buffer, VECTORSIZE);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
 
-	starpu_vector_data_register(&v_handle, 0, (uintptr_t)buffer, VECTORSIZE, sizeof(char));
+	starpu_vector_data_register(&v_handle, STARPU_MAIN_RAM, (uintptr_t)buffer, VECTORSIZE, sizeof(char));
 
 	struct starpu_data_filter f =
 	{
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 		ret = starpu_task_wait_for_all();
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait_for_all");
 
-		starpu_data_unpartition(v_handle, 0);
+		starpu_data_unpartition(v_handle, STARPU_MAIN_RAM);
 
 		tasks[2] = create_task(v_handle);
 		ret = starpu_task_submit(tasks[2]);

tests/datawizard/user_interaction_implicit.c

@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 	for (b = 0; b < NBUFFERS; b++)
 	{
 		buffers[b].index = b;
-		starpu_variable_data_register(&buffers[b].handle, 0, (uintptr_t)&buffers[b].val, sizeof(unsigned));
+		starpu_variable_data_register(&buffers[b].handle, STARPU_MAIN_RAM, (uintptr_t)&buffers[b].val, sizeof(unsigned));
 	}
 
 	unsigned iter;

tests/datawizard/wt_broadcast.c

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	starpu_variable_data_register(&handle, 0, (uintptr_t)&var, sizeof(unsigned));
+	starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)&var, sizeof(unsigned));
 
 	/* Create a mask with all the memory nodes, so that we can ask StarPU
 	 * to broadcast the handle whenever it is modified. */

tests/datawizard/wt_host.c

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	starpu_variable_data_register(&handle, 0, (uintptr_t)&var, sizeof(unsigned));
+	starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)&var, sizeof(unsigned));
 
 	/* Copy the handle in main memory every time it is modified */
 	uint32_t wt_mask = (1<<0);