data interfaces: remove references to functions which copy to and from SPU devices

doc/chapters/advanced-api.texi

@@ -297,7 +297,7 @@ Allocate data for the interface on a given node.
 Free data of the interface on a given node.
 
 @item @code{ const struct starpu_data_copy_methods *copy_methods}
-ram/cuda/spu/opencl synchronous and asynchronous transfer methods.
+ram/cuda/opencl synchronous and asynchronous transfer methods.
 
 @item @code{ void * (*handle_to_pointer)(starpu_data_handle_t handle, uint32_t node)}
 Return the current pointer (if any) for the handle on the given node.
@@ -338,8 +338,8 @@ Unpack the data handle from the contiguous buffer at the address @code{ptr} of s
 @deftp {Data Type} {struct starpu_data_copy_methods}
 Defines the per-interface methods.
 @table @asis
-@item @code{int @{ram,cuda,opencl,spu@}_to_@{ram,cuda,opencl,spu@}(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node)}
-These 16 functions define how to copy data from the @var{src_interface}
+@item @code{int @{ram,cuda,opencl@}_to_@{ram,cuda,opencl@}(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node)}
+These 12 functions define how to copy data from the @var{src_interface}
 interface on the @var{src_node} node to the @var{dst_interface} interface
 on the @var{dst_node} node. They return 0 on success.
 

examples/filters/custom_mf/custom_interface.c

@@ -49,7 +49,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node,
 static struct starpu_data_copy_methods custom_copy_data_methods_s =
 {
 	.ram_to_ram = NULL,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda        = NULL,
 	.cuda_to_ram        = NULL,
@@ -65,10 +64,6 @@ static struct starpu_data_copy_methods custom_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram  = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu  = NULL
 };
 
 static void     register_custom_handle(starpu_data_handle_t handle,

include/starpu_data_interfaces.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2013  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010-2013  Centre National de la Recherche Scientifique
  * Copyright (C) 2011-2012  Institut National de Recherche en Informatique et Automatique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,11 +21,6 @@
 
 #include <starpu.h>
 
-#ifdef STARPU_USE_GORDON
-/* to get the gordon_strideSize_t data structure from gordon */
-#include <gordon.h>
-#endif
-
 #ifdef STARPU_USE_CUDA
 /* to use CUDA streams */
 # ifdef STARPU_DONT_INCLUDE_CUDA_HEADERS
@@ -50,25 +45,16 @@ struct starpu_data_copy_methods
 	int (*ram_to_ram)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*ram_to_cuda)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*ram_to_opencl)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*ram_to_spu)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 
 	/* src type is cuda */
 	int (*cuda_to_ram)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*cuda_to_cuda)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*cuda_to_opencl)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*cuda_to_spu)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-
-	/* src type is spu */
-	int (*spu_to_ram)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*spu_to_cuda)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*spu_to_opencl)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*spu_to_spu)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 
 	/* src type is opencl */
 	int (*opencl_to_ram)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*opencl_to_cuda)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*opencl_to_opencl)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
-	int (*opencl_to_spu)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 
 #ifdef STARPU_USE_CUDA
 	/* for asynchronous CUDA transfers */
@@ -112,7 +98,7 @@ struct starpu_data_interface_ops
 	starpu_ssize_t (*allocate_data_on_node)(void *data_interface, uint32_t node);
 	/* Free data of the interface on a given node. */
 	void (*free_data_on_node)(void *data_interface, uint32_t node);
-	/* ram/cuda/spu/opencl synchronous and asynchronous transfer methods */
+	/* ram/cuda/opencl synchronous and asynchronous transfer methods */
 	struct starpu_data_copy_methods *copy_methods;
 	/* Return the current pointer (if any) for the handle on the given node. */
 	void * (*handle_to_pointer)(starpu_data_handle_t handle, uint32_t node);
@@ -124,10 +110,6 @@ struct starpu_data_interface_ops
 	int (*compare)(void *data_interface_a, void *data_interface_b);
 	/* Dump the sizes of a handle to a file */
 	void (*display)(starpu_data_handle_t handle, FILE *f);
-#ifdef STARPU_USE_GORDON
-	/* Convert the data size to the spu size format */
-	int (*convert_to_gordon)(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 	/* an identifier that is unique to each interface */
 	enum starpu_data_interface_id interfaceid;
 	/* The size of the interface data descriptor */

src/datawizard/interfaces/bcsr_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,6 @@ static int copy_opencl_to_ram(void *src_interface, unsigned src_node STARPU_ATTR
 static struct starpu_data_copy_methods bcsr_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -55,10 +54,6 @@ static struct starpu_data_copy_methods bcsr_copy_data_methods_s =
 	.ram_to_opencl = copy_ram_to_opencl,
 	.opencl_to_ram = copy_opencl_to_ram,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_bcsr_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);

src/datawizard/interfaces/block_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node STARP
 static struct starpu_data_copy_methods block_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -59,10 +58,6 @@ static struct starpu_data_copy_methods block_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 
@@ -74,9 +69,6 @@ static size_t block_interface_get_size(starpu_data_handle_t handle);
 static uint32_t footprint_block_interface_crc32(starpu_data_handle_t handle);
 static int block_compare(void *data_interface_a, void *data_interface_b);
 static void display_block_interface(starpu_data_handle_t handle, FILE *f);
-#ifdef STARPU_USE_GORDON
-static int convert_block_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 
 static struct starpu_data_interface_ops interface_block_ops =
 {
@@ -88,24 +80,11 @@ static struct starpu_data_interface_ops interface_block_ops =
 	.get_size = block_interface_get_size,
 	.footprint = footprint_block_interface_crc32,
 	.compare = block_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon = convert_block_to_gordon,
-#endif
 	.interfaceid = STARPU_BLOCK_INTERFACE_ID,
 	.interface_size = sizeof(struct starpu_block_interface),
 	.display = display_block_interface,
 };
 
-#ifdef STARPU_USE_GORDON
-int convert_block_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss)
-{
-	/* TODO */
-	STARPU_ABORT();
-
-	return 0;
-}
-#endif
-
 static void *block_handle_to_pointer(starpu_data_handle_t handle, uint32_t node)
 {
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));

src/datawizard/interfaces/coo_interface.c

@@ -460,9 +460,6 @@ struct starpu_data_interface_ops _starpu_interface_coo_ops =
 	.get_size              = coo_interface_get_size,
 	.footprint             = coo_interface_footprint,
 	.compare               = coo_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon     = NULL,
-#endif
 	.interfaceid           = STARPU_COO_INTERFACE_ID,
 	.interface_size        = sizeof(struct starpu_coo_interface),
 	.display               = display_coo_interface

src/datawizard/interfaces/csr_interface.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2009-2013  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,6 @@ static int copy_opencl_to_ram(void *src_interface, unsigned src_node, void *dst_
 static struct starpu_data_copy_methods csr_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -63,10 +62,6 @@ static struct starpu_data_copy_methods csr_copy_data_methods_s =
 	.ram_to_opencl = copy_ram_to_opencl,
 	.opencl_to_ram = copy_opencl_to_ram,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_csr_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);

src/datawizard/interfaces/data_interface.c

@@ -553,7 +553,6 @@ static void _starpu_data_unregister(starpu_data_handle_t handle, unsigned cohere
 				}
 #endif
 				case STARPU_CPU_RAM:      /* Impossible ! */
-				case STARPU_SPU_LS:       /* Not supported */
 				default:
 					STARPU_ABORT();
 			}

src/datawizard/interfaces/matrix_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2013  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -49,7 +49,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node STARP
 static struct starpu_data_copy_methods matrix_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -73,10 +72,6 @@ static struct starpu_data_copy_methods matrix_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_matrix_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);
@@ -87,9 +82,6 @@ static size_t matrix_interface_get_size(starpu_data_handle_t handle);
 static uint32_t footprint_matrix_interface_crc32(starpu_data_handle_t handle);
 static int matrix_compare(void *data_interface_a, void *data_interface_b);
 static void display_matrix_interface(starpu_data_handle_t handle, FILE *f);
-#ifdef STARPU_USE_GORDON
-static int convert_matrix_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 
 struct starpu_data_interface_ops starpu_interface_matrix_ops =
 {
@@ -101,32 +93,11 @@ struct starpu_data_interface_ops starpu_interface_matrix_ops =
 	.get_size = matrix_interface_get_size,
 	.footprint = footprint_matrix_interface_crc32,
 	.compare = matrix_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon = convert_matrix_to_gordon,
-#endif
 	.interfaceid = STARPU_MATRIX_INTERFACE_ID,
 	.interface_size = sizeof(struct starpu_matrix_interface),
 	.display = display_matrix_interface,
 };
 
-#ifdef STARPU_USE_GORDON
-static int convert_matrix_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss)
-{
-	size_t elemsize = GET_MATRIX_ELEMSIZE(interface);
-	uint32_t nx = STARPU_MATRIX_GET_NX(interface);
-	uint32_t ny = STARPU_MATRIX_GET_NY(interface);
-	uint32_t ld = STARPU_MATRIX_GET_LD(interface);
-
-	*ptr = STARPU_MATRIX_GET_PTR(interface);
-
-	/* The gordon_stride_init function may use a contiguous buffer
- 	 * in case nx = ld (in that case, (*ss).size = elemsize*nx*ny */
-	*ss = gordon_stride_init(ny, nx*elemsize, ld*elemsize);
-
-	return 0;
-}
-#endif
-
 static void register_matrix_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface)
 {
 	struct starpu_matrix_interface *matrix_interface = (struct starpu_matrix_interface *) data_interface;

src/datawizard/interfaces/multiformat_interface.c

@@ -45,7 +45,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node STARP
 static struct starpu_data_copy_methods multiformat_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -66,10 +65,6 @@ static struct starpu_data_copy_methods multiformat_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_multiformat_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);
@@ -81,9 +76,6 @@ static uint32_t footprint_multiformat_interface_crc32(starpu_data_handle_t handl
 static int multiformat_compare(void *data_interface_a, void *data_interface_b);
 static void display_multiformat_interface(starpu_data_handle_t handle, FILE *f);
 static uint32_t starpu_multiformat_get_nx(starpu_data_handle_t handle);
-#ifdef STARPU_USE_GORDON
-static int convert_multiformat_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 
 static struct starpu_multiformat_data_interface_ops*
 get_mf_ops(void *data_interface)
@@ -104,9 +96,6 @@ static struct starpu_data_interface_ops interface_multiformat_ops =
 	.get_size              = multiformat_interface_get_size,
 	.footprint             = footprint_multiformat_interface_crc32,
 	.compare               = multiformat_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon     = NULL,
-#endif
 	.interfaceid           = STARPU_MULTIFORMAT_INTERFACE_ID,
 	.interface_size        = sizeof(struct starpu_multiformat_interface),
 	.display               = display_multiformat_interface,

src/datawizard/interfaces/variable_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2013  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node, void
 static struct starpu_data_copy_methods variable_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -66,10 +65,6 @@ static struct starpu_data_copy_methods variable_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_variable_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);
@@ -80,9 +75,6 @@ static size_t variable_interface_get_size(starpu_data_handle_t handle);
 static uint32_t footprint_variable_interface_crc32(starpu_data_handle_t handle);
 static int variable_compare(void *data_interface_a, void *data_interface_b);
 static void display_variable_interface(starpu_data_handle_t handle, FILE *f);
-#ifdef STARPU_USE_GORDON
-static int convert_variable_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 
 static struct starpu_data_interface_ops interface_variable_ops =
 {
@@ -94,9 +86,6 @@ static struct starpu_data_interface_ops interface_variable_ops =
 	.get_size = variable_interface_get_size,
 	.footprint = footprint_variable_interface_crc32,
 	.compare = variable_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon = convert_variable_to_gordon,
-#endif
 	.interfaceid = STARPU_VARIABLE_INTERFACE_ID,
 	.interface_size = sizeof(struct starpu_variable_interface),
 	.display = display_variable_interface,
@@ -130,16 +119,6 @@ static void register_variable_handle(starpu_data_handle_t handle, uint32_t home_
 	}
 }
 
-#ifdef STARPU_USE_GORDON
-int convert_variable_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss)
-{
-	*ptr = STARPU_VARIABLE_GET_PTR(interface);
-	(*ss).size = STARPU_VARIABLE_GET_ELEMSIZE(interface);
-
-	return 0;
-}
-#endif
-
 /* declare a new data with the variable interface */
 void starpu_variable_data_register(starpu_data_handle_t *handleptr, uint32_t home_node,
                         uintptr_t ptr, size_t elemsize)

src/datawizard/interfaces/vector_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-2013  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,7 +45,6 @@ static int copy_opencl_to_ram_async(void *src_interface, unsigned src_node STARP
 static struct starpu_data_copy_methods vector_copy_data_methods_s =
 {
 	.ram_to_ram = copy_ram_to_ram,
-	.ram_to_spu = NULL,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = copy_ram_to_cuda,
 	.cuda_to_ram = copy_cuda_to_ram,
@@ -66,10 +65,6 @@ static struct starpu_data_copy_methods vector_copy_data_methods_s =
         .ram_to_opencl_async = copy_ram_to_opencl_async,
 	.opencl_to_ram_async = copy_opencl_to_ram_async,
 #endif
-	.cuda_to_spu = NULL,
-	.spu_to_ram = NULL,
-	.spu_to_cuda = NULL,
-	.spu_to_spu = NULL
 };
 
 static void register_vector_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);
@@ -80,9 +75,6 @@ static size_t vector_interface_get_size(starpu_data_handle_t handle);
 static uint32_t footprint_vector_interface_crc32(starpu_data_handle_t handle);
 static int vector_compare(void *data_interface_a, void *data_interface_b);
 static void display_vector_interface(starpu_data_handle_t handle, FILE *f);
-#ifdef STARPU_USE_GORDON
-static int convert_vector_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss);
-#endif
 
 static struct starpu_data_interface_ops interface_vector_ops =
 {
@@ -94,9 +86,6 @@ static struct starpu_data_interface_ops interface_vector_ops =
 	.get_size = vector_interface_get_size,
 	.footprint = footprint_vector_interface_crc32,
 	.compare = vector_compare,
-#ifdef STARPU_USE_GORDON
-	.convert_to_gordon = convert_vector_to_gordon,
-#endif
 	.interfaceid = STARPU_VECTOR_INTERFACE_ID,
 	.interface_size = sizeof(struct starpu_vector_interface),
 	.display = display_vector_interface,
@@ -140,18 +129,6 @@ static void register_vector_handle(starpu_data_handle_t handle, uint32_t home_no
 	}
 }
 
-#ifdef STARPU_USE_GORDON
-int convert_vector_to_gordon(void *data_interface, uint64_t *ptr, gordon_strideSize_t *ss)
-{
-	struct starpu_vector_interface *vector_interface = interface;
-
-	*ptr = vector_interface->ptr;
-	(*ss).size = vector_interface->nx * vector_interface->elemsize;
-
-	return 0;
-}
-#endif
-
 /* declare a new data with the vector interface */
 void starpu_vector_data_register(starpu_data_handle_t *handleptr, uint32_t home_node,
                         uintptr_t ptr, uint32_t nx, size_t elemsize)

src/datawizard/interfaces/void_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2012-2013  Université de Bordeaux 1
- * Copyright (C) 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -36,7 +36,6 @@ static int dummy_opencl_copy_async(void *src_interface, unsigned src_node, void
 static struct starpu_data_copy_methods void_copy_data_methods_s =
 {
 	.ram_to_ram = dummy_copy,
-	.ram_to_spu = dummy_copy,
 #ifdef STARPU_USE_CUDA
 	.ram_to_cuda = dummy_copy,
 	.cuda_to_ram = dummy_copy,
@@ -56,10 +55,6 @@ static struct starpu_data_copy_methods void_copy_data_methods_s =
         .ram_to_opencl_async = dummy_opencl_copy_async,
 	.opencl_to_ram_async = dummy_opencl_copy_async,
 #endif
-	.cuda_to_spu = dummy_copy,
-	.spu_to_ram = dummy_copy,
-	.spu_to_cuda = dummy_copy,
-	.spu_to_spu = dummy_copy
 };
 
 static void register_void_handle(starpu_data_handle_t handle, uint32_t home_node, void *data_interface);