More prefixing ...

find . -type f -not -name "*svn*"|xargs sed -i s/"\bNMAXCPUS\b"/STARPU_NMAXCPUS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bNON_BLOCKING_DRIVERS\b"/STARPU_NON_BLOCKING_DRIVERS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bNO_PRIO\b"/STARPU_NO_PRIO/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bPERF_DEBUG\b"/STARPU_PERF_DEBUG/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bPERF_MODEL_DIR\b"/STARPU_PERF_MODEL_DIR/g

configure.ac

@@ -135,7 +135,7 @@ if test x$enable_cpu = xyes; then
 
 	# This value is set quite randomly, but StarPU should not take more
 	# core than there are in the system
-	AC_DEFINE(NMAXCPUS, [16], [Maximum number of CPUs supported])
+	AC_DEFINE(STARPU_NMAXCPUS, [16], [Maximum number of CPUs supported])
 fi
 
 ###############################################################################
@@ -276,7 +276,7 @@ AM_CONDITIONAL(STARPU_USE_GORDON, test x$enable_gordon = xyes)
 
 if test x$enable_gordon = xyes; then
 	AC_DEFINE(STARPU_USE_GORDON, [1], [Cell support is enabled])
-	AC_DEFINE(NON_BLOCKING_DRIVERS, [1], [drivers must progress])
+	AC_DEFINE(STARPU_NON_BLOCKING_DRIVERS, [1], [drivers must progress])
 fi
 
 ###############################################################################
@@ -382,9 +382,9 @@ AC_ARG_ENABLE(perf-debug, [AS_HELP_STRING([--enable-perf-debug],
 			[enable performance debugging])],
 			enable_perf_debug=$enableval, enable_perf_debug=no)
 AC_MSG_RESULT($enable_perf_debug)
-AC_SUBST(PERF_DEBUG, $enable_perf_debug)
+AC_SUBST(STARPU_PERF_DEBUG, $enable_perf_debug)
 if test x$enable_perf_debuf = xyes; then
-	AC_DEFINE(PERF_DEBUG, [1], [enable performance debug])
+	AC_DEFINE(STARPU_PERF_DEBUG, [1], [enable performance debug])
 	CPPFLAGS="${CPPFLAGS} -pg "
 	LDFLAGS="${LDFLAGS} -pg "
 fi
@@ -446,7 +446,7 @@ AC_ARG_ENABLE(priority, [AS_HELP_STRING([--disable-priority],
 			enable_priority=$enableval, enable_priority=yes)
 AC_MSG_RESULT($enable_priority)
 if test x$enable_priority = xno; then
-	AC_DEFINE(NO_PRIO, [1], [Disable priorities])
+	AC_DEFINE(STARPU_NO_PRIO, [1], [Disable priorities])
 fi
 
 AC_MSG_CHECKING(whether allocation cache should be used)
@@ -466,7 +466,7 @@ AC_ARG_WITH(perf-model-dir, [AS_HELP_STRING([--with-perf-model-dir=<dir>], [spec
 	
 		perf_model_dir=$withval
 		have_explicit_perf_model_dir=yes
-		AC_DEFINE_UNQUOTED(PERF_MODEL_DIR, ["$perf_model_dir"], [performance models location])
+		AC_DEFINE_UNQUOTED(STARPU_PERF_MODEL_DIR, ["$perf_model_dir"], [performance models location])
 	], [
 		# by default, we put the performance models in
 		# $HOME/.starpu/sampling/

src/core/mechanisms/fifo_queues.c

@@ -63,7 +63,7 @@ struct jobq_s *create_fifo(void)
 
 int fifo_push_prio_task(struct jobq_s *q, job_t task)
 {
-#ifndef NO_PRIO
+#ifndef STARPU_NO_PRIO
 	STARPU_ASSERT(q);
 	struct fifo_jobq_s *fifo_queue = q->queue;
 

src/core/mechanisms/priority_queues.c

@@ -102,7 +102,7 @@ job_t priority_pop_task(struct jobq_s *q)
 
 	if ((queue->total_njobs == 0) && _starpu_machine_is_running())
 	{
-#ifdef NON_BLOCKING_DRIVERS
+#ifdef STARPU_NON_BLOCKING_DRIVERS
 		_starpu_datawizard_progress(q->memory_node, 1);
 #else
 		pthread_cond_wait(&q->activity_cond, &q->activity_mutex);

src/core/mechanisms/stack_queues.c

@@ -86,7 +86,7 @@ unsigned get_stack_nprocessed(struct jobq_s *q)
 
 void stack_push_prio_task(struct jobq_s *q, job_t task)
 {
-#ifndef NO_PRIO
+#ifndef STARPU_NO_PRIO
 	STARPU_ASSERT(q);
 	struct stack_jobq_s *stack_queue = q->queue;
 

src/core/perfmodel/perfmodel.c

@@ -147,9 +147,9 @@ static int directory_existence_was_tested = 0;
 
 void _starpu_get_perf_model_dir(char *path, size_t maxlen)
 {
-#ifdef PERF_MODEL_DIR
+#ifdef STARPU_PERF_MODEL_DIR
 	/* use the directory specified at configure time */
-	snprintf(path, maxlen, "%s", PERF_MODEL_DIR);
+	snprintf(path, maxlen, "%s", STARPU_PERF_MODEL_DIR);
 #else
 	/* by default, we use $HOME/.starpu/sampling */
 	const char *home_path = getenv("HOME");
@@ -189,8 +189,8 @@ void create_sampling_directory_if_needed(void)
 		_starpu_get_perf_model_dir(perf_model_dir, 256);
 
 		/* The performance of the codelets are stored in
-		 * $PERF_MODEL_DIR/codelets/ while those of the bus are stored in
-		 * $PERF_MODEL_DIR/bus/ so that we don't have name collisions */
+		 * $STARPU_PERF_MODEL_DIR/codelets/ while those of the bus are stored in
+		 * $STARPU_PERF_MODEL_DIR/bus/ so that we don't have name collisions */
 		
 		/* Testing if a directory exists and creating it otherwise 
 		   may not be safe: it is possible that the permission are

src/core/perfmodel/perfmodel_history.c

@@ -254,7 +254,7 @@ static void save_history_based_model(struct starpu_perfmodel_t *model)
 
 	/* TODO checks */
 
-	/* filename = $PERF_MODEL_DIR/codelets/symbol.hostname */
+	/* filename = $STARPU_PERF_MODEL_DIR/codelets/symbol.hostname */
 	char path[256];
 	get_model_path(model, path, 256);
 

src/core/policies/sched_policy.c

@@ -260,7 +260,7 @@ void wait_on_sched_event(void)
 
 	if (_starpu_machine_is_running())
 	{
-#ifndef NON_BLOCKING_DRIVERS
+#ifndef STARPU_NON_BLOCKING_DRIVERS
 		pthread_cond_wait(&q->activity_cond, &q->activity_mutex);
 #endif
 	}

src/core/topology.c

@@ -269,11 +269,11 @@ static int _starpu_init_machine_config(struct machine_config_s *config,
 	if (explicitval < 0) {
 		unsigned already_busy_cpus = (config->ngordon_spus?1:0) + config->ncudagpus;
 		long avail_cpus = config->nhwcpus - (use_accelerator?already_busy_cpus:0);
-		config->ncpus = STARPU_MIN(avail_cpus, NMAXCPUS);
+		config->ncpus = STARPU_MIN(avail_cpus, STARPU_NMAXCPUS);
 	} else {
 		/* use the specified value */
 		config->ncpus = (unsigned)explicitval;
-		STARPU_ASSERT(config->ncpus <= NMAXCPUS);
+		STARPU_ASSERT(config->ncpus <= STARPU_NMAXCPUS);
 	}
 	STARPU_ASSERT(config->ncpus + config->nworkers <= STARPU_NMAXWORKERS);
 

src/drivers/cpu/driver_cpu.h

@@ -28,8 +28,8 @@
 
 void *_starpu_cpu_worker(void *);
 
-#ifndef NMAXCPUS
-#define NMAXCPUS       4
+#ifndef STARPU_NMAXCPUS
+#define STARPU_NMAXCPUS       4
 #endif
 
 #endif //  __DRIVER_CPU_H__

tests/heat/dmda.sh

@@ -47,7 +47,7 @@ DIR=$PWD
 ROOTDIR=$DIR/../..
 TIMINGDIR=$DIR/timings-dmda/
 SAMPLINGDIR=$DIR/sampling/
-export PERF_MODEL_DIR=$SAMPLINGDIR
+export STARPU_PERF_MODEL_DIR=$SAMPLINGDIR
 
 mkdir -p $TIMINGDIR
 mkdir -p $SAMPLINGDIR

tests/heat/granularity.sh

@@ -138,7 +138,7 @@ mkdir -p $SAMPLINGDIR
 #grainlist="1024 2048 1024 512 256"
 grainlist="256 32 64 128 256 512 1024 2048 4096"
 
-export PERF_MODEL_DIR=$SAMPLINGDIR
+export STARPU_PERF_MODEL_DIR=$SAMPLINGDIR
 
 cd $ROOTDIR
 

tests/heat/sched.sh

@@ -89,7 +89,7 @@ DIR=$PWD
 ROOTDIR=$DIR/../..
 TIMINGDIR=$DIR/timings-sched/
 SAMPLINGDIR=$DIR/sampling/
-export PERF_MODEL_DIR=$SAMPLINGDIR
+export STARPU_PERF_MODEL_DIR=$SAMPLINGDIR
 
 mkdir -p $TIMINGDIR
 mkdir -p $SAMPLINGDIR