followup to r1803: Rename the "blas" interface into "matrix"

mpi/starpu_mpi_datatype.c

@@ -25,17 +25,17 @@ typedef int (*handle_to_datatype_func)(starpu_data_handle, MPI_Datatype *);
 typedef void *(*handle_to_ptr_func)(starpu_data_handle);
 
 /*
- * 	Blas
+ * 	Matrix
  */
 
-static int handle_to_datatype_blas(starpu_data_handle data_handle, MPI_Datatype *datatype)
+static int handle_to_datatype_matrix(starpu_data_handle data_handle, MPI_Datatype *datatype)
 {
 	int ret;
 
 	unsigned nx = starpu_get_matrix_nx(data_handle);
 	unsigned ny = starpu_get_matrix_ny(data_handle);
-	unsigned ld = starpu_get_blas_local_ld(data_handle);
-	size_t elemsize = starpu_get_blas_elemsize(data_handle);
+	unsigned ld = starpu_get_matrix_local_ld(data_handle);
+	size_t elemsize = starpu_get_matrix_elemsize(data_handle);
 
 	ret = MPI_Type_vector(ny, nx*elemsize, ld*elemsize, MPI_BYTE, datatype);
 	STARPU_ASSERT(ret == MPI_SUCCESS);
@@ -46,9 +46,9 @@ static int handle_to_datatype_blas(starpu_data_handle data_handle, MPI_Datatype
 	return 0;
 }
 
-static void *handle_to_ptr_blas(starpu_data_handle data_handle)
+static void *handle_to_ptr_matrix(starpu_data_handle data_handle)
 {
-	return (void *)starpu_get_blas_local_ptr(data_handle);
+	return (void *)starpu_get_matrix_local_ptr(data_handle);
 }
 
 /*
@@ -117,7 +117,7 @@ static void *handle_to_ptr_vector(starpu_data_handle data_handle)
  */
 
 static handle_to_datatype_func handle_to_datatype_funcs[STARPU_NINTERFACES_ID] = {
-	[STARPU_MATRIX_INTERFACE_ID]	= handle_to_datatype_blas,
+	[STARPU_MATRIX_INTERFACE_ID]	= handle_to_datatype_matrix,
 	[STARPU_BLOCK_INTERFACE_ID]	= handle_to_datatype_block,
 	[STARPU_VECTOR_INTERFACE_ID]	= handle_to_datatype_vector,
 	[STARPU_CSR_INTERFACE_ID]	= NULL,
@@ -126,7 +126,7 @@ static handle_to_datatype_func handle_to_datatype_funcs[STARPU_NINTERFACES_ID] =
 };
 
 static handle_to_ptr_func handle_to_ptr_funcs[STARPU_NINTERFACES_ID] = {
-	[STARPU_MATRIX_INTERFACE_ID]	= handle_to_ptr_blas,
+	[STARPU_MATRIX_INTERFACE_ID]	= handle_to_ptr_matrix,
 	[STARPU_BLOCK_INTERFACE_ID]	= handle_to_ptr_block,
 	[STARPU_VECTOR_INTERFACE_ID]	= handle_to_ptr_vector,
 	[STARPU_CSR_INTERFACE_ID]	= NULL,