瀏覽代碼

Remove the dump_data_interface field of the data_interface_ops_t structure as
it has been useless since we removed the CUDA driver API a while ago.

Cédric Augonnet 15 年之前
父節點
當前提交
c113a7a008

+ 0 - 22
src/datawizard/interfaces/bcsr_interface.c

@@ -49,7 +49,6 @@ static const struct copy_data_methods_s bcsr_copy_data_methods_s = {
 
 static size_t allocate_bcsr_buffer_on_node(struct starpu_data_state_t *state, uint32_t dst_node);
 static void liberate_bcsr_buffer_on_node(starpu_data_interface_t *interface, uint32_t node);
-static size_t dump_bcsr_interface(starpu_data_interface_t *interface, void *_buffer);
 static size_t bcsr_interface_get_size(struct starpu_data_state_t *state);
 static uint32_t footprint_bcsr_interface_crc32(data_state *state, uint32_t hstate);
 
@@ -57,7 +56,6 @@ struct data_interface_ops_t interface_bcsr_ops = {
 	.allocate_data_on_node = allocate_bcsr_buffer_on_node,
 	.liberate_data_on_node = liberate_bcsr_buffer_on_node,
 	.copy_methods = &bcsr_copy_data_methods_s,
-	.dump_data_interface = dump_bcsr_interface,
 	.get_size = bcsr_interface_get_size,
 	.interfaceid = STARPU_BCSCR_INTERFACE_ID,
 	.footprint = footprint_bcsr_interface_crc32
@@ -119,8 +117,6 @@ static uint32_t footprint_bcsr_interface_crc32(data_state *state, uint32_t hstat
 	return footprint_bcsr_interface_generic(crc32_be, state, hstate);
 }
 
-
-
 struct dumped_bcsr_interface_s {
 	uint32_t nnz;
 	uint32_t nrow;
@@ -133,24 +129,6 @@ struct dumped_bcsr_interface_s {
 	uint32_t elemsize;
 }  __attribute__ ((packed));
 
-static size_t dump_bcsr_interface(starpu_data_interface_t *interface, void *_buffer)
-{
-	/* yes, that's DIRTY ... */
-	struct dumped_bcsr_interface_s *buffer = _buffer;
-
-	buffer->nnz = (*interface).bcsr.nnz;
-	buffer->nrow = (*interface).bcsr.nrow;
-	buffer->nzval = (*interface).bcsr.nzval;
-	buffer->colind = (*interface).bcsr.colind;
-	buffer->rowptr = (*interface).bcsr.rowptr;
-	buffer->firstentry = (*interface).bcsr.firstentry;
-	buffer->r = (*interface).bcsr.r;
-	buffer->c = (*interface).bcsr.c;
-	buffer->elemsize = (*interface).bcsr.elemsize;
-
-	return (sizeof(struct dumped_bcsr_interface_s));
-}
-
 /* offer an access to the data parameters */
 uint32_t starpu_get_bcsr_nnz(struct starpu_data_state_t *state)
 {

+ 0 - 15
src/datawizard/interfaces/blas_interface.c

@@ -56,7 +56,6 @@ static const struct copy_data_methods_s blas_copy_data_methods_s = {
 
 static size_t allocate_blas_buffer_on_node(data_state *state, uint32_t dst_node);
 static void liberate_blas_buffer_on_node(starpu_data_interface_t *interface, uint32_t node);
-static size_t dump_blas_interface(starpu_data_interface_t *interface, void *buffer);
 static size_t blas_interface_get_size(struct starpu_data_state_t *state);
 static uint32_t footprint_blas_interface_crc32(data_state *state, uint32_t hstate);
 static void display_blas_interface(data_state *state, FILE *f);
@@ -68,7 +67,6 @@ struct data_interface_ops_t interface_blas_ops = {
 	.allocate_data_on_node = allocate_blas_buffer_on_node,
 	.liberate_data_on_node = liberate_blas_buffer_on_node,
 	.copy_methods = &blas_copy_data_methods_s,
-	.dump_data_interface = dump_blas_interface,
 	.get_size = blas_interface_get_size,
 	.footprint = footprint_blas_interface_crc32,
 #ifdef USE_GORDON
@@ -163,19 +161,6 @@ static void display_blas_interface(data_state *state, FILE *f)
 	fprintf(f, "%u\t%u\t", interface->nx, interface->ny);
 }
 
-static size_t dump_blas_interface(starpu_data_interface_t *interface, void *_buffer)
-{
-	/* yes, that's DIRTY ... */
-	struct dumped_blas_interface_s *buffer = _buffer;
-
-	buffer->ptr = (*interface).blas.ptr;
-	buffer->nx = (*interface).blas.nx;
-	buffer->ny = (*interface).blas.ny;
-	buffer->ld = (*interface).blas.ld;
-
-	return (sizeof(struct dumped_blas_interface_s));
-}
-
 static size_t blas_interface_get_size(struct starpu_data_state_t *state)
 {
 	starpu_blas_interface_t *interface =

+ 0 - 17
src/datawizard/interfaces/block_interface.c

@@ -50,7 +50,6 @@ static const struct copy_data_methods_s block_copy_data_methods_s = {
 
 static size_t allocate_block_buffer_on_node(data_state *state, uint32_t dst_node);
 static void liberate_block_buffer_on_node(starpu_data_interface_t *interface, uint32_t node);
-static size_t dump_block_interface(starpu_data_interface_t *interface, void *buffer);
 static size_t block_interface_get_size(struct starpu_data_state_t *state);
 static uint32_t footprint_block_interface_crc32(data_state *state, uint32_t hstate);
 static void display_block_interface(data_state *state, FILE *f);
@@ -62,7 +61,6 @@ struct data_interface_ops_t interface_block_ops = {
 	.allocate_data_on_node = allocate_block_buffer_on_node,
 	.liberate_data_on_node = liberate_block_buffer_on_node,
 	.copy_methods = &block_copy_data_methods_s,
-	.dump_data_interface = dump_block_interface,
 	.get_size = block_interface_get_size,
 	.footprint = footprint_block_interface_crc32,
 #ifdef USE_GORDON
@@ -156,21 +154,6 @@ static void display_block_interface(data_state *state, FILE *f)
 	fprintf(f, "%u\t%u\t%u\t", interface->nx, interface->ny, interface->nz);
 }
 
-static size_t dump_block_interface(starpu_data_interface_t *interface, void *_buffer)
-{
-	/* yes, that's DIRTY ... */
-	struct dumped_block_interface_s *buffer = _buffer;
-
-	buffer->ptr = (*interface).block.ptr;
-	buffer->nx = (*interface).block.nx;
-	buffer->ny = (*interface).block.ny;
-	buffer->nz = (*interface).block.nz;
-	buffer->ldy = (*interface).block.ldy;
-	buffer->ldz = (*interface).block.ldz;
-
-	return (sizeof(struct dumped_block_interface_s));
-}
-
 static size_t block_interface_get_size(struct starpu_data_state_t *state)
 {
 	size_t size;

+ 0 - 18
src/datawizard/interfaces/csr_interface.c

@@ -46,7 +46,6 @@ static const struct copy_data_methods_s csr_copy_data_methods_s = {
 
 static size_t allocate_csr_buffer_on_node(struct starpu_data_state_t *state, uint32_t dst_node);
 static void liberate_csr_buffer_on_node(starpu_data_interface_t *interface, uint32_t node);
-static size_t dump_csr_interface(starpu_data_interface_t *interface, void *_buffer);
 static size_t csr_interface_get_size(struct starpu_data_state_t *state);
 static uint32_t footprint_csr_interface_crc32(data_state *state, uint32_t hstate);
 
@@ -54,7 +53,6 @@ struct data_interface_ops_t interface_csr_ops = {
 	.allocate_data_on_node = allocate_csr_buffer_on_node,
 	.liberate_data_on_node = liberate_csr_buffer_on_node,
 	.copy_methods = &csr_copy_data_methods_s,
-	.dump_data_interface = dump_csr_interface,
 	.get_size = csr_interface_get_size,
 	.interfaceid = STARPU_CSR_INTERFACE_ID,
 	.footprint = footprint_csr_interface_crc32
@@ -126,22 +124,6 @@ struct dumped_csr_interface_s {
 	uint32_t elemsize;
 }  __attribute__ ((packed));
 
-static size_t dump_csr_interface(starpu_data_interface_t *interface, void *_buffer)
-{
-	/* yes, that's DIRTY ... */
-	struct dumped_csr_interface_s *buffer = _buffer;
-
-	buffer->nnz = (*interface).csr.nnz;
-	buffer->nrow = (*interface).csr.nrow;
-	buffer->nzval = (*interface).csr.nzval;
-	buffer->colind = (*interface).csr.colind;
-	buffer->rowptr = (*interface).csr.rowptr;
-	buffer->firstentry = (*interface).csr.firstentry;
-	buffer->elemsize = (*interface).csr.elemsize;
-
-	return (sizeof(struct dumped_csr_interface_s));
-}
-
 /* offer an access to the data parameters */
 uint32_t starpu_get_csr_nnz(struct starpu_data_state_t *state)
 {

+ 0 - 2
src/datawizard/interfaces/data_interface.h

@@ -35,8 +35,6 @@ struct data_interface_ops_t {
 	void (*liberate_data_on_node)(starpu_data_interface_t *interface,
 					uint32_t node);
 	const struct copy_data_methods_s *copy_methods;
-	size_t (*dump_data_interface)(starpu_data_interface_t *interface, 
-					void *buffer);
 	size_t (*get_size)(struct starpu_data_state_t *state);
 	uint32_t (*footprint)(struct starpu_data_state_t *state, uint32_t hstate);
 	void (*display)(struct starpu_data_state_t *state, FILE *f);

+ 0 - 15
src/datawizard/interfaces/vector_interface.c

@@ -54,7 +54,6 @@ static const struct copy_data_methods_s vector_copy_data_methods_s = {
 
 static size_t allocate_vector_buffer_on_node(data_state *state, uint32_t dst_node);
 static void liberate_vector_buffer_on_node(starpu_data_interface_t *interface, uint32_t node);
-static size_t dump_vector_interface(starpu_data_interface_t *interface, void *buffer);
 static size_t vector_interface_get_size(struct starpu_data_state_t *state);
 static uint32_t footprint_vector_interface_crc32(data_state *state, uint32_t hstate);
 static void display_vector_interface(data_state *state, FILE *f);
@@ -66,7 +65,6 @@ struct data_interface_ops_t interface_vector_ops = {
 	.allocate_data_on_node = allocate_vector_buffer_on_node,
 	.liberate_data_on_node = liberate_vector_buffer_on_node,
 	.copy_methods = &vector_copy_data_methods_s,
-	.dump_data_interface = dump_vector_interface,
 	.get_size = vector_interface_get_size,
 	.footprint = footprint_vector_interface_crc32,
 #ifdef USE_GORDON
@@ -148,19 +146,6 @@ static void display_vector_interface(data_state *state, FILE *f)
 	fprintf(f, "%u\t", interface->nx);
 }
 
-
-static size_t dump_vector_interface(starpu_data_interface_t *interface, void *_buffer)
-{
-	/* yes, that's DIRTY ... */
-	struct dumped_vector_interface_s *buffer = _buffer;
-
-	buffer->ptr = (*interface).vector.ptr;
-	buffer->nx = (*interface).vector.nx;
-	buffer->elemsize = (*interface).vector.elemsize;
-
-	return (sizeof(struct dumped_vector_interface_s));
-}
-
 static size_t vector_interface_get_size(struct starpu_data_state_t *state)
 {
 	size_t size;