prefix helper methods with STARPU_

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 *)GET_VECTOR_PTR(descr[0]);
+	float *localA = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
 	cufftComplex *localout;
 
 	int workerid = starpu_get_worker_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 *)GET_VECTOR_PTR(descr[0]);
+	float *localA = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	int workerid = starpu_get_worker_id();
 	

examples/axpy/axpy.c

@@ -40,10 +40,10 @@ void axpy_cpu(void *descr[], __attribute__((unused)) void *arg)
 {
 	TYPE alpha = *((TYPE *)arg);
 
-	unsigned n = GET_VECTOR_NX(descr[0]);
+	unsigned n = STARPU_GET_VECTOR_NX(descr[0]);
 
-	TYPE *block_x = (TYPE *)GET_VECTOR_PTR(descr[0]);
-	TYPE *block_y = (TYPE *)GET_VECTOR_PTR(descr[1]);
+	TYPE *block_x = (TYPE *)STARPU_GET_VECTOR_PTR(descr[0]);
+	TYPE *block_y = (TYPE *)STARPU_GET_VECTOR_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 = GET_VECTOR_NX(descr[0]);
+	unsigned n = STARPU_GET_VECTOR_NX(descr[0]);
 
-	TYPE *block_x = (TYPE *)GET_VECTOR_PTR(descr[0]);
-	TYPE *block_y = (TYPE *)GET_VECTOR_PTR(descr[1]);
+	TYPE *block_x = (TYPE *)STARPU_GET_VECTOR_PTR(descr[0]);
+	TYPE *block_y = (TYPE *)STARPU_GET_VECTOR_PTR(descr[1]);
 
 	CUBLASAXPY((int)n, alpha, block_x, 1, block_y, 1);
 	cudaThreadSynchronize();

examples/heat/dw_sparse_cg_kernels.c

@@ -52,22 +52,22 @@
 
 void core_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
 {
-	float *nzval = (float *)GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = GET_CSR_ROWPTR(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 = GET_CSR_ELEMSIZE(descr[0]);
+	uint32_t firstentry = STARPU_GET_CSR_ELEMSIZE(descr[0]);
 
-	float *vecx = (float *)GET_VECTOR_PTR(descr[1]);
-	float *vecr = (float *)GET_VECTOR_PTR(descr[2]);
-	float *vecb = (float *)GET_VECTOR_PTR(descr[3]);
+	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]);
 
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = GET_CSR_NNZ(descr[0]);
-	nrow = GET_CSR_NROW(descr[0]);
+	nnz = STARPU_GET_CSR_NNZ(descr[0]);
+	nrow = STARPU_GET_CSR_NROW(descr[0]);
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)
@@ -97,14 +97,14 @@ void core_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
 void core_codelet_func_2(void *descr[], __attribute__((unused)) void *arg)
 {
 	/* simply copy r into d */
-	uint32_t nx = GET_VECTOR_NX(descr[0]);
-	size_t elemsize = GET_VECTOR_ELEMSIZE(descr[0]);
+	uint32_t nx = STARPU_GET_VECTOR_NX(descr[0]);
+	size_t elemsize = STARPU_GET_VECTOR_ELEMSIZE(descr[0]);
 
-	STARPU_ASSERT(GET_VECTOR_NX(descr[0]) == GET_VECTOR_NX(descr[1]));
-	STARPU_ASSERT(GET_VECTOR_ELEMSIZE(descr[0]) == GET_VECTOR_ELEMSIZE(descr[1]));
+	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]));
 
-	float *src = (float *)GET_VECTOR_PTR(descr[1]);
-	float *dst = (float *)GET_VECTOR_PTR(descr[0]);
+	float *src = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	float *dst = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	memcpy(dst, src, nx*elemsize);
 }
@@ -124,8 +124,8 @@ void core_codelet_func_3(void *descr[], void *arg)
 	int size;
 	
 	/* get the vector */
-	vec = (float *)GET_VECTOR_PTR(descr[0]);
-	size = (int)GET_VECTOR_NX(descr[0]);
+	vec = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	size = (int)STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	size = GET_VECTOR_NX(descr[0]);
+	vec = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	dot = cublasSdot (size, vec, 1, vec, 1);
 
@@ -163,20 +163,20 @@ void cublas_codelet_func_3(void *descr[], void *arg)
 
 void core_codelet_func_4(void *descr[], __attribute__((unused)) void *arg)
 {
-	float *nzval = (float *)GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = GET_CSR_ROWPTR(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 = GET_CSR_FIRSTENTRY(descr[0]);
+	uint32_t firstentry = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
 
-	float *vecd = (float *)GET_VECTOR_PTR(descr[1]);
-	float *vecq = (float *)GET_VECTOR_PTR(descr[2]);
+	float *vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	float *vecq = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = GET_CSR_NNZ(descr[0]);
-	nrow = GET_CSR_NROW(descr[0]);
+	nnz = STARPU_GET_CSR_NNZ(descr[0]);
+	nrow = STARPU_GET_CSR_NROW(descr[0]);
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)
@@ -215,11 +215,11 @@ void core_codelet_func_5(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	STARPU_ASSERT(GET_VECTOR_NX(descr[0]) == GET_VECTOR_NX(descr[1]));
-	size = GET_VECTOR_NX(descr[0]);
+	STARPU_ASSERT(STARPU_GET_VECTOR_NX(descr[0]) == STARPU_GET_VECTOR_NX(descr[1]));
+	size = STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	STARPU_ASSERT(GET_VECTOR_NX(descr[0]) == GET_VECTOR_NX(descr[1]));
-	size = GET_VECTOR_NX(descr[0]);
+	STARPU_ASSERT(STARPU_GET_VECTOR_NX(descr[0]) == STARPU_GET_VECTOR_NX(descr[1]));
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	dot = cublasSdot (size, vecd, 1, vecq, 1);
 
@@ -263,10 +263,10 @@ void core_codelet_func_6(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecx = (float *)GET_VECTOR_PTR(descr[0]);
-	vecd = (float *)GET_VECTOR_PTR(descr[1]);
+	vecx = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	vecd = (float *)GET_VECTOR_PTR(descr[1]);
+	vecx = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	cublasSaxpy (size, pb->alpha, vecd, 1, vecx, 1);
 }
@@ -302,10 +302,10 @@ void core_codelet_func_7(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)GET_VECTOR_PTR(descr[1]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	vecq = (float *)GET_VECTOR_PTR(descr[1]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecq = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	cublasSaxpy (size, -pb->alpha, vecq, 1, vecr, 1);
 }
@@ -344,8 +344,8 @@ void core_codelet_func_8(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecr = (float *)GET_VECTOR_PTR(descr[0]);
-	size = GET_VECTOR_NX(descr[0]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	size = STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	size = GET_VECTOR_NX(descr[0]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	dot = cublasSdot (size, vecr, 1, vecr, 1);
 
@@ -389,10 +389,10 @@ void core_codelet_func_9(void *descr[], void *arg)
 	uint32_t size;
 	
 	/* get the vector */
-	vecd = (float *)GET_VECTOR_PTR(descr[0]);
-	vecr = (float *)GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	vecr = (float *)GET_VECTOR_PTR(descr[1]);
+	vecd = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
+	vecr = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
 
-	size = GET_VECTOR_NX(descr[0]);
+	size = STARPU_GET_VECTOR_NX(descr[0]);
 
 	/* d = beta d */
 	cublasSscal(size, pb->beta, vecd, 1);

examples/incrementer/incrementer.c

@@ -27,7 +27,7 @@ extern void cuda_codelet_host(float *tab);
 
 void core_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	float *val = (float *)GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
+	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	cuda_incrementer<<<1,1>>>(val);
 }

examples/spmv/dw_block_spmv_kernels.c

@@ -24,8 +24,8 @@ static inline void common_block_spmv(void *descr[], int s, __attribute__((unused
 {
 	//printf("22\n");
 	float *block 	= (float *)GET_BLAS_PTR(descr[0]);
-	float *in 	= (float *)GET_VECTOR_PTR(descr[1]);
-	float *out 	= (float *)GET_VECTOR_PTR(descr[2]);
+	float *in 	= (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	float *out 	= (float *)STARPU_GET_VECTOR_PTR(descr[2]);
 
 	unsigned dx = GET_BLAS_NX(descr[0]);
 	unsigned dy = GET_BLAS_NY(descr[0]);

examples/spmv/dw_spmv.c

@@ -35,18 +35,18 @@ extern void spmv_kernel_cpu_wrapper(uint32_t nnz, uint32_t nrow, float *nzval,
 
 void spmv_kernel_cuda(void *descr[], void *args)
 {
-	uint32_t nnz = GET_CSR_NNZ(descr[0]);
-	uint32_t nrow = GET_CSR_NROW(descr[0]);
-	float *nzval = (float *)GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = GET_CSR_ROWPTR(descr[0]);
-	uint32_t firstentry = GET_CSR_FIRSTENTRY(descr[0]);
+	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 *)GET_VECTOR_PTR(descr[1]);
-	uint32_t nx_in = GET_VECTOR_NX(descr[1]);
+	float *vecin = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	uint32_t nx_in = STARPU_GET_VECTOR_NX(descr[1]);
 
-	float *vecout = (float *)GET_VECTOR_PTR(descr[2]);
-	uint32_t nx_out = GET_VECTOR_NX(descr[2]);
+	float *vecout = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
+	uint32_t nx_out = STARPU_GET_VECTOR_NX(descr[2]);
 
 	spmv_kernel_cpu_wrapper(nnz, nrow, nzval, colind, rowptr, firstentry, vecin, nx_in, vecout, nx_out);
 }
@@ -93,23 +93,23 @@ void parse_args(int argc, char **argv)
 
 void core_spmv(void *descr[], __attribute__((unused))  void *arg)
 {
-	float *nzval = (float *)GET_CSR_NZVAL(descr[0]);
-	uint32_t *colind = GET_CSR_COLIND(descr[0]);
-	uint32_t *rowptr = GET_CSR_ROWPTR(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]);
 
-	float *vecin = (float *)GET_VECTOR_PTR(descr[1]);
-	float *vecout = (float *)GET_VECTOR_PTR(descr[2]);
+	float *vecin = (float *)STARPU_GET_VECTOR_PTR(descr[1]);
+	float *vecout = (float *)STARPU_GET_VECTOR_PTR(descr[2]);
 
-	uint32_t firstelem = GET_CSR_FIRSTENTRY(descr[0]);
+	uint32_t firstelem = STARPU_GET_CSR_FIRSTENTRY(descr[0]);
 
 	uint32_t nnz;
 	uint32_t nrow;
 
-	nnz = GET_CSR_NNZ(descr[0]);
-	nrow = GET_CSR_NROW(descr[0]);
+	nnz = STARPU_GET_CSR_NNZ(descr[0]);
+	nrow = STARPU_GET_CSR_NROW(descr[0]);
 
-	//STARPU_ASSERT(nrow == GET_VECTOR_NX(descr[1]));
-	STARPU_ASSERT(nrow == GET_VECTOR_NX(descr[2]));
+	//STARPU_ASSERT(nrow == STARPU_GET_VECTOR_NX(descr[1]));
+	STARPU_ASSERT(nrow == STARPU_GET_VECTOR_NX(descr[2]));
 
 	unsigned row;
 	for (row = 0; row < nrow; row++)

examples/starpufft/starpufftx1d.c

@@ -29,8 +29,8 @@ STARPUFFT(twist1_1d_kernel_gpu)(void *descr[], void *_args)
 	int n1 = plan->n1[0];
 	int n2 = plan->n2[0];
 
-	_cufftComplex * restrict in = (_cufftComplex *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict twisted1 = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
+	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
 	
 	cudaStream_t stream = STARPUFFT(get_local_stream)(plan, starpu_get_worker_id());
 
@@ -49,9 +49,9 @@ STARPUFFT(fft1_1d_kernel_gpu)(void *descr[], void *_args)
 	int n2 = plan->n2[0];
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
-	const _cufftComplex * restrict roots = (_cufftComplex *)GET_VECTOR_PTR(descr[2]);
+	_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]);
 
 	int workerid = starpu_get_worker_id();
 
@@ -87,8 +87,8 @@ STARPUFFT(fft2_1d_kernel_gpu)(void *descr[], void *_args)
 	int n3 = n2/DIV_1D;
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
 
 	int workerid = starpu_get_worker_id();
 
@@ -121,8 +121,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) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[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]);
 
 	//printf("twist1 %d %g\n", i, (double) cabs(plan->in[i]));
 
@@ -142,8 +142,8 @@ STARPUFFT(fft1_1d_kernel_cpu)(void *descr[], void *_args)
 	int n2 = plan->n2[0];
 	int workerid = starpu_get_worker_id();
 
-	const STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict fft1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[1]);
+	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]);
 
 	_fftw_complex * restrict worker_in1 = (STARPUFFT(complex) *)plan->plans[workerid].in1;
 	_fftw_complex * restrict worker_out1 = (STARPUFFT(complex) *)plan->plans[workerid].out1;
@@ -171,7 +171,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) *)GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	//printf("twist2 %d %g\n", jj, (double) cabs(plan->fft1[jj]));
 
@@ -192,8 +192,8 @@ STARPUFFT(fft2_1d_kernel_cpu)(void *descr[], void *_args)
 	//int jj = args->jj;
 	int workerid = starpu_get_worker_id();
 
-	const STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[1]);
+	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]);
 
 	//printf("fft2 %d %g\n", jj, (double) cabs(twisted2[plan->totsize4-1]));
 
@@ -220,7 +220,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) *)GET_VECTOR_PTR(descr[0]);
+	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict twisted1 = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
+	_cufftComplex * restrict twisted1 = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
 
 	cudaStream_t stream = STARPUFFT(get_local_stream)(plan, starpu_get_worker_id());
 
@@ -57,10 +57,10 @@ STARPUFFT(fft1_2d_kernel_gpu)(void *descr[], void *_args)
 	int m2 = plan->n2[1];
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
-	const _cufftComplex * restrict roots0 = (_cufftComplex *)GET_VECTOR_PTR(descr[2]);
-	const _cufftComplex * restrict roots1 = (_cufftComplex *)GET_VECTOR_PTR(descr[3]);
+	_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]);
 
 	int workerid = starpu_get_worker_id();
 
@@ -101,8 +101,8 @@ STARPUFFT(fft2_2d_kernel_gpu)(void *descr[], void *_args)
 	int n;
 	cufftResult cures;
 
-	_cufftComplex * restrict in = (_cufftComplex *)GET_VECTOR_PTR(descr[0]);
-	_cufftComplex * restrict out = (_cufftComplex *)GET_VECTOR_PTR(descr[1]);
+	_cufftComplex * restrict in = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[0]);
+	_cufftComplex * restrict out = (_cufftComplex *)STARPU_GET_VECTOR_PTR(descr[1]);
 
 	int workerid = starpu_get_worker_id();
 
@@ -140,8 +140,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) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) * restrict twisted1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[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]);
 
 	//printf("twist1 %d %d %g\n", i, j, (double) cabs(plan->in[i+j]));
 
@@ -164,8 +164,8 @@ STARPUFFT(fft1_2d_kernel_cpu)(void *descr[], void *_args)
 	int m2 = plan->n2[1];
 	int workerid = starpu_get_worker_id();
 
-	const STARPUFFT(complex) *twisted1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) *fft1 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) *twisted1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) *fft1 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_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;
@@ -197,7 +197,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) *)GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) * restrict twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	//printf("twist2 %d %d %g\n", kk, ll, (double) cabs(plan->fft1[kk+ll]));
 
@@ -223,8 +223,8 @@ STARPUFFT(fft2_2d_kernel_cpu)(void *descr[], void *_args)
 	//int ll = args->ll;
 	int workerid = starpu_get_worker_id();
 
-	const STARPUFFT(complex) *twisted2 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[0]);
-	STARPUFFT(complex) *fft2 = (STARPUFFT(complex) *)GET_VECTOR_PTR(descr[1]);
+	const STARPUFFT(complex) *twisted2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
+	STARPUFFT(complex) *fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[1]);
 
 	//printf("fft2 %d %d %g\n", kk, ll, (double) cabs(twisted2[plan->totsize4-1]));
 
@@ -256,7 +256,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) *)GET_VECTOR_PTR(descr[0]);
+	const STARPUFFT(complex) * restrict fft2 = (STARPUFFT(complex) *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	//printf("twist3 %d %d %g\n", kk, ll, (double) cabs(fft2[0]));
 

include/starpu-data-interfaces.h

@@ -75,14 +75,13 @@ uintptr_t starpu_get_block_local_ptr(starpu_data_handle handle);
 size_t starpu_get_block_elemsize(starpu_data_handle handle);
 
 /* helper methods */
-/* TODO: prefix */
-#define GET_BLOCK_PTR(interface)	(((starpu_block_interface_t *)(interface))->ptr)
-#define GET_BLOCK_NX(interface)	(((starpu_block_interface_t *)(interface))->nx)
-#define GET_BLOCK_NY(interface)	(((starpu_block_interface_t *)(interface))->ny)
-#define GET_BLOCK_NZ(interface)	(((starpu_block_interface_t *)(interface))->nz)
-#define GET_BLOCK_LDY(interface)	(((starpu_block_interface_t *)(interface))->ldy)
-#define GET_BLOCK_LDZ(interface)	(((starpu_block_interface_t *)(interface))->ldz)
-#define GET_BLOCK_ELEMSIZE(interface)	(((starpu_block_interface_t *)(interface))->elemsize)
+#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)
 
 /* vector interface for contiguous (non-strided) buffers */
 typedef struct starpu_vector_interface_s {
@@ -98,9 +97,9 @@ size_t starpu_get_vector_elemsize(starpu_data_handle handle);
 uintptr_t starpu_get_vector_local_ptr(starpu_data_handle handle);
 
 /* helper methods */
-#define GET_VECTOR_PTR(interface)	(((starpu_vector_interface_t *)(interface))->ptr)
-#define GET_VECTOR_NX(interface)	(((starpu_vector_interface_t *)(interface))->nx)
-#define GET_VECTOR_ELEMSIZE(interface)	(((starpu_vector_interface_t *)(interface))->elemsize)
+#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)
 
 /* CSR interface for sparse matrices (compressed sparse row representation) */
 typedef struct starpu_csr_interface_s {
@@ -127,13 +126,13 @@ uint32_t *starpu_get_csr_local_colind(starpu_data_handle handle);
 uint32_t *starpu_get_csr_local_rowptr(starpu_data_handle handle);
 size_t starpu_get_csr_elemsize(starpu_data_handle handle);
 
-#define GET_CSR_NNZ(interface)	(((starpu_csr_interface_t *)(interface))->nnz)
-#define GET_CSR_NROW(interface)	(((starpu_csr_interface_t *)(interface))->nrow)
-#define GET_CSR_NZVAL(interface)	(((starpu_csr_interface_t *)(interface))->nzval)
-#define GET_CSR_COLIND(interface)	(((starpu_csr_interface_t *)(interface))->colind)
-#define GET_CSR_ROWPTR(interface)	(((starpu_csr_interface_t *)(interface))->rowptr)
-#define GET_CSR_FIRSTENTRY(interface)	(((starpu_csr_interface_t *)(interface))->firstentry)
-#define GET_CSR_ELEMSIZE(interface)	(((starpu_csr_interface_t *)(interface))->elemsize)
+#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)
 
 /* CSC interface for sparse matrices (compressed sparse column representation) */
 typedef struct starpu_csc_interface_s {

mpi/tests/ring.c

@@ -27,7 +27,7 @@ extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
 
 void increment_core(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_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_core(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *tokenptr = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_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 *)GET_VECTOR_PTR(descr[0]);
+	unsigned *tokenptr = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	cuda_incrementer<<<1,1>>>(tokenptr);
 }

tests/datawizard/sync_and_notify_data.c

@@ -53,13 +53,13 @@ static unsigned v[VECTORSIZE] __attribute__((aligned(128))) = {0, 0, 0, 0};
 
 void core_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
 	val[0]++;
 }
 
 void core_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *val = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *val = (unsigned *)STARPU_GET_VECTOR_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[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *v = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *v = (unsigned *)STARPU_GET_VECTOR_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[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *v = (unsigned *)GET_VECTOR_PTR(descr[0]);
+	unsigned *v = (unsigned *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	_cuda_incC<<<1,1>>>(v);
 

tests/datawizard/write_only_tmp_buffer.c

@@ -27,7 +27,7 @@ starpu_data_handle v_handle;
 #ifdef USE_CUDA
 static void cuda_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	cudaMemset(buf, 42, 1);
 }
@@ -35,14 +35,14 @@ static void cuda_codelet_null(void *descr[], __attribute__ ((unused)) void *_arg
 
 static void core_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
 
 	*buf = 42;
 }
 
 static void display_var(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	char *buf = (char *)GET_VECTOR_PTR(descr[0]);
+	char *buf = (char *)STARPU_GET_VECTOR_PTR(descr[0]);
 	if (*buf != 42)
 	{
 		fprintf(stderr, "Value = %c (should be %c)\n", *buf, 42);