replace 0 with macro part 2

tests/datawizard/handle_to_pointer.c

@@ -110,19 +110,19 @@ int main(int argc, char *argv[])
 	err = starpu_malloc((void **)&pointer, count * sizeof(int));
 	STARPU_ASSERT((err == 0) && (pointer != NULL));
 
-	starpu_variable_data_register(&handle, 0, (uintptr_t)pointer,
+	starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)pointer,
 				      sizeof(int));
-	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, STARPU_MAIN_RAM) == pointer);
 	starpu_data_unregister(handle);
 
-	starpu_vector_data_register(&handle, 0, (uintptr_t)pointer,
+	starpu_vector_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)pointer,
 				    count, sizeof(int));
-	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, STARPU_MAIN_RAM) == pointer);
 	starpu_data_unregister(handle);
 
-	starpu_matrix_data_register(&handle, 0, (uintptr_t)pointer, 0,
+	starpu_matrix_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)pointer, 0,
 				    count, 1, sizeof(int));
-	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, 0) == pointer);
+	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, STARPU_MAIN_RAM) == pointer);
 	starpu_data_unregister(handle);
 
 	starpu_free(pointer);
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 	/* Lazy allocation.  */
 	starpu_vector_data_register(&handle, -1, 0 /* NULL */,
 				    count, sizeof(int));
-	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, 0) == NULL);
+	STARPU_ASSERT(starpu_data_handle_to_pointer(handle, STARPU_MAIN_RAM) == NULL);
 
 	/* Pass the handle to a task.  */
 	err = starpu_insert_task(&cl,
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
 
 	/* Make sure we have a local pointer to it.  */
 	ret = EXIT_SUCCESS;
-	pointer = (int *) starpu_data_handle_to_pointer(handle, 0);
+	pointer = (int *) starpu_data_handle_to_pointer(handle, STARPU_MAIN_RAM);
 	if (pointer == NULL)
 	{
 	     FPRINTF(stderr, "pointer should be non NULL\n");

tests/datawizard/in_place_partition.c

@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < size; i++)
 		foo[i] = i;
 
-	starpu_vector_data_register(&handle, 0, (uintptr_t)foo, size, sizeof(*foo));
+	starpu_vector_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)foo, size, sizeof(*foo));
 
 	/* Broadcast the data to force in-place partitioning */
 	for (i = 0; i < n; i++)
@@ -78,7 +78,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(handle, 0);
+	starpu_data_unpartition(handle, STARPU_MAIN_RAM);
 	starpu_data_unregister(handle);
 	starpu_shutdown();
 

tests/datawizard/increment_redux.c

@@ -218,7 +218,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));
 
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 

tests/datawizard/increment_redux_v2.c

@@ -231,7 +231,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));
 
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 

tests/datawizard/lazy_unregister.c

@@ -46,7 +46,7 @@ int main(void)
 		return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	starpu_variable_data_register(&handle, 0, (uintptr_t)buffer, 1024*sizeof(int));
+	starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)buffer, 1024*sizeof(int));
 
 	t1 = starpu_task_create();
 

tests/datawizard/manual_reduction.c

@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 
 	unsigned nworkers = starpu_worker_get_count();
 
-	starpu_variable_data_register(&variable_handle, 0, (uintptr_t)&variable, sizeof(unsigned));
+	starpu_variable_data_register(&variable_handle, STARPU_MAIN_RAM, (uintptr_t)&variable, sizeof(unsigned));
 
 	/* Allocate a per-worker handle on each worker (and initialize it to 0) */
 	starpu_execute_on_each_worker(initialize_per_worker_handle, NULL, STARPU_CPU|STARPU_CUDA|STARPU_OPENCL);

tests/datawizard/mpi_like.c

@@ -149,7 +149,7 @@ static void *thread_func(void *arg)
 	struct thread_data *thread_data = (struct thread_data *) arg;
 	unsigned index = thread_data->index;
 
-	starpu_variable_data_register(&thread_data->handle, 0, (uintptr_t)&thread_data->val, sizeof(unsigned));
+	starpu_variable_data_register(&thread_data->handle, STARPU_MAIN_RAM, (uintptr_t)&thread_data->val, sizeof(unsigned));
 
 	for (iter = 0; iter < NITER; iter++)
 	{

tests/datawizard/mpi_like_async.c

@@ -276,7 +276,7 @@ static void *thread_func(void *arg)
 	unsigned index = thread_data->index;
 	int ret;
 
-	starpu_variable_data_register(&thread_data->handle, 0, (uintptr_t)&thread_data->val, sizeof(unsigned));
+	starpu_variable_data_register(&thread_data->handle, STARPU_MAIN_RAM, (uintptr_t)&thread_data->val, sizeof(unsigned));
 
 	for (iter = 0; iter < niter; iter++)
 	{

tests/datawizard/partition_lazy.c

@@ -76,7 +76,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(handle, 0);
+	starpu_data_unpartition(handle, STARPU_MAIN_RAM);
 	starpu_data_unregister(handle);
 	starpu_shutdown();
 

tests/datawizard/readers_and_writers.c

@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* initialize the resource */
-	starpu_vector_data_register(&book_handle, 0, (uintptr_t)&book, 1, sizeof(unsigned));
+	starpu_vector_data_register(&book_handle, STARPU_MAIN_RAM, (uintptr_t)&book, 1, sizeof(unsigned));
 
 #ifdef STARPU_QUICK_CHECK
 	unsigned ntasks = 16;

tests/datawizard/readonly.c

@@ -47,7 +47,7 @@ int main(int argc, char **argv)
      int copy = starpu_asynchronous_copy_disabled();
      FPRINTF(stderr, "copy %d\n", copy);
 
-     starpu_variable_data_register(&handle, 0, (uintptr_t)&var, sizeof(var));
+     starpu_variable_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)&var, sizeof(var));
 
      ret = starpu_insert_task(&cl,
 			      STARPU_R, handle,

tests/datawizard/reclaim.c

@@ -122,7 +122,7 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "Cannot allocate more than %d buffers\n", mb);
 			break;
 		}
-		starpu_variable_data_register(&handle_array[i], 0, (uintptr_t)host_ptr_array[i], BLOCK_SIZE);
+		starpu_variable_data_register(&handle_array[i], STARPU_MAIN_RAM, (uintptr_t)host_ptr_array[i], BLOCK_SIZE);
 		STARPU_ASSERT(handle_array[i]);
 	}