Data Interface API: rename macro to get fields of interfaces

doc/starpu.texi

@@ -2373,9 +2373,9 @@ void scal_cpu_func(void *buffers[], void *cl_arg)
     float *factor = cl_arg;
 
     /* length of the vector */
-    unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+    unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
     /* local copy of the vector pointer */
-    float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+    float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
     for (i = 0; i < n; i++)
         val[i] *= *factor;
@@ -2448,9 +2448,9 @@ extern "C" void scal_cuda_func(void *buffers[], void *_args)
     float *factor = (float *)_args;
 
     /* length of the vector */
-    unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+    unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
     /* local copy of the vector pointer */
-    float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+    float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
 @i{    vector_mult_cuda<<<1,1>>>(val, n, *factor);}
 
@@ -2492,9 +2492,9 @@ void scal_opencl_func(void *buffers[], void *_args)
 @i{    cl_command_queue queue;}
 
     /* length of the vector */
-    unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+    unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
     /* local copy of the vector pointer */
-    float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+    float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
 @i{    id = starpu_worker_get_id();}
 @i{    devid = starpu_worker_get_devid(id);}

doc/vector_scal_cpu.texi

@@ -19,12 +19,12 @@ void scal_cpu_func(void *buffers[], void *cl_arg)
     starpu_vector_interface_t *vector = buffers[0];
 
     /* length of the vector */
-    unsigned n = STARPU_GET_VECTOR_NX(vector);
+    unsigned n = STARPU_VECTOR_GET_NX(vector);
 
     /* get a pointer to the local copy of the vector : note that we have to
      * cast it in (float *) since a vector could contain any type of
      * elements so that the .ptr field is actually a uintptr_t */
-    float *val = (float *)STARPU_GET_VECTOR_PTR(vector);
+    float *val = (float *)STARPU_VECTOR_GET_PTR(vector);
 
     /* scale the vector */
     for (i = 0; i < n; i++)

doc/vector_scal_cuda.texi

@@ -13,9 +13,9 @@ extern "C" void scal_cuda_func(void *buffers[], void *_args)
         float *factor = (float *)_args;
 
         /* length of the vector */
-        unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+        unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
         /* local copy of the vector pointer */
-        float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+        float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
         vector_mult_cuda<<<1,1>>>(val, n, *factor);
 

doc/vector_scal_opencl.texi

@@ -11,9 +11,9 @@ void scal_opencl_func(void *buffers[], void *_args)
     cl_command_queue queue;
 
     /* length of the vector */
-    unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+    unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
     /* local copy of the vector pointer */
-    float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+    float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
     id = starpu_worker_get_id();
     devid = starpu_worker_get_devid(id);

examples/audio/starpu_audio_processing.c

@@ -164,7 +164,7 @@ static void band_filter_kernel_gpu(void *descr[], __attribute__((unused)) void *
 {
 	cufftResult cures;
 
-	float *localA = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *localA = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 	cufftComplex *localout;
 
 	int workerid = starpu_worker_get_id();
@@ -212,7 +212,7 @@ static pthread_mutex_t fftw_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static void band_filter_kernel_cpu(void *descr[], __attribute__((unused)) void *arg)
 {
-	float *localA = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *localA = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	int workerid = starpu_worker_get_id();
 	

examples/axpy/axpy.c

@@ -40,10 +40,10 @@ void axpy_cpu(void *descr[], __attribute__((unused)) void *arg)
 {
 	TYPE alpha = *((TYPE *)arg);
 
-	unsigned n = STARPU_GET_VECTOR_NX(descr[0]);
+	unsigned n = STARPU_VECTOR_GET_NX(descr[0]);
 
-	TYPE *block_x = (TYPE *)STARPU_GET_VECTOR_PTR(descr[0]);
-	TYPE *block_y = (TYPE *)STARPU_GET_VECTOR_PTR(descr[1]);
+	TYPE *block_x = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
+	TYPE *block_y = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	AXPY((int)n, alpha, block_x, 1, block_y, 1);
 }
@@ -53,10 +53,10 @@ void axpy_gpu(void *descr[], __attribute__((unused)) void *arg)
 {
 	TYPE alpha = *((TYPE *)arg);
 
-	unsigned n = STARPU_GET_VECTOR_NX(descr[0]);
+	unsigned n = STARPU_VECTOR_GET_NX(descr[0]);
 
-	TYPE *block_x = (TYPE *)STARPU_GET_VECTOR_PTR(descr[0]);
-	TYPE *block_y = (TYPE *)STARPU_GET_VECTOR_PTR(descr[1]);
+	TYPE *block_x = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
+	TYPE *block_y = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	CUBLASAXPY((int)n, alpha, block_x, 1, block_y, 1);
 	cudaThreadSynchronize();

examples/basic_examples/mult.c

@@ -116,9 +116,9 @@ static void cpu_mult(void *descr[], __attribute__((unused))  void *arg)
 	uint32_t ldA, ldB, ldC;
 
 	/* .blas.ptr gives a pointer to the first element of the local copy */
-	subA = (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	subB = (float *)STARPU_GET_MATRIX_PTR(descr[1]);
-	subC = (float *)STARPU_GET_MATRIX_PTR(descr[2]);
+	subA = (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	subB = (float *)STARPU_MATRIX_GET_PTR(descr[1]);
+	subC = (float *)STARPU_MATRIX_GET_PTR(descr[2]);
 
 	/* .blas.nx is the number of rows (consecutive elements) and .blas.ny
 	 * is the number of lines that are separated by .blas.ld elements (ld
@@ -126,13 +126,13 @@ static void cpu_mult(void *descr[], __attribute__((unused))  void *arg)
 	 * NB: in case some filters were used, the leading dimension is not
 	 * guaranteed to be the same in main memory (on the original matrix)
 	 * and on the accelerator! */
-	nxC = STARPU_GET_MATRIX_NX(descr[2]);
-	nyC = STARPU_GET_MATRIX_NY(descr[2]);
-	nyA = STARPU_GET_MATRIX_NY(descr[0]);
+	nxC = STARPU_MATRIX_GET_NX(descr[2]);
+	nyC = STARPU_MATRIX_GET_NY(descr[2]);
+	nyA = STARPU_MATRIX_GET_NY(descr[0]);
 
-	ldA = STARPU_GET_MATRIX_LD(descr[0]);
-	ldB = STARPU_GET_MATRIX_LD(descr[1]);
-	ldC = STARPU_GET_MATRIX_LD(descr[2]);
+	ldA = STARPU_MATRIX_GET_LD(descr[0]);
+	ldB = STARPU_MATRIX_GET_LD(descr[1]);
+	ldC = STARPU_MATRIX_GET_LD(descr[2]);
 
 	/* we assume a FORTRAN-ordering! */
 	unsigned i,j,k;

examples/basic_examples/vector_scal_cpu.c

@@ -40,12 +40,12 @@ void scal_cpu_func(void *buffers[], void *cl_arg)
 	starpu_vector_interface_t *vector = buffers[0];
 
 	/* length of the vector */
-	unsigned n = STARPU_GET_VECTOR_NX(vector);
+	unsigned n = STARPU_VECTOR_GET_NX(vector);
 
 	/* get a pointer to the local copy of the vector : note that we have to
 	 * cast it in (float *) since a vector could contain any type of
 	 * elements so that the .ptr field is actually a uintptr_t */
-	float *val = (float *)STARPU_GET_VECTOR_PTR(vector);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(vector);
 
 	/* scale the vector */
 	for (i = 0; i < n; i++)

examples/basic_examples/vector_scal_cuda.cu

@@ -33,9 +33,9 @@ extern "C" void scal_cuda_func(void *buffers[], void *_args)
         float *factor = (float *)_args;
 
         /* length of the vector */
-        unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+        unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
         /* local copy of the vector pointer */
-        float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+        float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
         /* TODO: use more blocks and threads in blocks */
         vector_mult_cuda<<<1,1>>>(val, n, *factor);

examples/basic_examples/vector_scal_opencl.c

@@ -31,9 +31,9 @@ void scal_opencl_func(void *buffers[], void *_args)
 	cl_command_queue queue;
 
 	/* length of the vector */
-	unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+	unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
 	/* local copy of the vector pointer */
-	float *val = (float *)STARPU_GET_VECTOR_PTR(buffers[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
 	id = starpu_worker_get_id();
 	devid = starpu_worker_get_devid(id);

examples/block/block.c

@@ -21,10 +21,10 @@
 
 void cpu_codelet(void *descr[], void *_args)
 {
-	float *block = (float *)STARPU_GET_BLOCK_PTR(descr[0]);
-	int nx = (int)STARPU_GET_BLOCK_NX(descr[0]);
-	int ny = (int)STARPU_GET_BLOCK_NY(descr[0]);
-	int nz = (int)STARPU_GET_BLOCK_NZ(descr[0]);
+	float *block = (float *)STARPU_BLOCK_GET_PTR(descr[0]);
+	int nx = (int)STARPU_BLOCK_GET_NX(descr[0]);
+	int ny = (int)STARPU_BLOCK_GET_NY(descr[0]);
+	int nz = (int)STARPU_BLOCK_GET_NZ(descr[0]);
         float *multiplier = (float *)_args;
         int i;
 
@@ -38,10 +38,10 @@ void opencl_codelet(void *descr[], void *_args)
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err, n;
-	float *block = (float *)STARPU_GET_BLOCK_PTR(descr[0]);
-	int nx = (int)STARPU_GET_BLOCK_NX(descr[0]);
-	int ny = (int)STARPU_GET_BLOCK_NY(descr[0]);
-	int nz = (int)STARPU_GET_BLOCK_NZ(descr[0]);
+	float *block = (float *)STARPU_BLOCK_GET_PTR(descr[0]);
+	int nx = (int)STARPU_BLOCK_GET_NX(descr[0]);
+	int ny = (int)STARPU_BLOCK_GET_NY(descr[0]);
+	int nz = (int)STARPU_BLOCK_GET_NZ(descr[0]);
         float *multiplier = (float *)_args;
 
         id = starpu_worker_get_id();

examples/block/block_cuda.cu

@@ -24,10 +24,10 @@ static __global__ void cuda_block(float *block, int nx, int ny, int nz, float mu
 
 extern "C" void cuda_codelet(void *descr[], void *_args)
 {
-        float *block = (float *)STARPU_GET_BLOCK_PTR(descr[0]);
-	int nx = STARPU_GET_BLOCK_NX(descr[0]);
-	int ny = STARPU_GET_BLOCK_NY(descr[0]);
-	int nz = STARPU_GET_BLOCK_NZ(descr[0]);
+        float *block = (float *)STARPU_BLOCK_GET_PTR(descr[0]);
+	int nx = STARPU_BLOCK_GET_NX(descr[0]);
+	int ny = STARPU_BLOCK_GET_NY(descr[0]);
+	int nz = STARPU_BLOCK_GET_NZ(descr[0]);
         float *multiplier = (float *)_args;
 
         cuda_block<<<1,1>>>(block, nx, ny, nz, *multiplier);

examples/cholesky/dw_cholesky_kernels.c

@@ -30,17 +30,17 @@
 static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
 {
 	//printf("22\n");
-	float *left 	= (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	float *right 	= (float *)STARPU_GET_MATRIX_PTR(descr[1]);
-	float *center 	= (float *)STARPU_GET_MATRIX_PTR(descr[2]);
+	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	float *right 	= (float *)STARPU_MATRIX_GET_PTR(descr[1]);
+	float *center 	= (float *)STARPU_MATRIX_GET_PTR(descr[2]);
 
-	unsigned dx = STARPU_GET_MATRIX_NY(descr[2]);
-	unsigned dy = STARPU_GET_MATRIX_NX(descr[2]);
-	unsigned dz = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned dx = STARPU_MATRIX_GET_NY(descr[2]);
+	unsigned dy = STARPU_MATRIX_GET_NX(descr[2]);
+	unsigned dz = STARPU_MATRIX_GET_NY(descr[0]);
 
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[1]);
-	unsigned ld22 = STARPU_GET_MATRIX_LD(descr[2]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[1]);
+	unsigned ld22 = STARPU_MATRIX_GET_LD(descr[2]);
 
 #ifdef STARPU_USE_CUDA
 	cublasStatus st;
@@ -91,14 +91,14 @@ static inline void chol_common_codelet_update_u21(void *descr[], int s, __attrib
 	float *sub11;
 	float *sub21;
 
-	sub11 = (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	sub21 = (float *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	sub21 = (float *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx21 = STARPU_GET_MATRIX_NY(descr[1]);
-	unsigned ny21 = STARPU_GET_MATRIX_NX(descr[1]);
+	unsigned nx21 = STARPU_MATRIX_GET_NY(descr[1]);
+	unsigned ny21 = STARPU_MATRIX_GET_NX(descr[1]);
 
 	switch (s) {
 		case 0:
@@ -137,10 +137,10 @@ static inline void chol_common_codelet_update_u11(void *descr[], int s, __attrib
 //	printf("11\n");
 	float *sub11;
 
-	sub11 = (float *)STARPU_GET_MATRIX_PTR(descr[0]); 
+	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]); 
 
-	unsigned nx = STARPU_GET_MATRIX_NY(descr[0]);
-	unsigned ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned nx = STARPU_MATRIX_GET_NY(descr[0]);
+	unsigned ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned z;
 

examples/filters/fblock.c

@@ -34,12 +34,12 @@ void cpu_func(void *buffers[], void *cl_arg)
 {
         unsigned i, j, k;
         int *factor = cl_arg;
-	int *block = (int *)STARPU_GET_BLOCK_PTR(buffers[0]);
-	int nx = (int)STARPU_GET_BLOCK_NX(buffers[0]);
-	int ny = (int)STARPU_GET_BLOCK_NY(buffers[0]);
-	int nz = (int)STARPU_GET_BLOCK_NZ(buffers[0]);
-        unsigned ldy = STARPU_GET_BLOCK_LDY(buffers[0]);
-        unsigned ldz = STARPU_GET_BLOCK_LDZ(buffers[0]);
+	int *block = (int *)STARPU_BLOCK_GET_PTR(buffers[0]);
+	int nx = (int)STARPU_BLOCK_GET_NX(buffers[0]);
+	int ny = (int)STARPU_BLOCK_GET_NY(buffers[0]);
+	int nz = (int)STARPU_BLOCK_GET_NZ(buffers[0]);
+        unsigned ldy = STARPU_BLOCK_GET_LDY(buffers[0]);
+        unsigned ldz = STARPU_BLOCK_GET_LDZ(buffers[0]);
 
         for(k=0; k<nz ; k++) {
                 for(j=0; j<ny ; j++) {

examples/filters/fblock_cuda.cu

@@ -30,12 +30,12 @@ static __global__ void fblock_cuda(int *block, int nx, int ny, int nz, unsigned
 extern "C" void cuda_func(void *buffers[], void *_args)
 {
         int *factor = (int *)_args;
-	int *block = (int *)STARPU_GET_BLOCK_PTR(buffers[0]);
-	int nx = (int)STARPU_GET_BLOCK_NX(buffers[0]);
-	int ny = (int)STARPU_GET_BLOCK_NY(buffers[0]);
-	int nz = (int)STARPU_GET_BLOCK_NZ(buffers[0]);
-        unsigned ldy = STARPU_GET_BLOCK_LDY(buffers[0]);
-        unsigned ldz = STARPU_GET_BLOCK_LDZ(buffers[0]);
+	int *block = (int *)STARPU_BLOCK_GET_PTR(buffers[0]);
+	int nx = (int)STARPU_BLOCK_GET_NX(buffers[0]);
+	int ny = (int)STARPU_BLOCK_GET_NY(buffers[0]);
+	int nz = (int)STARPU_BLOCK_GET_NZ(buffers[0]);
+        unsigned ldy = STARPU_BLOCK_GET_LDY(buffers[0]);
+        unsigned ldz = STARPU_BLOCK_GET_LDZ(buffers[0]);
 
         /* TODO: use more blocks and threads in blocks */
         fblock_cuda<<<1,1>>>(block, nx, ny, nz, ldy, ldz, *factor);

examples/filters/fblock_opencl.c

@@ -26,12 +26,12 @@ void opencl_func(void *buffers[], void *cl_arg)
 	cl_command_queue queue;
 
         int *factor = cl_arg;
-	int *block = (int *)STARPU_GET_BLOCK_PTR(buffers[0]);
-	int nx = (int)STARPU_GET_BLOCK_NX(buffers[0]);
-	int ny = (int)STARPU_GET_BLOCK_NY(buffers[0]);
-	int nz = (int)STARPU_GET_BLOCK_NZ(buffers[0]);
-        unsigned ldy = STARPU_GET_BLOCK_LDY(buffers[0]);
-        unsigned ldz = STARPU_GET_BLOCK_LDZ(buffers[0]);
+	int *block = (int *)STARPU_BLOCK_GET_PTR(buffers[0]);
+	int nx = (int)STARPU_BLOCK_GET_NX(buffers[0]);
+	int ny = (int)STARPU_BLOCK_GET_NY(buffers[0]);
+	int nz = (int)STARPU_BLOCK_GET_NZ(buffers[0]);
+        unsigned ldy = STARPU_BLOCK_GET_LDY(buffers[0]);
+        unsigned ldz = STARPU_BLOCK_GET_LDZ(buffers[0]);
 
 	id = starpu_worker_get_id();
 	devid = starpu_worker_get_devid(id);

examples/filters/fmatrix.c

@@ -26,11 +26,11 @@ void cpu_func(void *buffers[], void *cl_arg)
         int *factor = cl_arg;
 
         /* length of the matrix */
-        unsigned nx = STARPU_GET_MATRIX_NX(buffers[0]);
-        unsigned ny = STARPU_GET_MATRIX_NY(buffers[0]);
-        unsigned ld = STARPU_GET_MATRIX_LD(buffers[0]);
+        unsigned nx = STARPU_MATRIX_GET_NX(buffers[0]);
+        unsigned ny = STARPU_MATRIX_GET_NY(buffers[0]);
+        unsigned ld = STARPU_MATRIX_GET_LD(buffers[0]);
         /* local copy of the matrix pointer */
-        int *val = (int *)STARPU_GET_MATRIX_PTR(buffers[0]);
+        int *val = (int *)STARPU_MATRIX_GET_PTR(buffers[0]);
 
         for(j=0; j<ny ; j++) {
                 for(i=0; i<nx ; i++)

examples/filters/fvector.c

@@ -25,9 +25,9 @@ void cpu_func(void *buffers[], void *cl_arg)
         int *factor = cl_arg;
 
         /* length of the vector */
-        unsigned n = STARPU_GET_VECTOR_NX(buffers[0]);
+        unsigned n = STARPU_VECTOR_GET_NX(buffers[0]);
         /* local copy of the vector pointer */
-        int *val = (int *)STARPU_GET_VECTOR_PTR(buffers[0]);
+        int *val = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
         for (i = 0; i < n; i++)
                 val[i] *= *factor;

examples/heat/dw_factolu_kernels.c

@@ -104,17 +104,17 @@ void display_stat_heat(void)
 
 static inline void dw_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
 {
-	float *left 	= (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	float *right 	= (float *)STARPU_GET_MATRIX_PTR(descr[1]);
-	float *center 	= (float *)STARPU_GET_MATRIX_PTR(descr[2]);
+	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	float *right 	= (float *)STARPU_MATRIX_GET_PTR(descr[1]);
+	float *center 	= (float *)STARPU_MATRIX_GET_PTR(descr[2]);
 
-	unsigned dx = STARPU_GET_MATRIX_NX(descr[2]);
-	unsigned dy = STARPU_GET_MATRIX_NY(descr[2]);
-	unsigned dz = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned dx = STARPU_MATRIX_GET_NX(descr[2]);
+	unsigned dy = STARPU_MATRIX_GET_NY(descr[2]);
+	unsigned dz = STARPU_MATRIX_GET_NY(descr[0]);
 
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
-	unsigned ld22 = STARPU_GET_MATRIX_LD(descr[2]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
+	unsigned ld22 = STARPU_MATRIX_GET_LD(descr[2]);
 
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -171,14 +171,14 @@ static inline void dw_common_codelet_update_u12(void *descr[], int s, __attribut
 	float *sub11;
 	float *sub12;
 
-	sub11 = (float *)STARPU_GET_MATRIX_PTR(descr[0]);	
-	sub12 = (float *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]);	
+	sub12 = (float *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx12 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny12 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx12 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny12 = STARPU_MATRIX_GET_NY(descr[1]);
 	
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -234,14 +234,14 @@ static inline void dw_common_codelet_update_u21(void *descr[], int s, __attribut
 	float *sub11;
 	float *sub21;
 
-	sub11 = (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	sub21 = (float *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	sub21 = (float *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx21 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny21 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx21 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny21 = STARPU_MATRIX_GET_NY(descr[1]);
 	
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -309,10 +309,10 @@ static inline void dw_common_codelet_update_u11(void *descr[], int s, __attribut
 {
 	float *sub11;
 
-	sub11 = (float *)STARPU_GET_MATRIX_PTR(descr[0]); 
+	sub11 = (float *)STARPU_MATRIX_GET_PTR(descr[0]); 
 
-	unsigned long nx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned long ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned long nx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned long ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned long z;
 

examples/heat/dw_sparse_cg_kernels.c

@@ -52,22 +52,22 @@
 
 void cpu_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
 {
-	float *nzval = (float *)STARPU_GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = STARPU_GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = STARPU_GET_CSR_ROWPTR(descr[0]);
+	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
+	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
+	uint32_t *rowptr = STARPU_CSR_GET_ROWPTR(descr[0]);
 
-	uint32_t firstentry = STARPU_GET_CSR_ELEMSIZE(descr[0]);
+	uint32_t firstentry = STARPU_CSR_GET_ELEMSIZE(descr[0]);
 
-	float *vecx = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *vecr = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
-	float *vecb = (float *)STARPU_GET_VECTOR_PTR(descr[3]);
+	float *vecx = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *vecr = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
+	float *vecb = (float *)STARPU_VECTOR_GET_PTR(descr[3]);
 
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = STARPU_GET_CSR_NNZ(descr[0]);
-	nrow = STARPU_GET_CSR_NROW(descr[0]);
+	nnz = STARPU_CSR_GET_NNZ(descr[0]);
+	nrow = STARPU_CSR_GET_NROW(descr[0]);
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)
@@ -97,14 +97,14 @@ void cpu_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
 void cpu_codelet_func_2(void *descr[], __attribute__((unused)) void *arg)
 {
 	/* simply copy r into d */
-	uint32_t nx = STARPU_GET_VECTOR_NX(descr[0]);
-	size_t elemsize = STARPU_GET_VECTOR_ELEMSIZE(descr[0]);
+	uint32_t nx = STARPU_VECTOR_GET_NX(descr[0]);
+	size_t elemsize = STARPU_VECTOR_GET_ELEMSIZE(descr[0]);
 
-	STARPU_ASSERT(STARPU_GET_VECTOR_NX(descr[0]) == STARPU_GET_VECTOR_NX(descr[1]));
-	STARPU_ASSERT(STARPU_GET_VECTOR_ELEMSIZE(descr[0]) == STARPU_GET_VECTOR_ELEMSIZE(descr[1]));
+	STARPU_ASSERT(STARPU_VECTOR_GET_NX(descr[0]) == STARPU_VECTOR_GET_NX(descr[1]));
+	STARPU_ASSERT(STARPU_VECTOR_GET_ELEMSIZE(descr[0]) == STARPU_VECTOR_GET_ELEMSIZE(descr[1]));
 
-	float *src = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *dst = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *src = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *dst = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	memcpy(dst, src, nx*elemsize);
 }
@@ -124,8 +124,8 @@ void cpu_codelet_func_3(void *descr[], void *arg)
 	int size;
 	
 	/* get the vector */
-	vec = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	size = (int)STARPU_GET_VECTOR_NX(descr[0]);
+	vec = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	size = (int)STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = SDOT(size, vec, 1, vec, 1);
 
@@ -144,8 +144,8 @@ void cublas_codelet_func_3(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vec = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	vec = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = cublasSdot (size, vec, 1, vec, 1);
 
@@ -163,20 +163,20 @@ void cublas_codelet_func_3(void *descr[], void *arg)
 
 void cpu_codelet_func_4(void *descr[], __attribute__((unused)) void *arg)
 {
-	float *nzval = (float *)STARPU_GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = STARPU_GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = STARPU_GET_CSR_ROWPTR(descr[0]);
+	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
+	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
+	uint32_t *rowptr = STARPU_CSR_GET_ROWPTR(descr[0]);
 
-	uint32_t firstentry = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
+	uint32_t firstentry = STARPU_CSR_GET_FIRSTENTRY(descr[0]);
 
-	float *vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *vecq = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
+	float *vecd = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *vecq = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = STARPU_GET_CSR_NNZ(descr[0]);
-	nrow = STARPU_GET_CSR_NROW(descr[0]);
+	nnz = STARPU_CSR_GET_NNZ(descr[0]);
+	nrow = STARPU_CSR_GET_NROW(descr[0]);
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)
@@ -215,11 +215,11 @@ void cpu_codelet_func_5(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecq = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	STARPU_ASSERT(STARPU_GET_VECTOR_NX(descr[0]) == STARPU_GET_VECTOR_NX(descr[1]));
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	STARPU_ASSERT(STARPU_VECTOR_GET_NX(descr[0]) == STARPU_VECTOR_GET_NX(descr[1]));
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = SDOT(size, vecd, 1, vecq, 1);
 
@@ -235,11 +235,11 @@ void cublas_codelet_func_5(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecq = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	STARPU_ASSERT(STARPU_GET_VECTOR_NX(descr[0]) == STARPU_GET_VECTOR_NX(descr[1]));
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	STARPU_ASSERT(STARPU_VECTOR_GET_NX(descr[0]) == STARPU_VECTOR_GET_NX(descr[1]));
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = cublasSdot (size, vecd, 1, vecq, 1);
 
@@ -263,10 +263,10 @@ void cpu_codelet_func_6(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecx = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecx = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	SAXPY(size, pb->alpha, vecd, 1, vecx, 1);
 }
@@ -279,10 +279,10 @@ void cublas_codelet_func_6(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecx = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecx = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	cublasSaxpy (size, pb->alpha, vecd, 1, vecx, 1);
 }
@@ -302,10 +302,10 @@ void cpu_codelet_func_7(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecq = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	SAXPY(size, -pb->alpha, vecq, 1, vecr, 1);
 }
@@ -318,10 +318,10 @@ void cublas_codelet_func_7(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecq = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	cublasSaxpy (size, -pb->alpha, vecq, 1, vecr, 1);
 }
@@ -344,8 +344,8 @@ void cpu_codelet_func_8(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = SDOT(size, vecr, 1, vecr, 1);
 
@@ -363,8 +363,8 @@ void cublas_codelet_func_8(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	dot = cublasSdot (size, vecr, 1, vecr, 1);
 
@@ -389,10 +389,10 @@ void cpu_codelet_func_9(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	/* d = beta d */
 	SSCAL(size, pb->beta, vecd, 1);
@@ -409,10 +409,10 @@ void cublas_codelet_func_9(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
-	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
+	vecr = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	size = STARPU_GET_VECTOR_NX(descr[0]);
+	size = STARPU_VECTOR_GET_NX(descr[0]);
 
 	/* d = beta d */
 	cublasSscal(size, pb->beta, vecd, 1);

examples/incrementer/incrementer.c

@@ -34,7 +34,7 @@ extern void cuda_codelet_host(float *tab);
 
 void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	val[0] += 1.0f; val[1] += 1.0f;
 }

examples/incrementer/incrementer_kernels.cu

@@ -26,7 +26,7 @@ static __global__ void cuda_incrementer(float * tab)
 
 extern "C" void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	cuda_incrementer<<<1,1>>>(val);
 }

examples/incrementer/incrementer_kernels_opencl.c

@@ -21,7 +21,7 @@
 extern struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err;

examples/lu/xlu_kernels.c

@@ -28,17 +28,17 @@
 static inline void STARPU_LU(common_u22)(void *descr[],
 				int s, __attribute__((unused)) void *_args)
 {
-	TYPE *right 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);
-	TYPE *left 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
-	TYPE *center 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[2]);
+	TYPE *right 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
+	TYPE *left 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
+	TYPE *center 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[2]);
 
-	unsigned dx = STARPU_GET_MATRIX_NX(descr[2]);
-	unsigned dy = STARPU_GET_MATRIX_NY(descr[2]);
-	unsigned dz = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned dx = STARPU_MATRIX_GET_NX(descr[2]);
+	unsigned dy = STARPU_MATRIX_GET_NY(descr[2]);
+	unsigned dz = STARPU_MATRIX_GET_NY(descr[0]);
 
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
-	unsigned ld22 = STARPU_GET_MATRIX_LD(descr[2]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
+	unsigned ld22 = STARPU_MATRIX_GET_LD(descr[2]);
 
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -116,14 +116,14 @@ static inline void STARPU_LU(common_u12)(void *descr[],
 	TYPE *sub11;
 	TYPE *sub12;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);	
-	sub12 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);	
+	sub12 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx12 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny12 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx12 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny12 = STARPU_MATRIX_GET_NY(descr[1]);
 
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -199,14 +199,14 @@ static inline void STARPU_LU(common_u21)(void *descr[],
 	TYPE *sub11;
 	TYPE *sub21;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);
-	sub21 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
+	sub21 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx21 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny21 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx21 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny21 = STARPU_MATRIX_GET_NY(descr[1]);
 	
 #ifdef STARPU_USE_CUDA
 	cublasStatus status;
@@ -279,10 +279,10 @@ static inline void STARPU_LU(common_u11)(void *descr[],
 {
 	TYPE *sub11;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]); 
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]); 
 
-	unsigned long nx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned long ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned long nx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned long ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned long z;
 
@@ -372,10 +372,10 @@ static inline void STARPU_LU(common_u11_pivot)(void *descr[],
 {
 	TYPE *sub11;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]); 
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]); 
 
-	unsigned long nx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned long ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned long nx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned long ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned long z;
 
@@ -508,9 +508,9 @@ static inline void STARPU_LU(common_pivot)(void *descr[],
 {
 	TYPE *matrix;
 
-	matrix = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]); 
-	unsigned long nx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned long ld = STARPU_GET_MATRIX_LD(descr[0]);
+	matrix = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]); 
+	unsigned long nx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned long ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned row, rowaux;
 

examples/matvecmult/matvecmult.c

@@ -31,9 +31,9 @@ void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err, n;
-	float *matrix = (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	float *vector = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *mult = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
+	float *matrix = (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	float *vector = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *mult = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
 
         id = starpu_worker_get_id();
         devid = starpu_worker_get_devid(id);

examples/mult/sgemm_kernels.c

@@ -25,17 +25,17 @@
 	float *subB;			\
 	float *subC;			\
 					\
-	subA = (float *)STARPU_GET_MATRIX_PTR(descr[0]);	\
-	subB = (float *)STARPU_GET_MATRIX_PTR(descr[1]);	\
-	subC = (float *)STARPU_GET_MATRIX_PTR(descr[2]);	\
+	subA = (float *)STARPU_MATRIX_GET_PTR(descr[0]);	\
+	subB = (float *)STARPU_MATRIX_GET_PTR(descr[1]);	\
+	subC = (float *)STARPU_MATRIX_GET_PTR(descr[2]);	\
 					\
-	nxC = STARPU_GET_MATRIX_NX(descr[2]);		\
-	nyC = STARPU_GET_MATRIX_NY(descr[2]);		\
-	nyA = STARPU_GET_MATRIX_NY(descr[0]);		\
+	nxC = STARPU_MATRIX_GET_NX(descr[2]);		\
+	nyC = STARPU_MATRIX_GET_NY(descr[2]);		\
+	nyA = STARPU_MATRIX_GET_NY(descr[0]);		\
 					\
-	ldA = STARPU_GET_MATRIX_LD(descr[0]);		\
-	ldB = STARPU_GET_MATRIX_LD(descr[1]);		\
-	ldC = STARPU_GET_MATRIX_LD(descr[2]);
+	ldA = STARPU_MATRIX_GET_LD(descr[0]);		\
+	ldB = STARPU_MATRIX_GET_LD(descr[1]);		\
+	ldC = STARPU_MATRIX_GET_LD(descr[2]);
 
 
 

examples/mult/xgemm_kernels.c

@@ -25,17 +25,17 @@
 	TYPE *subB;			\
 	TYPE *subC;			\
 					\
-	subA = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);	\
-	subB = (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);	\
-	subC = (TYPE *)STARPU_GET_MATRIX_PTR(descr[2]);	\
+	subA = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);	\
+	subB = (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);	\
+	subC = (TYPE *)STARPU_MATRIX_GET_PTR(descr[2]);	\
 					\
-	nxC = STARPU_GET_MATRIX_NX(descr[2]);		\
-	nyC = STARPU_GET_MATRIX_NY(descr[2]);		\
-	nyA = STARPU_GET_MATRIX_NY(descr[0]);		\
+	nxC = STARPU_MATRIX_GET_NX(descr[2]);		\
+	nyC = STARPU_MATRIX_GET_NY(descr[2]);		\
+	nyA = STARPU_MATRIX_GET_NY(descr[0]);		\
 					\
-	ldA = STARPU_GET_MATRIX_LD(descr[0]);		\
-	ldB = STARPU_GET_MATRIX_LD(descr[1]);		\
-	ldC = STARPU_GET_MATRIX_LD(descr[2]);
+	ldA = STARPU_MATRIX_GET_LD(descr[0]);		\
+	ldB = STARPU_MATRIX_GET_LD(descr[1]);		\
+	ldC = STARPU_MATRIX_GET_LD(descr[2]);
 
 
 

examples/pi/pi.c

@@ -27,7 +27,7 @@ static unsigned ntasks = 1024;
 
 static void cpu_kernel(void *descr[], void *cl_arg)
 {
-	unsigned *directions = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *directions = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	unsigned nx = NSHOT_PER_TASK;
 
 	TYPE *random_numbers = malloc(2*nx*sizeof(TYPE));
@@ -50,7 +50,7 @@ static void cpu_kernel(void *descr[], void *cl_arg)
 		current_cnt += success;
 	}
 
-	unsigned *cnt = (unsigned *)STARPU_GET_VECTOR_PTR(descr[1]);
+	unsigned *cnt = (unsigned *)STARPU_VECTOR_GET_PTR(descr[1]);
 	*cnt = current_cnt;
 
 	free(random_numbers);

examples/pi/pi_kernel.cu

@@ -100,7 +100,7 @@ extern "C" void cuda_kernel(void *descr[], void *cl_arg)
 {
 	cudaError_t cures;
 
-	unsigned *directions = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *directions = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	unsigned nx = NSHOT_PER_TASK;
 
 	/* Generate Random numbers */
@@ -114,7 +114,7 @@ extern "C" void cuda_kernel(void *descr[], void *cl_arg)
 	TYPE *random_numbers_x = &random_numbers[0];
 	TYPE *random_numbers_y = &random_numbers[nx];
 
-	unsigned *cnt = (unsigned *)STARPU_GET_VECTOR_PTR(descr[1]);
+	unsigned *cnt = (unsigned *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	/* How many blocks do we use ? */ 
 	unsigned nblocks = 128; // TODO

examples/ppm_downscaler/yuv_downscaler.c

@@ -69,14 +69,14 @@ static void ds_callback(void *arg)
 
 static void ds_kernel_cpu(void *descr[], __attribute__((unused)) void *arg)
 {
-	uint8_t *input = (uint8_t *)STARPU_GET_MATRIX_PTR(descr[0]);
-	unsigned input_ld = STARPU_GET_MATRIX_LD(descr[0]);
+	uint8_t *input = (uint8_t *)STARPU_MATRIX_GET_PTR(descr[0]);
+	unsigned input_ld = STARPU_MATRIX_GET_LD(descr[0]);
 
-	uint8_t *output = (uint8_t *)STARPU_GET_MATRIX_PTR(descr[1]);
-	unsigned output_ld = STARPU_GET_MATRIX_LD(descr[1]);
+	uint8_t *output = (uint8_t *)STARPU_MATRIX_GET_PTR(descr[1]);
+	unsigned output_ld = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned ncols = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned nlines = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned ncols = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned nlines = STARPU_MATRIX_GET_NY(descr[0]);
 
 	unsigned line, col;
 	for (line = 0; line < nlines; line+=FACTOR)

examples/spmv/dw_block_spmv_kernels.c

@@ -23,14 +23,14 @@
 static inline void common_block_spmv(void *descr[], int s, __attribute__((unused)) void *_args)
 {
 	//printf("22\n");
-	float *block 	= (float *)STARPU_GET_MATRIX_PTR(descr[0]);
-	float *in 	= (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *out 	= (float *)STARPU_GET_VECTOR_PTR(descr[2]);
+	float *block 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
+	float *in 	= (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *out 	= (float *)STARPU_VECTOR_GET_PTR(descr[2]);
 
-	unsigned dx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned dy = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned dx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned dy = STARPU_MATRIX_GET_NY(descr[0]);
 
-	unsigned ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	switch (s) {
 		case 0:

examples/spmv/dw_spmv.c

@@ -36,18 +36,18 @@ void spmv_kernel_opencl(void *descr[], void *args)
 	cl_command_queue queue;
 	int id, devid, err, n;
 
-	uint32_t nnz = STARPU_GET_CSR_NNZ(descr[0]);
-	uint32_t nrow = STARPU_GET_CSR_NROW(descr[0]);
-	float *nzval = (float *)STARPU_GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = STARPU_GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = STARPU_GET_CSR_ROWPTR(descr[0]);
-	uint32_t firstentry = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
+	uint32_t nnz = STARPU_CSR_GET_NNZ(descr[0]);
+	uint32_t nrow = STARPU_CSR_GET_NROW(descr[0]);
+	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
+	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
+	uint32_t *rowptr = STARPU_CSR_GET_ROWPTR(descr[0]);
+	uint32_t firstentry = STARPU_CSR_GET_FIRSTENTRY(descr[0]);
 
-	float *vecin = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	uint32_t nx_in = STARPU_GET_VECTOR_NX(descr[1]);
+	float *vecin = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	uint32_t nx_in = STARPU_VECTOR_GET_NX(descr[1]);
 
-	float *vecout = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
-	uint32_t nx_out = STARPU_GET_VECTOR_NX(descr[2]);
+	float *vecout = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
+	uint32_t nx_out = STARPU_VECTOR_GET_NX(descr[2]);
 
         id = starpu_worker_get_id();
         devid = starpu_worker_get_devid(id);
@@ -112,23 +112,23 @@ static void parse_args(int argc, char **argv)
 
 static void cpu_spmv(void *descr[], __attribute__((unused))  void *arg)
 {
-	float *nzval = (float *)STARPU_GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = STARPU_GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = STARPU_GET_CSR_ROWPTR(descr[0]);
+	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
+	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
+	uint32_t *rowptr = STARPU_CSR_GET_ROWPTR(descr[0]);
 
-	float *vecin = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	float *vecout = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
+	float *vecin = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	float *vecout = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
 
-	uint32_t firstelem = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
+	uint32_t firstelem = STARPU_CSR_GET_FIRSTENTRY(descr[0]);
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = STARPU_GET_CSR_NNZ(descr[0]);
-	nrow = STARPU_GET_CSR_NROW(descr[0]);
+	nnz = STARPU_CSR_GET_NNZ(descr[0]);
+	nrow = STARPU_CSR_GET_NROW(descr[0]);
 
-	//STARPU_ASSERT(nrow == STARPU_GET_VECTOR_NX(descr[1]));
-	STARPU_ASSERT(nrow == STARPU_GET_VECTOR_NX(descr[2]));
+	//STARPU_ASSERT(nrow == STARPU_VECTOR_GET_NX(descr[1]));
+	STARPU_ASSERT(nrow == STARPU_VECTOR_GET_NX(descr[2]));
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)

examples/spmv/spmv_cuda.cu

@@ -80,18 +80,18 @@ void spmv_kernel_3(uint32_t nnz, uint32_t nrow, float *nzval, uint32_t *colind,
 
 extern "C" void spmv_kernel_cuda(void *descr[], void *args)
 {
-	uint32_t nnz = STARPU_GET_CSR_NNZ(descr[0]);
-	uint32_t nrow = STARPU_GET_CSR_NROW(descr[0]);
-	float *nzval = (float *)STARPU_GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = STARPU_GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = STARPU_GET_CSR_ROWPTR(descr[0]);
-	uint32_t firstentry = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
-
-	float *vecin = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
-	uint32_t nx_in = STARPU_GET_VECTOR_NX(descr[1]);
-
-	float *vecout = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
-	uint32_t nx_out = STARPU_GET_VECTOR_NX(descr[2]);
+	uint32_t nnz = STARPU_CSR_GET_NNZ(descr[0]);
+	uint32_t nrow = STARPU_CSR_GET_NROW(descr[0]);
+	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
+	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
+	uint32_t *rowptr = STARPU_CSR_GET_ROWPTR(descr[0]);
+	uint32_t firstentry = STARPU_CSR_GET_FIRSTENTRY(descr[0]);
+
+	float *vecin = (float *)STARPU_VECTOR_GET_PTR(descr[1]);
+	uint32_t nx_in = STARPU_VECTOR_GET_NX(descr[1]);
+
+	float *vecout = (float *)STARPU_VECTOR_GET_PTR(descr[2]);
+	uint32_t nx_out = STARPU_VECTOR_GET_NX(descr[2]);
 
 	dim3 dimBlock(8, 1);
 	dim3 dimGrid(512, 1);

examples/starpufft/starpufftx1d.c

@@ -66,8 +66,8 @@ STARPUFFT(twist1_1d_kernel_gpu)(void *descr[], void *_args)
 	int n1 = plan->n1[0];
 	int n2 = plan->n2[0];
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
 	
 	STARPUFFT(cuda_twist1_1d_host)(in, twisted1, i, n1, n2);
 
@@ -86,9 +86,9 @@ STARPUFFT(fft1_1d_kernel_gpu)(void *descr[], void *_args)
 	int n2 = plan->n2[0];
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
-	const _cufftComplex * restrict roots = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[2]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
+	const _cufftComplex * restrict roots = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[2]);
 
 	int workerid = starpu_worker_get_id();
 
@@ -122,8 +122,8 @@ STARPUFFT(fft2_1d_kernel_gpu)(void *descr[], void *_args)
 	int n3 = n2/DIV_1D;
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	int workerid = starpu_worker_get_id();
 
@@ -158,8 +158,8 @@ STARPUFFT(twist1_1d_kernel_cpu)(void *descr[], void *_args)
 	int n1 = plan->n1[0];
 	int n2 = plan->n2[0];
 
-	STARPUFFT(complex) * restrict in = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	STARPUFFT(complex) * restrict in = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	//printf("twist1 %d %g\n", i, (double) cabs(plan->in[i]));
 
@@ -183,8 +183,8 @@ STARPUFFT(fft1_1d_kernel_cpu)(void *descr[], void *_args)
 
 	task_per_worker[workerid]++;
 
-	const STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict fft1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) * restrict fft1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	_fftw_complex * restrict worker_in1 = (STARPUFFT(complex) *)plan->plans[workerid].in1;
 	_fftw_complex * restrict worker_out1 = (STARPUFFT(complex) *)plan->plans[workerid].out1;
@@ -216,7 +216,7 @@ STARPUFFT(twist2_1d_kernel_cpu)(void *descr[], void *_args)
 	int n2 = plan->n2[0];
 	int n3 = n2/DIV_1D;
 
-	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	//printf("twist2 %d %g\n", jj, (double) cabs(plan->fft1[jj]));
 
@@ -241,8 +241,8 @@ STARPUFFT(fft2_1d_kernel_cpu)(void *descr[], void *_args)
 
 	task_per_worker[workerid]++;
 
-	const STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	//printf("fft2 %d %g\n", jj, (double) cabs(twisted2[plan->totsize4-1]));
 
@@ -271,7 +271,7 @@ STARPUFFT(twist3_1d_kernel_cpu)(void *descr[], void *_args)
 	int n2 = plan->n2[0];
 	int n3 = n2/DIV_1D;
 
-	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	//printf("twist3 %d %g\n", jj, (double) cabs(fft2[0]));
 

examples/starpufft/starpufftx2d.c

@@ -36,8 +36,8 @@ STARPUFFT(twist1_2d_kernel_gpu)(void *descr[], void *_args)
 	int m1 = plan->n1[1];
 	int m2 = plan->n2[1];
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	STARPUFFT(cuda_twist1_2d_host)(in, twisted1, i, j, n1, n2, m1, m2);
 	cudaThreadSynchronize();
@@ -55,10 +55,10 @@ STARPUFFT(fft1_2d_kernel_gpu)(void *descr[], void *_args)
 	int m2 = plan->n2[1];
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
-	const _cufftComplex * restrict roots0 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[2]);
-	const _cufftComplex * restrict roots1 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[3]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
+	const _cufftComplex * restrict roots0 = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[2]);
+	const _cufftComplex * restrict roots1 = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[3]);
 
 	int workerid = starpu_worker_get_id();
 
@@ -94,8 +94,8 @@ STARPUFFT(fft2_2d_kernel_gpu)(void *descr[], void *_args)
 	int n;
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	int workerid = starpu_worker_get_id();
 
@@ -132,8 +132,8 @@ STARPUFFT(twist1_2d_kernel_cpu)(void *descr[], void *_args)
 	int m2 = plan->n2[1];
 	int m = plan->n[1];
 
-	STARPUFFT(complex) * restrict in = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	STARPUFFT(complex) * restrict in = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	//printf("twist1 %d %d %g\n", i, j, (double) cabs(plan->in[i+j]));
 
@@ -158,8 +158,8 @@ STARPUFFT(fft1_2d_kernel_cpu)(void *descr[], void *_args)
 
 	task_per_worker[workerid]++;
 
-	const STARPUFFT(complex) *twisted1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) *fft1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) *twisted1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) *fft1 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	_fftw_complex * restrict worker_in1 = (STARPUFFT(complex) *)plan->plans[workerid].in1;
 	_fftw_complex * restrict worker_out1 = (STARPUFFT(complex) *)plan->plans[workerid].out1;
@@ -191,7 +191,7 @@ STARPUFFT(twist2_2d_kernel_cpu)(void *descr[], void *_args)
 	int n3 = n2/DIV_2D_N;
 	int m3 = m2/DIV_2D_M;
 
-	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	//printf("twist2 %d %d %g\n", kk, ll, (double) cabs(plan->fft1[kk+ll]));
 
@@ -219,8 +219,8 @@ STARPUFFT(fft2_2d_kernel_cpu)(void *descr[], void *_args)
 
 	task_per_worker[workerid]++;
 
-	const STARPUFFT(complex) *twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) *fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) *twisted2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
+	STARPUFFT(complex) *fft2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[1]);
 
 	//printf("fft2 %d %d %g\n", kk, ll, (double) cabs(twisted2[plan->totsize4-1]));
 
@@ -252,7 +252,7 @@ STARPUFFT(twist3_2d_kernel_cpu)(void *descr[], void *_args)
 	int m3 = m2/DIV_2D_M;
 	int m = plan->n[1];
 
-	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	//printf("twist3 %d %d %g\n", kk, ll, (double) cabs(fft2[0]));
 

examples/variable/variable.c

@@ -33,7 +33,7 @@ extern void cuda_codelet_host(float *tab);
 
 void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	*val += 1.0f;
 }

examples/variable/variable_kernels.cu

@@ -24,7 +24,7 @@ static __global__ void cuda_variable(float * tab)
 
 extern "C" void cuda_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	cuda_variable<<<1,1>>>(val);
 }

examples/variable/variable_kernels_opencl.c

@@ -20,7 +20,7 @@
 extern struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], void *_args)
 {
-	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err;

include/starpu_data_interfaces.h

@@ -132,11 +132,11 @@ uintptr_t starpu_matrix_get_local_ptr(starpu_data_handle handle);
 size_t starpu_matrix_get_elemsize(starpu_data_handle handle);
 
 /* helper methods */
-#define STARPU_GET_MATRIX_PTR(interface)	(((starpu_matrix_interface_t *)(interface))->ptr)
-#define STARPU_GET_MATRIX_NX(interface)	(((starpu_matrix_interface_t *)(interface))->nx)
-#define STARPU_GET_MATRIX_NY(interface)	(((starpu_matrix_interface_t *)(interface))->ny)
-#define STARPU_GET_MATRIX_LD(interface)	(((starpu_matrix_interface_t *)(interface))->ld)
-#define STARPU_GET_MATRIX_ELEMSIZE(interface)	(((starpu_matrix_interface_t *)(interface))->elemsize)
+#define STARPU_MATRIX_GET_PTR(interface)	(((starpu_matrix_interface_t *)(interface))->ptr)
+#define STARPU_MATRIX_GET_NX(interface)	(((starpu_matrix_interface_t *)(interface))->nx)
+#define STARPU_MATRIX_GET_NY(interface)	(((starpu_matrix_interface_t *)(interface))->ny)
+#define STARPU_MATRIX_GET_LD(interface)	(((starpu_matrix_interface_t *)(interface))->ld)
+#define STARPU_MATRIX_GET_ELEMSIZE(interface)	(((starpu_matrix_interface_t *)(interface))->elemsize)
 
 
 /* BLOCK interface for 3D dense blocks */
@@ -164,13 +164,13 @@ uintptr_t starpu_block_get_local_ptr(starpu_data_handle handle);
 size_t starpu_block_get_elemsize(starpu_data_handle handle);
 
 /* helper methods */
-#define STARPU_GET_BLOCK_PTR(interface)	(((starpu_block_interface_t *)(interface))->ptr)
-#define STARPU_GET_BLOCK_NX(interface)	(((starpu_block_interface_t *)(interface))->nx)
-#define STARPU_GET_BLOCK_NY(interface)	(((starpu_block_interface_t *)(interface))->ny)
-#define STARPU_GET_BLOCK_NZ(interface)	(((starpu_block_interface_t *)(interface))->nz)
-#define STARPU_GET_BLOCK_LDY(interface)	(((starpu_block_interface_t *)(interface))->ldy)
-#define STARPU_GET_BLOCK_LDZ(interface)	(((starpu_block_interface_t *)(interface))->ldz)
-#define STARPU_GET_BLOCK_ELEMSIZE(interface)	(((starpu_block_interface_t *)(interface))->elemsize)
+#define STARPU_BLOCK_GET_PTR(interface)	(((starpu_block_interface_t *)(interface))->ptr)
+#define STARPU_BLOCK_GET_NX(interface)	(((starpu_block_interface_t *)(interface))->nx)
+#define STARPU_BLOCK_GET_NY(interface)	(((starpu_block_interface_t *)(interface))->ny)
+#define STARPU_BLOCK_GET_NZ(interface)	(((starpu_block_interface_t *)(interface))->nz)
+#define STARPU_BLOCK_GET_LDY(interface)	(((starpu_block_interface_t *)(interface))->ldy)
+#define STARPU_BLOCK_GET_LDZ(interface)	(((starpu_block_interface_t *)(interface))->ldz)
+#define STARPU_BLOCK_GET_ELEMSIZE(interface)	(((starpu_block_interface_t *)(interface))->elemsize)
 
 /* vector interface for contiguous (non-strided) buffers */
 typedef struct starpu_vector_interface_s {
@@ -188,9 +188,9 @@ size_t starpu_vector_get_elemsize(starpu_data_handle handle);
 uintptr_t starpu_vector_get_local_ptr(starpu_data_handle handle);
 
 /* helper methods */
-#define STARPU_GET_VECTOR_PTR(interface)	(((starpu_vector_interface_t *)(interface))->ptr)
-#define STARPU_GET_VECTOR_NX(interface)	(((starpu_vector_interface_t *)(interface))->nx)
-#define STARPU_GET_VECTOR_ELEMSIZE(interface)	(((starpu_vector_interface_t *)(interface))->elemsize)
+#define STARPU_VECTOR_GET_PTR(interface)	(((starpu_vector_interface_t *)(interface))->ptr)
+#define STARPU_VECTOR_GET_NX(interface)	(((starpu_vector_interface_t *)(interface))->nx)
+#define STARPU_VECTOR_GET_ELEMSIZE(interface)	(((starpu_vector_interface_t *)(interface))->elemsize)
 
 /* variable interface for a single data (not a vector, a matrix, a list, ...) */
 typedef struct starpu_variable_interface_s {
@@ -204,8 +204,8 @@ size_t starpu_variable_get_elemsize(starpu_data_handle handle);
 uintptr_t starpu_variable_get_local_ptr(starpu_data_handle handle);
 
 /* helper methods */
-#define STARPU_GET_VARIABLE_PTR(interface)	(((starpu_variable_interface_t *)(interface))->ptr)
-#define STARPU_GET_VARIABLE_ELEMSIZE(interface)	(((starpu_variable_interface_t *)(interface))->elemsize)
+#define STARPU_VARIABLE_GET_PTR(interface)	(((starpu_variable_interface_t *)(interface))->ptr)
+#define STARPU_VARIABLE_GET_ELEMSIZE(interface)	(((starpu_variable_interface_t *)(interface))->elemsize)
 
 /* CSR interface for sparse matrices (compressed sparse row representation) */
 typedef struct starpu_csr_interface_s {
@@ -232,13 +232,13 @@ uint32_t *starpu_csr_get_local_colind(starpu_data_handle handle);
 uint32_t *starpu_csr_get_local_rowptr(starpu_data_handle handle);
 size_t starpu_csr_get_elemsize(starpu_data_handle handle);
 
-#define STARPU_GET_CSR_NNZ(interface)	(((starpu_csr_interface_t *)(interface))->nnz)
-#define STARPU_GET_CSR_NROW(interface)	(((starpu_csr_interface_t *)(interface))->nrow)
-#define STARPU_GET_CSR_NZVAL(interface)	(((starpu_csr_interface_t *)(interface))->nzval)
-#define STARPU_GET_CSR_COLIND(interface)	(((starpu_csr_interface_t *)(interface))->colind)
-#define STARPU_GET_CSR_ROWPTR(interface)	(((starpu_csr_interface_t *)(interface))->rowptr)
-#define STARPU_GET_CSR_FIRSTENTRY(interface)	(((starpu_csr_interface_t *)(interface))->firstentry)
-#define STARPU_GET_CSR_ELEMSIZE(interface)	(((starpu_csr_interface_t *)(interface))->elemsize)
+#define STARPU_CSR_GET_NNZ(interface)	(((starpu_csr_interface_t *)(interface))->nnz)
+#define STARPU_CSR_GET_NROW(interface)	(((starpu_csr_interface_t *)(interface))->nrow)
+#define STARPU_CSR_GET_NZVAL(interface)	(((starpu_csr_interface_t *)(interface))->nzval)
+#define STARPU_CSR_GET_COLIND(interface)	(((starpu_csr_interface_t *)(interface))->colind)
+#define STARPU_CSR_GET_ROWPTR(interface)	(((starpu_csr_interface_t *)(interface))->rowptr)
+#define STARPU_CSR_GET_FIRSTENTRY(interface)	(((starpu_csr_interface_t *)(interface))->firstentry)
+#define STARPU_CSR_GET_ELEMSIZE(interface)	(((starpu_csr_interface_t *)(interface))->elemsize)
 
 /* BCSR interface for sparse matrices (blocked compressed sparse row
  * representation) */

mpi/examples/mpi_lu/pxlu_kernels.c

@@ -27,17 +27,17 @@
 static inline void STARPU_PLU(common_u22)(void *descr[],
 				int s, __attribute__((unused)) void *_args)
 {
-	TYPE *right 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);
-	TYPE *left 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
-	TYPE *center 	= (TYPE *)STARPU_GET_MATRIX_PTR(descr[2]);
+	TYPE *right 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
+	TYPE *left 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
+	TYPE *center 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[2]);
 
-	unsigned dx = STARPU_GET_MATRIX_NX(descr[2]);
-	unsigned dy = STARPU_GET_MATRIX_NY(descr[2]);
-	unsigned dz = STARPU_GET_MATRIX_NY(descr[0]);
+	unsigned dx = STARPU_MATRIX_GET_NX(descr[2]);
+	unsigned dy = STARPU_MATRIX_GET_NY(descr[2]);
+	unsigned dz = STARPU_MATRIX_GET_NY(descr[0]);
 
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
-	unsigned ld22 = STARPU_GET_MATRIX_LD(descr[2]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
+	unsigned ld22 = STARPU_MATRIX_GET_LD(descr[2]);
 
 #ifdef VERBOSE_KERNELS
 	struct debug_info *info = _args;
@@ -127,14 +127,14 @@ static inline void STARPU_PLU(common_u12)(void *descr[],
 	TYPE *sub11;
 	TYPE *sub12;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);	
-	sub12 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);	
+	sub12 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld12 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld12 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx12 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny12 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx12 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny12 = STARPU_MATRIX_GET_NY(descr[1]);
 
 #ifdef VERBOSE_KERNELS
 	struct debug_info *info = _args;
@@ -234,14 +234,14 @@ static inline void STARPU_PLU(common_u21)(void *descr[],
 	TYPE *sub11;
 	TYPE *sub21;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]);
-	sub21 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[1]);
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
+	sub21 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
 
-	unsigned ld11 = STARPU_GET_MATRIX_LD(descr[0]);
-	unsigned ld21 = STARPU_GET_MATRIX_LD(descr[1]);
+	unsigned ld11 = STARPU_MATRIX_GET_LD(descr[0]);
+	unsigned ld21 = STARPU_MATRIX_GET_LD(descr[1]);
 
-	unsigned nx21 = STARPU_GET_MATRIX_NX(descr[1]);
-	unsigned ny21 = STARPU_GET_MATRIX_NY(descr[1]);
+	unsigned nx21 = STARPU_MATRIX_GET_NX(descr[1]);
+	unsigned ny21 = STARPU_MATRIX_GET_NY(descr[1]);
 	
 #ifdef VERBOSE_KERNELS
 	struct debug_info *info = _args;
@@ -342,10 +342,10 @@ static inline void STARPU_PLU(common_u11)(void *descr[],
 {
 	TYPE *sub11;
 
-	sub11 = (TYPE *)STARPU_GET_MATRIX_PTR(descr[0]); 
+	sub11 = (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]); 
 
-	unsigned long nx = STARPU_GET_MATRIX_NX(descr[0]);
-	unsigned long ld = STARPU_GET_MATRIX_LD(descr[0]);
+	unsigned long nx = STARPU_MATRIX_GET_NX(descr[0]);
+	unsigned long ld = STARPU_MATRIX_GET_LD(descr[0]);
 
 	unsigned long z;
 

mpi/tests/ring.c

@@ -27,7 +27,7 @@ extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
 
 void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;
 }
 

mpi/tests/ring_async.c

@@ -27,7 +27,7 @@ extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
 
 void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;
 }
 

mpi/tests/ring_async_implicit.c

@@ -27,7 +27,7 @@ extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
 
 void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;
 }
 

mpi/tests/ring_kernel.cu

@@ -23,7 +23,7 @@ static __global__ void cuda_incrementer(unsigned *token)
 
 extern "C" void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	cuda_incrementer<<<1,1>>>(tokenptr);
 }

src/datawizard/interfaces/matrix_interface.c

@@ -98,11 +98,11 @@ struct starpu_data_interface_ops_t _starpu_interface_matrix_ops = {
 static int convert_matrix_to_gordon(void *interface, uint64_t *ptr, gordon_strideSize_t *ss) 
 {
 	size_t elemsize = GET_MATRIX_ELEMSIZE(interface);
-	uint32_t nx = STARPU_GET_MATRIX_NX(interface);
-	uint32_t ny = STARPU_GET_MATRIX_NY(interface);
-	uint32_t ld = STARPU_GET_MATRIX_LD(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_GET_MATRIX_PTR(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 */

src/datawizard/interfaces/variable_interface.c

@@ -103,21 +103,21 @@ static void register_variable_handle(starpu_data_handle handle, uint32_t home_no
 			starpu_data_get_interface_on_node(handle, node);
 
 		if (node == home_node) {
-			local_interface->ptr = STARPU_GET_VARIABLE_PTR(interface);
+			local_interface->ptr = STARPU_VARIABLE_GET_PTR(interface);
 		}
 		else {
 			local_interface->ptr = 0;
 		}
 
-		local_interface->elemsize = STARPU_GET_VARIABLE_ELEMSIZE(interface);
+		local_interface->elemsize = STARPU_VARIABLE_GET_ELEMSIZE(interface);
 	}
 }
 
 #ifdef STARPU_USE_GORDON
 int convert_variable_to_gordon(void *interface, uint64_t *ptr, gordon_strideSize_t *ss) 
 {
-	*ptr = STARPU_GET_VARIABLE_PTR(interface);
-	(*ss).size = STARPU_GET_VARIABLE_ELEMSIZE(interface);
+	*ptr = STARPU_VARIABLE_GET_PTR(interface);
+	(*ss).size = STARPU_VARIABLE_GET_ELEMSIZE(interface);
 
 	return 0;
 }
@@ -173,12 +173,12 @@ uintptr_t starpu_variable_get_local_ptr(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	return STARPU_GET_VARIABLE_PTR(starpu_data_get_interface_on_node(handle, node));
+	return STARPU_VARIABLE_GET_PTR(starpu_data_get_interface_on_node(handle, node));
 }
 
 size_t starpu_variable_get_elemsize(starpu_data_handle handle)
 {
-	return STARPU_GET_VARIABLE_ELEMSIZE(starpu_data_get_interface_on_node(handle, 0));
+	return STARPU_VARIABLE_GET_ELEMSIZE(starpu_data_get_interface_on_node(handle, 0));
 }
 
 /* memory allocation/deallocation primitives for the variable interface */
@@ -252,16 +252,16 @@ static void free_variable_buffer_on_node(void *interface, uint32_t node)
 	starpu_node_kind kind = _starpu_get_node_kind(node);
 	switch(kind) {
 		case STARPU_CPU_RAM:
-			free((void*)STARPU_GET_VARIABLE_PTR(interface));
+			free((void*)STARPU_VARIABLE_GET_PTR(interface));
 			break;
 #ifdef STARPU_USE_CUDA
 		case STARPU_CUDA_RAM:
-			cudaFree((void*)STARPU_GET_VARIABLE_PTR(interface));
+			cudaFree((void*)STARPU_VARIABLE_GET_PTR(interface));
 			break;
 #endif
 #ifdef STARPU_USE_OPENCL
                 case STARPU_OPENCL_RAM:
-                        clReleaseMemObject((void*)STARPU_GET_VARIABLE_PTR(interface));
+                        clReleaseMemObject((void*)STARPU_VARIABLE_GET_PTR(interface));
                         break;
 #endif
 		default:

tests/datawizard/cuda_codelet_unsigned_inc.cu

@@ -23,7 +23,7 @@ static __global__ void _cuda_unsigned_inc(unsigned *val)
 
 extern "C" void cuda_codelet_unsigned_inc(void *descr[], STARPU_ATTRIBUTE_UNUSED void *cl_arg)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VARIABLE_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 
 	_cuda_unsigned_inc<<<1,1>>>(val);
 

tests/datawizard/mpi_like.c

@@ -48,7 +48,7 @@ void cuda_codelet_unsigned_inc(void *descr[], __attribute__ ((unused)) void *cl_
 
 static void increment_handle_cpu_kernel(void *descr[], void *cl_arg __attribute__((unused)))
 {
-	unsigned *val = (unsigned *)STARPU_GET_VARIABLE_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*val += 1;
 }
 

tests/datawizard/mpi_like_async.c

@@ -60,7 +60,7 @@ void cuda_codelet_unsigned_inc(void *descr[], __attribute__ ((unused)) void *cl_
 
 static void increment_handle_cpu_kernel(void *descr[], void *cl_arg __attribute__((unused)))
 {
-	unsigned *val = (unsigned *)STARPU_GET_VARIABLE_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*val += 1;
 
 //	fprintf(stderr, "VAL %d (&val = %p)\n", *val, val);

tests/datawizard/scratch.c

@@ -34,11 +34,11 @@ extern void cuda_f(void *descr[], __attribute__ ((unused)) void *_args);
 
 static void cpu_f(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *v = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
-	unsigned *tmp = (unsigned *)STARPU_GET_VECTOR_PTR(descr[1]);
+	unsigned *v = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
+	unsigned *tmp = (unsigned *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	unsigned nx = STARPU_GET_VECTOR_NX(descr[0]);
-	size_t elemsize = STARPU_GET_VECTOR_ELEMSIZE(descr[0]);
+	unsigned nx = STARPU_VECTOR_GET_NX(descr[0]);
+	size_t elemsize = STARPU_VECTOR_GET_ELEMSIZE(descr[0]);
 	
 	memcpy(tmp, v, nx*elemsize);
 

tests/datawizard/scratch_cuda.cu

@@ -34,11 +34,11 @@ static __global__ void increment_vector(unsigned *v, unsigned *tmp, int nx)
 
 extern "C" void cuda_f(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	unsigned *v = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
-	unsigned *tmp = (unsigned *)STARPU_GET_VECTOR_PTR(descr[1]);
+	unsigned *v = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
+	unsigned *tmp = (unsigned *)STARPU_VECTOR_GET_PTR(descr[1]);
 
-	unsigned nx = STARPU_GET_VECTOR_NX(descr[0]);
-	size_t elemsize = STARPU_GET_VECTOR_ELEMSIZE(descr[0]);
+	unsigned nx = STARPU_VECTOR_GET_NX(descr[0]);
+	size_t elemsize = STARPU_VECTOR_GET_ELEMSIZE(descr[0]);
 	
 	cudaMemcpy(tmp, v, nx*elemsize, cudaMemcpyDeviceToDevice);
 

tests/datawizard/sync_and_notify_data.c

@@ -60,13 +60,13 @@ static unsigned v[VECTORSIZE] __attribute__((aligned(128))) = {0, 0, 0, 0};
 
 void cpu_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[0]++;
 }
 
 void cpu_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[2]++;
 }
 

tests/datawizard/sync_and_notify_data_implicit.c

@@ -62,13 +62,13 @@ static unsigned v[VECTORSIZE] __attribute__((aligned(128))) = {0, 0, 0, 0};
 
 void cpu_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[0]++;
 }
 
 void cpu_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[2]++;
 }
 

tests/datawizard/sync_and_notify_data_kernels.cu

@@ -27,7 +27,7 @@ extern "C" __global__ void _cuda_incA(unsigned *v)
 
 extern "C" void cuda_codelet_incA(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	unsigned *v = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *v = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	_cuda_incA<<<1,1>>>(v);
 
@@ -45,7 +45,7 @@ extern "C" __global__ void _cuda_incC(unsigned *v)
 
 extern "C" void cuda_codelet_incC(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	unsigned *v = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *v = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	_cuda_incC<<<1,1>>>(v);
 

tests/datawizard/sync_and_notify_data_opencl.c

@@ -22,7 +22,7 @@ extern struct starpu_opencl_program opencl_code;
 
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 {
-        unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+        unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err;
@@ -51,7 +51,7 @@ void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 
 void opencl_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	cl_kernel kernel;
 	cl_command_queue queue;
 	int id, devid, err;

tests/datawizard/write_only_tmp_buffer.c

@@ -28,7 +28,7 @@ starpu_data_handle v_handle;
 #include <CL/cl.h>
 static void opencl_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	cl_mem buf = (cl_mem)STARPU_GET_VECTOR_PTR(descr[0]);
+	cl_mem buf = (cl_mem)STARPU_VECTOR_GET_PTR(descr[0]);
         char ptr = 42;
         cl_command_queue queue;
         int id = starpu_worker_get_id();
@@ -42,7 +42,7 @@ static void opencl_codelet_null(void *descr[], __attribute__ ((unused)) void *_a
 #ifdef STARPU_USE_CUDA
 static void cuda_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	cudaMemset(buf, 42, 1);
 }
@@ -50,14 +50,14 @@ static void cuda_codelet_null(void *descr[], __attribute__ ((unused)) void *_arg
 
 static void cpu_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	*buf = 42;
 }
 
 static void display_var(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_VECTOR_GET_PTR(descr[0]);
 	if (*buf != 42)
 	{
 		fprintf(stderr, "Value = %c (should be %c)\n", *buf, 42);