Prefixing of objects defined in include/starpu_config.h.in

find . -type f -not -name "*svn*"|xargs sed -i s/"\bOPENGL_RENDER\b"/STARPU_OPENGL_RENDER/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bUSE_GTK\b"/STARPU_USE_GTK/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_POSIX_MEMALIGN\b"/STARPU_HAVE_POSIX_MEMALIGN/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_MEMALIGN\b"/STARPU_HAVE_MEMALIGN/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_MALLOC_H\b"/STARPU_HAVE_MALLOC_H/g

configure.ac

@@ -560,11 +560,11 @@ if test x$enable_opengl_render = xyes; then
 	AC_CHECK_LIB(GL, glXCreateContext,,AC_MSG_ERROR([cannot find GL]))
 	AC_CHECK_LIB(GLU, gluLookAt,,AC_MSG_ERROR([cannot find GLU]))
 	
-	AC_DEFINE(OPENGL_RENDER, [1], [enable OpenGL rendering of some examples])
+	AC_DEFINE(STARPU_OPENGL_RENDER, [1], [enable OpenGL rendering of some examples])
 fi
 
 AC_MSG_CHECKING(whether OpenGL rendering is enabled)
-AC_SUBST(OPENGL_RENDER, $enable_opengl_render)
+AC_SUBST(STARPU_OPENGL_RENDER, $enable_opengl_render)
 AC_MSG_RESULT($enable_opengl_render)
 
 # In case there are BLAS kernels that are used by the example applications

examples/cholesky/dw_cholesky_no_stride.c

@@ -277,7 +277,7 @@ int main(int argc, char **argv)
 	for (x = 0; x < nblocks; x++)
 	{
 		if (x <= y) {
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&A[y][x], 128, BLOCKSIZE*BLOCKSIZE*sizeof(float));
 #else
 			A[y][x] = malloc(BLOCKSIZE*BLOCKSIZE*sizeof(float));

examples/heat/heat.c

@@ -757,7 +757,7 @@ int main(int argc, char **argv)
 		starpu_shutdown();
 	}
 
-#ifdef OPENGL_RENDER
+#ifdef STARPU_OPENGL_RENDER
 	opengl_render(ntheta, nthick, result, pmesh, argc, argv);
 #endif
 

examples/heat/heat.h

@@ -23,13 +23,13 @@
 #include <assert.h>
 #include <math.h>
 
-// needed for OPENGL_RENDER
+// needed for STARPU_OPENGL_RENDER
 #include <starpu_config.h>
 #include <starpu.h>
 
 #include <common/blas.h>
 
-#ifdef OPENGL_RENDER
+#ifdef STARPU_OPENGL_RENDER
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glut.h>
@@ -60,7 +60,7 @@ extern void initialize_system(float **A, float **B, unsigned dim, unsigned pinne
 
 void display_stat_heat(void);
 
-#ifdef OPENGL_RENDER
+#ifdef STARPU_OPENGL_RENDER
 extern void opengl_render(unsigned _ntheta, unsigned _nthick, float *_result, point *_pmesh, int argc_, char **argv_);
 #endif
 

examples/heat/heat_display.c

@@ -16,7 +16,7 @@
 
 #include "heat.h"
 
-#ifdef OPENGL_RENDER
+#ifdef STARPU_OPENGL_RENDER
 /*
  * Just some dummy OpenGL code to display our results 
  *
@@ -235,4 +235,4 @@ void opengl_render(unsigned _ntheta, unsigned _nthick, float *_result, point *_p
 	glutReshapeFunc(reshape);
 	glutMainLoop();
 }
-#endif // OPENGL_RENDER
+#endif // STARPU_OPENGL_RENDER

examples/mult/dw_mult.c

@@ -97,7 +97,7 @@ static void init_problem_data(void)
 	} else
 #endif
 	{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 		posix_memalign((void **)&A, 4096, zdim*ydim*sizeof(float));
 		posix_memalign((void **)&B, 4096, xdim*zdim*sizeof(float));
 		posix_memalign((void **)&C, 4096, xdim*ydim*sizeof(float));

examples/mult/dw_mult_no_stride.c

@@ -67,7 +67,7 @@ static void init_problem_data(void)
 	{
 		for (z = 0; z < nslicesz; z++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&A[y][z], MEM_ALIGNMENT, BLOCKSIZEZ*BLOCKSIZEY*sizeof(float));
 #else
 			A[y][z] = malloc(BLOCKSIZEZ*BLOCKSIZEY*sizeof(float));
@@ -80,7 +80,7 @@ static void init_problem_data(void)
 	{
 		for (x = 0; x < nslicesx; x++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&B[z][x], MEM_ALIGNMENT, BLOCKSIZEX*BLOCKSIZEZ*sizeof(float));
 #else
 			B[z][x] = malloc(BLOCKSIZEX*BLOCKSIZEZ*sizeof(float));
@@ -93,7 +93,7 @@ static void init_problem_data(void)
 	{
 		for (x = 0; x < nslicesx; x++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&C[y][x], MEM_ALIGNMENT, BLOCKSIZEX*BLOCKSIZEY*sizeof(float));
 #else
 			C[y][x] = malloc(BLOCKSIZEX*BLOCKSIZEY*sizeof(float));

examples/mult/dw_mult_no_stride_no_tag.c

@@ -79,7 +79,7 @@ static void init_problem_data(void)
 	{
 		for (z = 0; z < nslicesz; z++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&A[y][z], MEM_ALIGNMENT, BLOCKSIZEZ*BLOCKSIZEY*sizeof(float));
 #else
 			A[y][z] = malloc(BLOCKSIZEZ*BLOCKSIZEY*sizeof(float));
@@ -92,7 +92,7 @@ static void init_problem_data(void)
 	{
 		for (x = 0; x < nslicesx; x++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&B[z][x], MEM_ALIGNMENT, BLOCKSIZEX*BLOCKSIZEZ*sizeof(float));
 #else
 			B[z][x] = malloc(BLOCKSIZEX*BLOCKSIZEZ*sizeof(float));
@@ -105,7 +105,7 @@ static void init_problem_data(void)
 	{
 		for (x = 0; x < nslicesx; x++)
 		{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 			posix_memalign((void **)&C[y][x], MEM_ALIGNMENT, BLOCKSIZEX*BLOCKSIZEY*sizeof(float));
 #else
 			C[y][x] = malloc(BLOCKSIZEX*BLOCKSIZEY*sizeof(float));

examples/mult/xgemm.c

@@ -82,7 +82,7 @@ static void init_problem_data(void)
 	} else
 #endif
 	{
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
 		posix_memalign((void **)&A, 4096, zdim*ydim*sizeof(TYPE));
 		posix_memalign((void **)&B, 4096, xdim*zdim*sizeof(TYPE));
 		posix_memalign((void **)&C, 4096, xdim*ydim*sizeof(TYPE));

examples/ppm-downscaler/ppm-downscaler.c

@@ -18,7 +18,7 @@
 
 #include <starpu.h>
 
-#ifdef HAVE_MALLOC_H
+#ifdef STARPU_HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #include <stdlib.h>
@@ -34,7 +34,7 @@ struct ppm_image *allocate_new_ppm(int ncols, int nlines, int coldepth)
 	ppm->nlines = nlines;
 	ppm->coldepth = coldepth;
 
-#ifdef HAVE_MEMALIGN
+#ifdef STARPU_HAVE_MEMALIGN
 	ppm->data = memalign(16384, ncols*nlines*sizeof(struct ppm_color));
 #else
 	ppm->data = malloc(ncols*nlines*sizeof(struct ppm_color));
@@ -62,7 +62,7 @@ struct ppm_image *file_to_ppm(char *filename)
 	}
 	
 	/* allocate a buffer for the image */
-#ifdef HAVE_MEMALIGN
+#ifdef STARPU_HAVE_MEMALIGN
 	ppm->data = memalign(16384, ppm->ncols*ppm->nlines*sizeof(struct ppm_color));
 #else
 	ppm->data = malloc(ppm->ncols*ppm->nlines*sizeof(struct ppm_color));

examples/strassen2/strassen2.c

@@ -793,7 +793,7 @@ int main(int argc, char **argv)
         } else
 #endif
         {
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef STARPU_HAVE_POSIX_MEMALIGN
                 posix_memalign((void **)&bigbuffer, 4096, used_mem_predicted);
 #else
 		bigbuffer = malloc(used_mem_predicted);

include/starpu_config.h.in

@@ -11,15 +11,15 @@
 
 #undef STARPUDIR
 
-#undef OPENGL_RENDER
+#undef STARPU_OPENGL_RENDER
 
-#undef USE_GTK
+#undef STARPU_USE_GTK
 
-#undef HAVE_POSIX_MEMALIGN
+#undef STARPU_HAVE_POSIX_MEMALIGN
 
-#undef HAVE_MEMALIGN
+#undef STARPU_HAVE_MEMALIGN
 
-#undef HAVE_MALLOC_H
+#undef STARPU_HAVE_MALLOC_H
 
 #undef STARPU_HAVE_SYNC_BOOL_COMPARE_AND_SWAP
 #undef STARPU_HAVE_SYNC_FETCH_AND_ADD