Turn starpu_is_multiformat_handle into starpu_data_is_multiformat_handle.

include/starpu_data_interfaces.h

@@ -401,7 +401,7 @@ void starpu_multiformat_data_register(starpu_data_handle_t *handle,
 
 #define STARPU_MULTIFORMAT_GET_NX(interface)  (((struct starpu_multiformat_interface *)(interface))->nx)
 
-int starpu_is_multiformat_handle(starpu_data_handle_t handle);
+int starpu_data_is_multiformat_handle(starpu_data_handle_t handle);
 
 enum starpu_data_interface_id starpu_get_handle_interface_id(starpu_data_handle_t handle);
 

src/core/perfmodel/perfmodel.c

@@ -264,7 +264,7 @@ double starpu_task_expected_conversion_time(struct starpu_task *task,
 		struct starpu_task *conversion_task;
 
 		handle = task->handles[i];
-		if (!starpu_is_multiformat_handle(handle))
+		if (!starpu_data_is_multiformat_handle(handle))
 			continue;
 
 		if (arch >= STARPU_CPU_DEFAULT && arch < STARPU_CUDA_DEFAULT)

src/core/task.c

@@ -652,7 +652,7 @@ _starpu_task_uses_multiformat_handles(struct starpu_task *task)
 	unsigned i;
 	for (i = 0; i < task->cl->nbuffers; i++)
 	{
-		if (starpu_is_multiformat_handle(task->handles[i]))
+		if (starpu_data_is_multiformat_handle(task->handles[i]))
 			return 1;
 	}
 

src/datawizard/filters.c

@@ -269,7 +269,7 @@ void starpu_data_unpartition(starpu_data_handle_t root_handle, uint32_t gatherin
 			starpu_data_unpartition(child_handle, gathering_node);
 
 		/* If this is a multiformat handle, we must convert the data now */
-		if (starpu_is_multiformat_handle(child_handle) &&
+		if (starpu_data_is_multiformat_handle(child_handle) &&
 			starpu_node_get_kind(child_handle->mf_node) != STARPU_CPU_RAM)
 		{
 			struct starpu_codelet cl =

src/datawizard/interfaces/data_interface.c

@@ -92,7 +92,7 @@ starpu_data_handle_t starpu_data_lookup(const void *ptr)
 }
 
 int
-starpu_is_multiformat_handle(starpu_data_handle_t handle)
+starpu_data_is_multiformat_handle(starpu_data_handle_t handle)
 {
 	return handle->ops->is_multiformat;
 }
@@ -459,7 +459,7 @@ static void _starpu_data_unregister(starpu_data_handle_t handle, unsigned cohere
 		 * this piece of data back into the CPU format.
 		 * XXX : This is quite hacky, could we submit a task instead ?
 		 */
-		if (starpu_is_multiformat_handle(handle) &&
+		if (starpu_data_is_multiformat_handle(handle) &&
 			starpu_node_get_kind(handle->mf_node) != STARPU_CPU_RAM)
 		{
 			_STARPU_DEBUG("Conversion needed\n");

src/datawizard/user_interactions.c

@@ -207,7 +207,7 @@ int starpu_data_acquire(starpu_data_handle_t handle, enum starpu_access_mode mod
 		return -EDEADLK;
         }
 
-	if (starpu_is_multiformat_handle(handle) &&
+	if (starpu_data_is_multiformat_handle(handle) &&
 	    _starpu_handle_needs_conversion_task(handle, 0))
 	{
 		struct starpu_task *task = _starpu_create_conversion_task(handle, 0);