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

find . -type f -not -name "*svn*"|xargs sed -i s/"\bMODEL_DEBUG\b"/STARPU_MODEL_DEBUG/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_FFTW\b"/STARPU_HAVE_FFTW/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_FFTWF\b"/STARPU_HAVE_FFTWF/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_FFTWL\b"/STARPU_HAVE_FFTWL/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_LIBNUMA\b"/STARPU_HAVE_LIBNUMA/g

configure.ac

@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([set_mempolicy],[numa],[enable_libnuma=yes],[enable_libnuma=no])
 AC_MSG_CHECKING(whether libnuma is available)
 AC_MSG_RESULT($enable_libnuma)
 if test x$enable_libnuma = xyes; then
-	AC_DEFINE(HAVE_LIBNUMA,[],[libnuma is available])
+	AC_DEFINE(STARPU_HAVE_LIBNUMA,[],[libnuma is available])
 fi
 
 ###############################################################################
@@ -395,7 +395,7 @@ AC_ARG_ENABLE(model-debug, [AS_HELP_STRING([--enable-model-debug],
 			enable_model_debug=$enableval, enable_model_debug=no)
 AC_MSG_RESULT($enable_model_debug)
 if  test x$enable_model_debug = xyes; then
-	AC_DEFINE(MODEL_DEBUG, [1], [enable performance model debug])
+	AC_DEFINE(STARPU_MODEL_DEBUG, [1], [enable performance model debug])
 fi
 
 AC_MSG_CHECKING(whether statistics should be generated)
@@ -664,25 +664,25 @@ have_fftwf=no
 have_fftwl=no
 
 PKG_CHECK_MODULES([FFTW],  [fftw3],  [
-  AC_DEFINE([HAVE_FFTW], [1], [Define to 1 if you have the libfftw3 library.])
-  AC_SUBST([HAVE_FFTW], [1])
+  AC_DEFINE([STARPU_HAVE_FFTW], [1], [Define to 1 if you have the libfftw3 library.])
+  AC_SUBST([STARPU_HAVE_FFTW], [1])
   have_fftw=yes  
 ], [:])
-AM_CONDITIONAL(HAVE_FFTW, [test x$have_fftw = xyes])
+AM_CONDITIONAL(STARPU_HAVE_FFTW, [test x$have_fftw = xyes])
 
 PKG_CHECK_MODULES([FFTWF], [fftw3f], [
-  AC_DEFINE([HAVE_FFTWF], [1], [Define to 1 if you have the libfftw3f library.])
-  AC_SUBST([HAVE_FFTWF], [1])
+  AC_DEFINE([STARPU_HAVE_FFTWF], [1], [Define to 1 if you have the libfftw3f library.])
+  AC_SUBST([STARPU_HAVE_FFTWF], [1])
   have_fftwf=yes  
 ], [:])
-AM_CONDITIONAL(HAVE_FFTWF, [test x$have_fftwf = xyes])
+AM_CONDITIONAL(STARPU_HAVE_FFTWF, [test x$have_fftwf = xyes])
 
 PKG_CHECK_MODULES([FFTWL], [fftw3l], [
-  AC_DEFINE([HAVE_FFTWL], [1], [Define to 1 if you have the libfftw3l library.])
+  AC_DEFINE([STARPU_HAVE_FFTWL], [1], [Define to 1 if you have the libfftw3l library.])
   AC_SUBST([HAVE_FFTWFL], [1])
   have_fftwl=yes  
 ], [:])
-AM_CONDITIONAL(HAVE_FFTWL, [test x$have_fftwl = xyes])
+AM_CONDITIONAL(STARPU_HAVE_FFTWL, [test x$have_fftwl = xyes])
 
 PKG_CHECK_MODULES([HWLOC], [hwloc], [
   AC_DEFINE([HAVE_HWLOC], [1], [Define to 1 if you have the hwloc library.])

examples/Makefile.am

@@ -19,8 +19,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/examples/ -I$(top_builddi
 
 TESTS = $(check_PROGRAMS)
 
-if HAVE_FFTW
-if HAVE_FFTWL
+if STARPU_HAVE_FFTW
+if STARPU_HAVE_FFTWL
 SUBDIRS = starpufft
 endif
 endif

examples/cholesky/dw_cholesky_models.c

@@ -42,7 +42,7 @@ static double cpu_chol_task_11_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/1000.0f*0.894/0.79176);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cpu_chol_task_11_cost n %d cost %e\n", n, cost);
 #endif
 
@@ -57,7 +57,7 @@ static double cuda_chol_task_11_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/5.088633/0.9883);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cuda_chol_task_11_cost n %d cost %e\n", n, cost);
 #endif
 
@@ -72,7 +72,7 @@ static double cpu_chol_task_21_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/7706.674/0.95/0.9965);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cpu_chol_task_21_cost n %d cost %e\n", n, cost);
 #endif
 
@@ -87,7 +87,7 @@ static double cuda_chol_task_21_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/87.29520);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cuda_chol_task_21_cost n %d cost %e\n", n, cost);
 #endif
 
@@ -102,7 +102,7 @@ static double cpu_chol_task_22_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/8.0760);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cpu_chol_task_22_cost n %d cost %e\n", n, cost);
 #endif
 
@@ -117,7 +117,7 @@ static double cuda_chol_task_22_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/76.30666);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("cuda_chol_task_22_cost n %d cost %e\n", n, cost);
 #endif
 

examples/starpufft/double.h

@@ -17,7 +17,7 @@
 #include <complex.h>
 #include <starpu_config.h>
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 #include <fftw3.h>
 #endif
 
@@ -26,7 +26,7 @@
 #endif
 
 typedef double real;
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 typedef fftw_complex _fftw_complex;
 typedef fftw_plan _fftw_plan;
 #endif

examples/starpufft/float.h

@@ -17,7 +17,7 @@
 #include <complex.h>
 #include <starpu_config.h>
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 #include <fftw3.h>
 #endif
 
@@ -26,7 +26,7 @@
 #endif
 
 typedef float real;
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 typedef fftwf_complex _fftw_complex;
 typedef fftwf_plan _fftw_plan;
 #endif

examples/starpufft/starpufftx.c

@@ -85,14 +85,14 @@ struct STARPUFFT(plan) {
 		cudaStream_t stream;
 		int stream_is_initialized;
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		_fftw_plan plan1_cpu, plan2_cpu;
 		_fftw_complex *in1, *out1;
 		_fftw_complex *in2, *out2;
 #endif
 	} plans[STARPU_NMAXWORKERS];
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	_fftw_plan plan_gather;
 #endif
 
@@ -235,7 +235,7 @@ STARPUFFT(destroy_plan)(STARPUFFT(plan) plan)
 	for (workerid = 0; workerid < starpu_get_worker_count(); workerid++) {
 		switch (starpu_get_worker_type(workerid)) {
 		case STARPU_CPU_WORKER:
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 			_FFTW(free)(plan->plans[workerid].in1);
 			_FFTW(free)(plan->plans[workerid].out1);
 			_FFTW(destroy_plan)(plan->plans[workerid].plan1_cpu);
@@ -310,7 +310,7 @@ STARPUFFT(destroy_plan)(STARPUFFT(plan) plan)
 	STARPUFFT(free)(plan->fft1);
 	STARPUFFT(free)(plan->twisted2);
 	STARPUFFT(free)(plan->fft2);
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	_FFTW(destroy_plan)(plan->plan_gather);
 #endif
 	free(plan);
@@ -324,7 +324,7 @@ STARPUFFT(malloc)(size_t n)
 	starpu_malloc_pinned_if_possible(&res, n);
 	return res;
 #else
-#  ifdef HAVE_FFTW
+#  ifdef STARPU_HAVE_FFTW
 	return _FFTW(malloc)(n);
 #  else
 	return malloc(n);
@@ -338,7 +338,7 @@ STARPUFFT(free)(void *p)
 #ifdef STARPU_USE_CUDA
 	// TODO: FIXME
 #else
-#  ifdef HAVE_FFTW
+#  ifdef STARPU_HAVE_FFTW
 	_FFTW(free)(p);
 #  else
 	free(p);

examples/starpufft/starpufftx1d.c

@@ -130,7 +130,7 @@ STARPUFFT(twist1_1d_kernel_cpu)(void *descr[], void *_args)
 		twisted1[j] = in[i+j*n1];
 }
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 /* Perform an n2 fft */
 static void
 STARPUFFT(fft1_1d_kernel_cpu)(void *descr[], void *_args)
@@ -182,7 +182,7 @@ STARPUFFT(twist2_1d_kernel_cpu)(void *descr[], void *_args)
 	}
 }
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 /* Perform n2/DIV_1D (n1) ffts */
 static void
 STARPUFFT(fft2_1d_kernel_cpu)(void *descr[], void *_args)
@@ -275,14 +275,14 @@ static starpu_codelet STARPUFFT(fft1_1d_codelet) = {
 #ifdef STARPU_USE_CUDA
 		STARPU_CUDA|
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		STARPU_CPU|
 #endif
 		0,
 #ifdef STARPU_USE_CUDA
 	.cuda_func = STARPUFFT(fft1_1d_kernel_gpu),
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	.cpu_func = STARPUFFT(fft1_1d_kernel_cpu),
 #endif
 	.model = &STARPUFFT(fft1_1d_model),
@@ -301,14 +301,14 @@ static starpu_codelet STARPUFFT(fft2_1d_codelet) = {
 #ifdef STARPU_USE_CUDA
 		STARPU_CUDA|
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		STARPU_CPU|
 #endif
 		0,
 #ifdef STARPU_USE_CUDA
 	.cuda_func = STARPUFFT(fft2_1d_kernel_gpu),
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	.cpu_func = STARPUFFT(fft2_1d_kernel_cpu),
 #endif
 	.model = &STARPUFFT(fft2_1d_model),
@@ -392,7 +392,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 	for (workerid = 0; workerid < starpu_get_worker_count(); workerid++) {
 		switch (starpu_get_worker_type(workerid)) {
 		case STARPU_CPU_WORKER:
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 			/* first fft plan: one n2 fft */
 			plan->plans[workerid].in1 = _FFTW(malloc)(plan->totsize2 * sizeof(_fftw_complex));
 			memset(plan->plans[workerid].in1, 0, plan->totsize2 * sizeof(_fftw_complex));

examples/starpufft/starpufftx2d.c

@@ -150,7 +150,7 @@ STARPUFFT(twist1_2d_kernel_cpu)(void *descr[], void *_args)
 			twisted1[k*m2+l] = in[i*m+j+k*m*n1+l*m1];
 }
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 /* Perform an n2,m2 fft */
 static void
 STARPUFFT(fft1_2d_kernel_cpu)(void *descr[], void *_args)
@@ -212,7 +212,7 @@ STARPUFFT(twist2_2d_kernel_cpu)(void *descr[], void *_args)
 	}
 }
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 /* Perform (n2/DIV_2D_N)*(m2/DIV_2D_M) (n1,m1) ffts */
 static void
 STARPUFFT(fft2_2d_kernel_cpu)(void *descr[], void *_args)
@@ -315,14 +315,14 @@ static starpu_codelet STARPUFFT(fft1_2d_codelet) = {
 #ifdef STARPU_USE_CUDA
 		STARPU_CUDA|
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		STARPU_CPU|
 #endif
 		0,
 #ifdef STARPU_USE_CUDA
 	.cuda_func = STARPUFFT(fft1_2d_kernel_gpu),
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	.cpu_func = STARPUFFT(fft1_2d_kernel_cpu),
 #endif
 	.model = &STARPUFFT(fft1_2d_model),
@@ -341,14 +341,14 @@ static starpu_codelet STARPUFFT(fft2_2d_codelet) = {
 #ifdef STARPU_USE_CUDA
 		STARPU_CUDA|
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		STARPU_CPU|
 #endif
 		0,
 #ifdef STARPU_USE_CUDA
 	.cuda_func = STARPUFFT(fft2_2d_kernel_gpu),
 #endif
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	.cpu_func = STARPUFFT(fft2_2d_kernel_cpu),
 #endif
 	.model = &STARPUFFT(fft2_2d_model),
@@ -451,7 +451,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 	for (workerid = 0; workerid < starpu_get_worker_count(); workerid++) {
 		switch (starpu_get_worker_type(workerid)) {
 		case STARPU_CPU_WORKER:
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 			/* first fft plan: one n2*m2 fft */
 			plan->plans[workerid].in1 = _FFTW(malloc)(plan->totsize2 * sizeof(_fftw_complex));
 			memset(plan->plans[workerid].in1, 0, plan->totsize2 * sizeof(_fftw_complex));

examples/starpufft/testx.c

@@ -28,7 +28,7 @@
 
 #undef STARPU_USE_CUDA
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 #include <fftw3.h>
 #endif
 #ifdef STARPU_USE_CUDA
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 	size_t bytes;
 	int n = 0, m = 0;
 	STARPUFFT(plan) plan;
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	_FFTW(plan) fftw_plan;
 #endif
 #ifdef STARPU_USE_CUDA
@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
 
 	STARPUFFT(complex) *out = STARPUFFT(malloc)(size * sizeof(*out));
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	STARPUFFT(complex) *out_fftw = STARPUFFT(malloc)(size * sizeof(*out_fftw));
 #endif
 
@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
 
 	if (argc == 2) {
 		plan = STARPUFFT(plan_dft_1d)(n, SIGN, 0);
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		fftw_plan = _FFTW(plan_dft_1d)(n, in, out_fftw, SIGN, FFTW_ESTIMATE);
 #endif
 #ifdef STARPU_USE_CUDA
@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
 
 	} else if (argc == 3) {
 		plan = STARPUFFT(plan_dft_2d)(n, m, SIGN, 0);
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 		fftw_plan = _FFTW(plan_dft_2d)(n, m, in, out_fftw, SIGN, FFTW_ESTIMATE);
 #endif
 #ifdef STARPU_USE_CUDA
@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) {
 		assert(0);
 	}
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	gettimeofday(&begin, NULL);
 	_FFTW(execute)(fftw_plan);
 	gettimeofday(&end, NULL);
@@ -150,14 +150,14 @@ int main(int argc, char *argv[]) {
 	for (i = 0; i < 16; i++)
 		printf("(%f,%f) ", cimag(out[i]), creal(out[i]));
 	printf("\n\n");
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	for (i = 0; i < 16; i++)
 		printf("(%f,%f) ", cimag(out_fftw[i]), creal(out_fftw[i]));
 	printf("\n\n");
 #endif
 #endif
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 {
 	double max = 0., tot = 0., norm = 0., normdiff = 0.;
 	for (i = 0; i < size; i++) {
@@ -216,7 +216,7 @@ int main(int argc, char *argv[]) {
 	STARPUFFT(free)(in);
 	STARPUFFT(free)(out);
 
-#ifdef HAVE_FFTW
+#ifdef STARPU_HAVE_FFTW
 	STARPUFFT(free)(out_fftw);
 #endif
 

examples/strassen/strassen_models.c

@@ -45,7 +45,7 @@ static double self_add_sub_cost(starpu_buffer_descr *descr)
 
 	double cost = (n*n)/10.0f/4.0f/7.75f;
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("self add sub cost %e n = %d\n", cost, n);
 #endif
 
@@ -60,7 +60,7 @@ static double cuda_self_add_sub_cost(starpu_buffer_descr *descr)
 
 	double cost = (n*n)/10.0f/4.0f;
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("self add sub cost %e n = %d\n", cost, n);
 #endif
 
@@ -75,7 +75,7 @@ static double add_sub_cost(starpu_buffer_descr *descr)
 
 	double cost = (1.45f*n*n)/10.0f/2.0f;
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("add sub cost %e n = %d\n", cost, n);
 #endif
 
@@ -90,7 +90,7 @@ static double cuda_add_sub_cost(starpu_buffer_descr *descr)
 
 	double cost = (1.45f*n*n)/10.0f/2.0f;
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("add sub cost %e n = %d\n", cost, n);
 #endif
 
@@ -106,7 +106,7 @@ static double mult_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/1000.0f/4.11f/0.2588);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("mult cost %e n = %d \n", cost, n);
 #endif
 
@@ -121,7 +121,7 @@ static double cuda_mult_cost(starpu_buffer_descr *descr)
 
 	double cost = (((double)(n)*n*n)/1000.0f/4.11f);
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	printf("mult cost %e n = %d \n", cost, n);
 #endif
 

include/starpu-perfmodel.h

@@ -73,7 +73,7 @@ struct starpu_per_arch_perfmodel_t {
 	struct starpu_htbl32_node_s *history;
 	struct starpu_history_list_t *list;
 	struct starpu_regression_model_t regression;
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	FILE *debug_file;
 #endif
 };

include/starpu_config.h.in

@@ -26,17 +26,17 @@
 #undef STARPU_HAVE_SYNC_FETCH_AND_OR
 #undef STARPU_HAVE_SYNC_LOCK_TEST_AND_SET
 
-#undef MODEL_DEBUG
+#undef STARPU_MODEL_DEBUG
 #undef STARPU_NO_ASSERT
 
-#undef HAVE_FFTW
-#undef HAVE_FFTWF
-#undef HAVE_FFTWL
+#undef STARPU_HAVE_FFTW
+#undef STARPU_HAVE_FFTWF
+#undef STARPU_HAVE_FFTWL
 
 #undef STARPU_NMAXBUFS
 #undef STARPU_MAXCUDADEVS
 
-#undef HAVE_LIBNUMA
+#undef STARPU_HAVE_LIBNUMA
 
 #undef starpu_drand48
 #undef starpu_srand48

mpi/examples/mpi_lu/plu_example.c

@@ -24,7 +24,7 @@
 #include "pxlu.h"
 //#include "pxlu_kernels.h"
 
-#ifdef HAVE_LIBNUMA
+#ifdef STARPU_HAVE_LIBNUMA
 #include <numaif.h>
 #endif
 
@@ -86,7 +86,7 @@ static void parse_args(int argc, char **argv, int rank)
 		}
 
 		if (strcmp(argv[i], "-numa") == 0) {
-#ifdef HAVE_LIBNUMA
+#ifdef STARPU_HAVE_LIBNUMA
 			numa = 1;
 #else
 			if (rank == 0)
@@ -188,7 +188,7 @@ static unsigned tmp_21_block_is_needed(int rank, unsigned nblocks, unsigned i)
 
 static void init_matrix(int rank)
 {
-#ifdef HAVE_LIBNUMA
+#ifdef STARPU_HAVE_LIBNUMA
 	if (numa)
 	{
 		fprintf(stderr, "Using INTERLEAVE policy\n");

src/core/perfmodel/perfmodel_history.c

@@ -220,7 +220,7 @@ void register_model(struct starpu_perfmodel_t *model)
 	node->next = registered_models;
 	registered_models = node;
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 	create_sampling_directory_if_needed();
 
 	unsigned arch;
@@ -612,7 +612,7 @@ void _starpu_update_perfmodel_history(job_t j, enum starpu_perf_archtype arch, u
 			pthread_rwlock_unlock(&model->model_rwlock);
 		}
 
-#ifdef MODEL_DEBUG
+#ifdef STARPU_MODEL_DEBUG
 		FILE * debug_file = per_arch_model->debug_file;
 
 		pthread_rwlock_wrlock(&model->model_rwlock);

src/drivers/cpu/driver_cpu.c

@@ -69,7 +69,7 @@ static int execute_job_on_cpu(job_t j, struct worker_s *cpu_args)
 
 	push_task_output(task, 0);
 
-//#ifdef MODEL_DEBUG
+//#ifdef STARPU_MODEL_DEBUG
 	if (calibrate_model || BENCHMARK_COMM)
 	{
 		double measured = timing_delay(&codelet_start, &codelet_end);