Переглянути джерело

Remove definition of starpu_csc_interface_t

Nathalie Furmento 15 роки тому
батько
коміт
09ff2a9c19
2 змінених файлів з 5 додано та 21 видалено
  1. 3 17
      include/starpu_data_interfaces.h
  2. 2 4
      mpi/starpu_mpi_datatype.c

+ 3 - 17
include/starpu_data_interfaces.h

@@ -240,19 +240,6 @@ size_t starpu_csr_get_elemsize(starpu_data_handle handle);
 #define STARPU_GET_CSR_FIRSTENTRY(interface)	(((starpu_csr_interface_t *)(interface))->firstentry)
 #define STARPU_GET_CSR_ELEMSIZE(interface)	(((starpu_csr_interface_t *)(interface))->elemsize)
 
-/* CSC interface for sparse matrices (compressed sparse column representation) */
-typedef struct starpu_csc_interface_s {
-	int nnz; /* number of non-zero entries */
-	int nrow; /* number of rows */
-	float *nzval; /* non-zero values */
-	int *colind; /* position of non-zero entried on the row */
-	int *rowptr; /* index (in nzval) of the first entry of the row */
-
-	/* k for k-based indexing (0 or 1 usually) */
-	/* also useful when partitionning the matrix ... */
-	int firstentry; 
-} starpu_csc_interface_t;
-
 /* BCSR interface for sparse matrices (blocked compressed sparse row
  * representation) */
 typedef struct starpu_bcsr_interface_s {
@@ -293,10 +280,9 @@ size_t starpu_bcsr_get_elemsize(starpu_data_handle);
 #define STARPU_BLOCK_INTERFACE_ID	1
 #define STARPU_VECTOR_INTERFACE_ID	2
 #define STARPU_CSR_INTERFACE_ID		3
-#define STARPU_CSC_INTERFACE_ID		4
-#define STARPU_BCSCR_INTERFACE_ID	5
-#define STARPU_VARIABLE_INTERFACE_ID	6
-#define STARPU_NINTERFACES_ID		7 /* number of data interfaces */
+#define STARPU_BCSR_INTERFACE_ID	4
+#define STARPU_VARIABLE_INTERFACE_ID	5
+#define STARPU_NINTERFACES_ID		6 /* number of data interfaces */
 
 unsigned starpu_get_handle_interface_id(starpu_data_handle);
 

+ 2 - 4
mpi/starpu_mpi_datatype.c

@@ -121,8 +121,7 @@ static handle_to_datatype_func handle_to_datatype_funcs[STARPU_NINTERFACES_ID] =
 	[STARPU_BLOCK_INTERFACE_ID]	= handle_to_datatype_block,
 	[STARPU_VECTOR_INTERFACE_ID]	= handle_to_datatype_vector,
 	[STARPU_CSR_INTERFACE_ID]	= NULL,
-	[STARPU_CSC_INTERFACE_ID]	= NULL,
-	[STARPU_BCSCR_INTERFACE_ID]	= NULL
+	[STARPU_BCSR_INTERFACE_ID]	= NULL
 };
 
 static handle_to_ptr_func handle_to_ptr_funcs[STARPU_NINTERFACES_ID] = {
@@ -130,8 +129,7 @@ static handle_to_ptr_func handle_to_ptr_funcs[STARPU_NINTERFACES_ID] = {
 	[STARPU_BLOCK_INTERFACE_ID]	= handle_to_ptr_block,
 	[STARPU_VECTOR_INTERFACE_ID]	= handle_to_ptr_vector,
 	[STARPU_CSR_INTERFACE_ID]	= NULL,
-	[STARPU_CSC_INTERFACE_ID]	= NULL,
-	[STARPU_BCSCR_INTERFACE_ID]	= NULL
+	[STARPU_BCSR_INTERFACE_ID]	= NULL
 };
 
 int starpu_mpi_handle_to_datatype(starpu_data_handle data_handle, MPI_Datatype *datatype)