Browse Source

Prefix variable names SCHED, CALIBRATE, PREFETCH, and LOGFILENAME with STARPU_

find . -type f -not -name "*svn*"|xargs sed -i s/"\bSCHED\b"/STARPU_SCHED/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bCALIBRATE\b"/STARPU_CALIBRATE/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bPREFETCH\b"/STARPU_PREFETCH/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bLOGFILENAME\b"/STARPU_LOGFILENAME/g
Nathalie Furmento 15 years ago
parent
commit
0eb83b50b2

+ 15 - 15
doc/starpu.texi

@@ -290,26 +290,26 @@ TODO
 @section Configuring the Scheduling engine
 
 @menu
-* SCHED     :: Scheduling policy
-* CALIBRATE :: Calibrate performance models
-* PREFETCH  :: Use data prefetch
+* STARPU_SCHED     :: Scheduling policy
+* STARPU_CALIBRATE :: Calibrate performance models
+* STARPU_PREFETCH  :: Use data prefetch
 * STARPU_SCHED_ALPHA  :: Computation factor
 * STARPU_SCHED_BETA  :: Communication factor
 @end menu
 
-@node SCHED
-@subsection @code{SCHED} -- Scheduling policy
+@node STARPU_SCHED
+@subsection @code{STARPU_SCHED} -- Scheduling policy
 @table @asis
 
 @item @emph{Description}:
 TODO
 
-Use @code{SCHED=help} to get the list of available schedulers
+Use @code{STARPU_SCHED=help} to get the list of available schedulers
 
 @end table
 
-@node CALIBRATE
-@subsection @code{CALIBRATE} -- Calibrate performance models
+@node STARPU_CALIBRATE
+@subsection @code{STARPU_CALIBRATE} -- Calibrate performance models
 @table @asis
 
 @item @emph{Description}:
@@ -319,8 +319,8 @@ Note: only applies to dm and dmda scheduling policies.
 
 @end table
 
-@node PREFETCH
-@subsection @code{PREFETCH} -- Use data prefetch
+@node STARPU_PREFETCH
+@subsection @code{STARPU_PREFETCH} -- Use data prefetch
 @table @asis
 
 @item @emph{Description}:
@@ -350,11 +350,11 @@ TODO
 @section Miscellaneous and debug
 
 @menu
-* LOGFILENAME  :: Select debug file name
+* STARPU_LOGFILENAME  :: Select debug file name
 @end menu
 
-@node LOGFILENAME
-@subsection @code{LOGFILENAME} -- Select debug file name
+@node STARPU_LOGFILENAME
+@subsection @code{STARPU_LOGFILENAME} -- Select debug file name
 @table @asis
 
 @item @emph{Description}:
@@ -418,7 +418,7 @@ overwrite the equivalent environnement variables.
 @table @asis 
 @item @code{sched_policy} (default = NULL):
 This is the name of the scheduling policy. This can also be specified with the
-@code{SCHED} environment variable.
+@code{STARPU_SCHED} environment variable.
 
 @item @code{ncpus} (default = -1):
 This is the maximum number of CPU cores that StarPU can use. This can also be
@@ -434,7 +434,7 @@ specified with the @code{STARPU_NGORDON} environment variable.
 
 @item @code{calibrate} (default = 0):
 If this flag is set, StarPU will calibrate the performance models when
-executing tasks. This can also be specified with the @code{CALIBRATE}
+executing tasks. This can also be specified with the @code{STARPU_CALIBRATE}
 environment variable.
 @end table
 

+ 3 - 3
mpi/examples/perf.sh

@@ -24,8 +24,8 @@ echo "got $nnodes mpi nodes"
 ncalibrate=0
 for i in `seq 1 $ncalibrate`
 do
-echo "CALIBRATE $i/$ncalibrate"
-CALIBRATE=1 SCHED="dmda" PREFETCH=1 mpirun -machinefile machinefile.${PBS_JOBID} -np $nnodes ./mpi_lu/plu_example_float -p 2 -q 2 -nblocks 32 -size $((32*$BLOCKSIZE)) -numa
+echo "STARPU_CALIBRATE $i/$ncalibrate"
+STARPU_CALIBRATE=1 STARPU_SCHED="dmda" STARPU_PREFETCH=1 mpirun -machinefile machinefile.${PBS_JOBID} -np $nnodes ./mpi_lu/plu_example_float -p 2 -q 2 -nblocks 32 -size $((32*$BLOCKSIZE)) -numa
 done
 
 func()
@@ -42,7 +42,7 @@ echo "*******************************************">> log
 cat log
 cat log >> log.all
 
-STARPU_NCPUS=0 STARPU_NCUDA=$ngpus SCHED="dmda" PREFETCH=1 mpirun -machinefile machinefile.${PBS_JOBID} -np $np ./mpi_lu/plu_example_float -p $p -q $q -nblocks $nblocks -size $(($nblocks * $BLOCKSIZE)) -numa > log.out 2> log.err
+STARPU_NCPUS=0 STARPU_NCUDA=$ngpus STARPU_SCHED="dmda" STARPU_PREFETCH=1 mpirun -machinefile machinefile.${PBS_JOBID} -np $np ./mpi_lu/plu_example_float -p $p -q $q -nblocks $nblocks -size $(($nblocks * $BLOCKSIZE)) -numa > log.out 2> log.err
 cat log.out > log
 cat log.err >> log
 cat log

+ 1 - 1
src/core/debug.c

@@ -29,7 +29,7 @@ void _starpu_open_debug_logfile(void)
 	/* what is  the name of the file ? default = "starpu.log" */
 	char *logfile_name;
 	
-	logfile_name = getenv("LOGFILENAME");
+	logfile_name = getenv("STARPU_LOGFILENAME");
 	if (!logfile_name)
 	{
 		logfile_name = "starpu.log";

+ 2 - 2
src/core/perfmodel/perfmodel.c

@@ -33,9 +33,9 @@ static double per_arch_task_expected_length(struct starpu_perfmodel_t *model, en
 	
 	if (!model->is_loaded)
 	{
-		if (starpu_get_env_number("CALIBRATE") != -1)
+		if (starpu_get_env_number("STARPU_CALIBRATE") != -1)
 		{
-			fprintf(stderr, "CALIBRATE model %s\n", model->symbol);
+			fprintf(stderr, "STARPU_CALIBRATE model %s\n", model->symbol);
 			model->benchmarking = 1;
 		}
 		else {

+ 2 - 2
src/core/perfmodel/perfmodel_history.c

@@ -369,9 +369,9 @@ static void load_history_based_model(struct starpu_perfmodel_t *model, unsigned
 	}
 
 
-	if (starpu_get_env_number("CALIBRATE") != -1)
+	if (starpu_get_env_number("STARPU_CALIBRATE") != -1)
 	{
-		fprintf(stderr, "CALIBRATE model %s\n", model->symbol);
+		fprintf(stderr, "STARPU_CALIBRATE model %s\n", model->symbol);
 		model->benchmarking = 1;
 	}
 	else {

+ 1 - 1
src/core/policies/deque-modeling-policy-data-aware.c

@@ -212,7 +212,7 @@ static void initialize_dmda_policy(struct machine_config_s *config,
 {
 	nworkers = 0;
 
-	use_prefetch = starpu_get_env_number("PREFETCH");
+	use_prefetch = starpu_get_env_number("STARPU_PREFETCH");
 	if (use_prefetch == -1)
 		use_prefetch = 0;
 

+ 1 - 1
src/core/policies/deque-modeling-policy.c

@@ -174,7 +174,7 @@ static void initialize_dm_policy(struct machine_config_s *config,
 {
 	nworkers = 0;
 
-	use_prefetch = starpu_get_env_number("PREFETCH");
+	use_prefetch = starpu_get_env_number("STARPU_PREFETCH");
 	if (use_prefetch == -1)
 		use_prefetch = 0;
 

+ 4 - 4
src/core/policies/sched_policy.c

@@ -110,9 +110,9 @@ static struct sched_policy_s *find_sched_policy_from_name(const char *policy_nam
 
 static void display_sched_help_message(void)
 {
-	const char *sched_env = getenv("SCHED");
+	const char *sched_env = getenv("STARPU_SCHED");
 	if (sched_env && (strcmp(sched_env, "help") == 0)) {
-		fprintf(stderr, "SCHED can be either of\n");
+		fprintf(stderr, "STARPU_SCHED can be either of\n");
 
 		/* display the description of all predefined policies */
 		unsigned i;
@@ -141,7 +141,7 @@ static struct sched_policy_s *select_sched_policy(struct machine_config_s *confi
 		sched_pol_name = user_conf->sched_policy_name;
 	}
 	else {
-		sched_pol_name = getenv("SCHED");
+		sched_pol_name = getenv("STARPU_SCHED");
 	}
 
 	if (sched_pol_name)
@@ -160,7 +160,7 @@ void init_sched_policy(struct machine_config_s *config)
 	/* Perhaps we have to display some help */
 	display_sched_help_message();
 
-	use_prefetch = starpu_get_env_number("PREFETCH");
+	use_prefetch = starpu_get_env_number("STARPU_PREFETCH");
 	if (use_prefetch == -1)
 		use_prefetch = 0;
 

+ 1 - 1
src/core/workers.c

@@ -439,7 +439,7 @@ void starpu_shutdown(void)
 	display_comm_ammounts();
 #endif
 
-	if (starpu_get_env_number("CALIBRATE") != -1)
+	if (starpu_get_env_number("STARPU_CALIBRATE") != -1)
 		dump_registered_models();
 
 	/* wait for their termination */

+ 1 - 1
src/datawizard/coherency.c

@@ -170,7 +170,7 @@ int fetch_data_on_node(starpu_data_handle handle, uint32_t requesting_node,
 	/* at the exit of search_existing_data_request the lock is taken is the request existed ! */
 
 	if (!r) {
-		//fprintf(stderr, "no request matched that one so we post a request %s\n", is_prefetch?"PREFETCH":"");
+		//fprintf(stderr, "no request matched that one so we post a request %s\n", is_prefetch?"STARPU_PREFETCH":"");
 		/* find someone who already has the data */
 		uint32_t src_node = 0;
 

+ 4 - 4
tests/cholesky/sched-one-gpu.sh

@@ -27,7 +27,7 @@ trace_sched()
 	sched=$1
 	use_prio=$2
 
-	export SCHED=$sched
+	export STARPU_SCHED=$sched
 
 	for blocks in `seq 24 2 24`
 	do
@@ -42,7 +42,7 @@ trace_sched()
 			OPTIONS="$OPTIONS -no-prio"
 		fi
 		
-		filename=$TIMINGDIR/sched.$SCHED.$size.$use_prio
+		filename=$TIMINGDIR/sched.$STARPU_SCHED.$size.$use_prio
 
 		for iter in `seq 1 $maxiter`
 		do
@@ -58,14 +58,14 @@ trace_sched()
 schedlist='dm dm dm dm greedy dm'
 
 export STARPU_NCUDA=1
-export CALIBRATE=1
+export STARPU_CALIBRATE=1
 
 mkdir -p $TIMINGDIR
 
 # calibrate
 for i in `seq 1 5` 
 do
-SCHED="dm" $ROOTDIR/examples/cholesky/dw_cholesky -nblocks 16 -size 16384 2> /dev/null
+STARPU_SCHED="dm" $ROOTDIR/examples/cholesky/dw_cholesky -nblocks 16 -size 16384 2> /dev/null
 done
 
 for sched in $schedlist

+ 3 - 3
tests/cholesky/sched.sh

@@ -31,7 +31,7 @@ trace_sched()
 		OPTIONS="-pin -nblocks $blocks -size $size"
 		
 		cd $ROOTDIR
-		filename=$TIMINGDIR/sched.$SCHED.$size
+		filename=$TIMINGDIR/sched.$STARPU_SCHED.$size
 
 		for iter in `seq 1 $maxiter`
 		do
@@ -53,8 +53,8 @@ schedlist="greedy no-prio dm random"
 
 for sched in $schedlist
 do
-	export SCHED=$sched
-	echo "sched : $SCHED"
+	export STARPU_SCHED=$sched
+	echo "sched : $STARPU_SCHED"
 
 	trace_sched;
 done

+ 25 - 25
tests/coverage/coverage-test.sh

@@ -75,42 +75,42 @@ save_cov "tag_example2";
 # save_cov "spmv.cpu";
 # echo "spmv.dm"
-# timing=`SCHED="dm" $BUILDDIR/examples/spmv/dw_spmv 2> /dev/null`
+# timing=`STARPU_SCHED="dm" $BUILDDIR/examples/spmv/dw_spmv 2> /dev/null`
 # save_cov "spmv.dm";
 # echo "spmv.dmda"
-# timing=`SCHED="dmda" $BUILDDIR/examples/spmv/dw_spmv 2> /dev/null`
+# timing=`STARPU_SCHED="dmda" $BUILDDIR/examples/spmv/dw_spmv 2> /dev/null`
 # save_cov "spmv.dmda";
 
 echo "strassen.ws"
-timing=`SCHED="ws" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
+timing=`STARPU_SCHED="ws" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
 save_cov "strassen.ws";
 
 
 echo "strassen.dm"
-timing=`SCHED="dm" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
 save_cov "strassen.dm";
 
 
 echo "strassen.dmda"
-timing=`SCHED="dmda" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
+timing=`STARPU_SCHED="dmda" $EXAMPLEDIR/dw_strassen -rec 3 -size 2048 -pin 2> /dev/null`
 save_cov "strassen.dmda";
 
 echo "chol.dm"
-timing=`CALIBRATE=1 SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
 save_cov "chol.dm";
 
 
 echo "chol.dmda"
-timing=`CALIBRATE=1 SCHED="dmda" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dmda" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
 save_cov "chol.dmda";
 
 echo "chol.cpu"
-timing=`CALIBRATE=1 STARPU_NCUDA=0 SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_NCUDA=0 STARPU_SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
 save_cov "chol.cpu";
 
 echo "chol.gpu"
-timing=`CALIBRATE=1 STARPU_NCPUS=0 SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_NCPUS=0 STARPU_SCHED="dm" $EXAMPLEDIR/dw_cholesky -pin 2> /dev/null`
 save_cov "chol.gpu";
 
 echo "chol"
@@ -118,48 +118,48 @@ timing=`$EXAMPLE/dw_cholesky 2> /dev/null`
 save_cov "chol";
 
 echo "heat.dm.4k.calibrate.v2"
-timing=`CALIBRATE=1 SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 66 -nblocks 4 -v2 -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 66 -nblocks 4 -v2 -pin 2> /dev/null`
 save_cov "heat.dm.4k.calibrate.v2";
 
 
 echo "heat.dm.8k.calibrate.v2"
-timing=`CALIBRATE=1 SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> /dev/null`
 save_cov "heat.dm.8k.calibrate.v2";
 
 echo "heat.dm.16k.calibrate.v2"
-timing=`CALIBRATE=1 SCHED="dm" $EXAMPLEDIR/heat -ntheta 130 -nthick 130 -nblocks 16 -v2 -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 130 -nthick 130 -nblocks 16 -v2 -pin 2> /dev/null`
 save_cov "heat.dm.16k.calibrate.v2";
 
 echo "heat.dm.8k.no.pin.v2"
-timing=`SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 2> /dev/null`
 save_cov "heat.dm.8k.no.pin.v2";
 
 echo "heat.prio.8k"
-timing=`SCHED="prio" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> /dev/null`
+timing=`STARPU_SCHED="prio" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> /dev/null`
 save_cov "heat.prio.8k";
 
 echo "heat.dm.8k.v2.no.prio"
-timing=`SCHED="no-prio" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="no-prio" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
 save_cov "heat.dm.8k.v2.no.prio";
 
 echo "heat.dm.8k.v2.random"
-timing=`SCHED="random" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="random" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
 save_cov "heat.dm.8k.v2.random";
 
 echo "heat.dm.8k.v2"
-timing=`SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
 save_cov "heat.dm.8k.v2";
 
 echo "heat.dm.16k.v2"
-timing=`SCHED="dm" $EXAMPLEDIR/heat -ntheta 130 -nthick 130 -nblocks 16 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 130 -nthick 130 -nblocks 16 -pin -v2 2> /dev/null`
 save_cov "heat.dm.16k.v2";
 
 echo "heat.ws.8k.v2"
-timing=`SCHED="ws" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="ws" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
 save_cov "heat.ws.8k.v2";
 
 echo "heat.greedy.8k.v2"
-timing=`SCHED="greedy" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
+timing=`STARPU_SCHED="greedy" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> /dev/null`
 save_cov "heat.greedy.8k.v2";
 
 echo "heat.8k.cg"
@@ -168,23 +168,23 @@ save_cov "heat.8k.cg";
 
 
 echo "heat.dm.8k.cg"
-timing=`SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 -cg 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 -cg 2> /dev/null`
 save_cov "heat.dm.8k.cg";
 
 echo "heat.dm.8k.v3"
-timing=`SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v3 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v3 2> /dev/null`
 save_cov "heat.dm.8k.v3";
 
 echo "mult.dm.common"
-timing=`SCHED="dm" $EXAMPLEDIR/dw_mult -nblocks 4 -x 4096 -y 4096 -z 1024 -pin -common-model 2> /dev/null`
+timing=`STARPU_SCHED="dm" $EXAMPLEDIR/dw_mult -nblocks 4 -x 4096 -y 4096 -z 1024 -pin -common-model 2> /dev/null`
 save_cov "mult.dm.common";
 
 echo "mult.dm"
-timing=`CALIBRATE=1 SCHED="dm" $EXAMPLEDIR/dw_mult -nblocks 8 -x 8192 -y 8192 -z 8192 -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dm" $EXAMPLEDIR/dw_mult -nblocks 8 -x 8192 -y 8192 -z 8192 -pin 2> /dev/null`
 save_cov "mult.dm";
 
 echo "mult.dmda"
-timing=`CALIBRATE=1 SCHED="dmda" $EXAMPLEDIR/dw_mult -nblocks 8 -x 8192 -y 8192 -z 8192 -pin 2> /dev/null`
+timing=`STARPU_CALIBRATE=1 STARPU_SCHED="dmda" $EXAMPLEDIR/dw_mult -nblocks 8 -x 8192 -y 8192 -z 8192 -pin 2> /dev/null`
 save_cov "mult.dmda";
 
 

+ 10 - 10
tests/heat/dmda.sh

@@ -26,16 +26,16 @@ calibrate_point()
 
 	size=$(($nblocks * 1024))
 
-	echo "CALIBRATE size : $size / blocks : $nblocks strat -> $strat prefetch -> $prefetch"
+	echo "STARPU_CALIBRATE size : $size / blocks : $nblocks strat -> $strat prefetch -> $prefetch"
 
 	rm -f $SAMPLINGDIR/*
 	
 	for iter in `seq 1 $maxiter`
 	do
 		echo "$iter / $maxiter"
-		export SCHED=$strat
-		export CALIBRATE=1
-		export PREFETCH=$prefetch
+		export STARPU_SCHED=$strat
+		export STARPU_CALIBRATE=1
+		export STARPU_PREFETCH=$prefetch
 		val=`$ROOTDIR/examples/heat/heat -pin -nblocks $nblocks -size $size -v3 2> /dev/null`
 		echo "$val"
 	done
@@ -71,16 +71,16 @@ do
 
 	calibrate_point "dm" $nblocks 1
 
-	export SCHED="dm"
-	export CALIBRATE=1
-	export PREFETCH=1
+	export STARPU_SCHED="dm"
+	export STARPU_CALIBRATE=1
+	export STARPU_PREFETCH=1
 	valdm=$($ROOTDIR/examples/heat/heat -pin -size $size -nblocks $nblocks -v3 2> logdm)
 
 	calibrate_point "dmda" $nblocks 1
 
-	export SCHED="dmda"
-	export CALIBRATE=1
-	export PREFETCH=1
+	export STARPU_SCHED="dmda"
+	export STARPU_CALIBRATE=1
+	export STARPU_PREFETCH=1
 	valdmda=$($ROOTDIR/examples/heat/heat -pin -size $size -nblocks $nblocks -v3 2> logdmda)
 	
 	dmmiss=`grep "TOTAL MSI" logdm|sed -e "s/.*miss.*[1-9]* (\(.*\) %)/\1/"`

+ 2 - 2
tests/heat/gflops-sched.sh

@@ -52,7 +52,7 @@ measure_heat()
 	for i in `seq 1 $nsample`
 	do
 		echo "iter $i/$nsample"
-		val=`SCHED=$policy $ROOTDIR/examples/heat/heat -nthick $thick -ntheta $theta -nblocks $nblocks -pin -v2 2>/dev/null`
+		val=`STARPU_SCHED=$policy $ROOTDIR/examples/heat/heat -nthick $thick -ntheta $theta -nblocks $nblocks -pin -v2 2>/dev/null`
 		total=`echo "$val + $total" |bc -l`
 	done
 
@@ -87,7 +87,7 @@ trace_size()
 
 		if [ $tile -le $size -a $nblocks -le 32 -a $(($size % $tile)) == 0 ];
 		then
-			echo "SCHED=$policy $ROOTDIR/examples/heat/heat -nthick $thick -ntheta $theta -nblocks $nblocks -pin -v2"
+			echo "STARPU_SCHED=$policy $ROOTDIR/examples/heat/heat -nthick $thick -ntheta $theta -nblocks $nblocks -pin -v2"
 			measure_heat $thick $theta $nblocks $size;
 			timing=$heat_ret
 		else

+ 8 - 8
tests/heat/granularity.sh

@@ -60,7 +60,7 @@ trace_granularity()
 		for iter in `seq 1 $maxiter`
 		do
 			echo "$iter / $maxiter"
-			 val=`STARPU_NCPUS=8 STARPU_NCUDA=3 SCHED="dmda" PREFETCH=1 CALIBRATE=1 $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null`
+			 val=`STARPU_NCPUS=8 STARPU_NCUDA=3 STARPU_SCHED="dmda" STARPU_PREFETCH=1 STARPU_CALIBRATE=1 $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null`
 			 echo "$val"
 			 echo "$val" >> $filename
 		done
@@ -101,7 +101,7 @@ trace_granularity_hybrid()
 		for iter in `seq 1 $maxiter`
 		do
 			echo "$iter / $maxiter"
-			 val=`SCHED="dmda" PREFETCH=1 CALIBRATE=1 $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null`
+			 val=`STARPU_SCHED="dmda" STARPU_PREFETCH=1 STARPU_CALIBRATE=1 $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null`
 			 echo "$val"
 			 echo "$val" >> $filename
 		done
@@ -121,12 +121,12 @@ calibrate_grain()
 
 	OPTIONS="-pin -nblocks $blocks -size $size -v3"
 
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 SCHED="dm" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null 
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 PREFETCH=1 SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 PREFETCH=1 SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 PREFETCH=1 SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 PREFETCH=1 SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
-	STARPU_NCUDA=3 STARPU_NCPUS=8 CALIBRATE=1 PREFETCH=1 SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_SCHED="dm" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null 
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_PREFETCH=1 STARPU_SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_PREFETCH=1 STARPU_SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_PREFETCH=1 STARPU_SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_PREFETCH=1 STARPU_SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
+	STARPU_NCUDA=3 STARPU_NCPUS=8 STARPU_CALIBRATE=1 STARPU_PREFETCH=1 STARPU_SCHED="dmda" $ROOTDIR/examples/heat/heat $OPTIONS 2> /dev/null
 }
 
 mkdir -p $TIMINGDIR

+ 1 - 1
tests/heat/model-perturbation.sh

@@ -26,7 +26,7 @@ MAXCPU=3
 
 trace_perturbation()
 {
-	export SCHED="dm"
+	export STARPU_SCHED="dm"
 
 	for blocks in `seq 12 2 24`
 	do

+ 7 - 7
tests/heat/sched.sh

@@ -26,16 +26,16 @@ calibrate_point()
 
 	size=$(($nblocks * 1024))
 
-	echo "CALIBRATE size : $size / blocks : $nblocks strat -> $strat prefetch -> $prefetch"
+	echo "STARPU_CALIBRATE size : $size / blocks : $nblocks strat -> $strat prefetch -> $prefetch"
 
 	rm -f $SAMPLINGDIR/*
 	
 	for iter in `seq 1 $maxiter`
 	do
 		echo "$iter / $maxiter"
-		export SCHED=$strat
-		export CALIBRATE=1
-		export PREFETCH=$prefetch
+		export STARPU_SCHED=$strat
+		export STARPU_CALIBRATE=1
+		export STARPU_PREFETCH=$prefetch
 		val=`$ROOTDIR/examples/heat/heat -pin -nblocks $nblocks -size $size -v3 2> /dev/null`
 		echo "$val"
 	done
@@ -63,9 +63,9 @@ trace_point()
 	for iter in `seq 1 $maxiter`
 	do
 		echo "$iter / $maxiter"
-		export SCHED=$strat
-		export CALIBRATE=$docalibrate
-		export PREFETCH=$prefetch
+		export STARPU_SCHED=$strat
+		export STARPU_CALIBRATE=$docalibrate
+		export STARPU_PREFETCH=$prefetch
 		val=`$ROOTDIR/examples/heat/heat -pin -nblocks $nblocks -size $size -v3  2> /dev/null`
 		echo "$val"
 		echo "$val" >> $filename

+ 1 - 1
tests/mult/sched.sh

@@ -37,7 +37,7 @@ trace_sched()
 		do
 			echo "$iter / $maxiter"
 			#echo "$ROOTDIR/examples/mult/sgemm $OPTIONS 2> /dev/null"
-			STARPU_NCUDA=1 CALIBRATE=1 SCHED="$sched" $ROOTDIR/examples/mult/sgemm $OPTIONS 2> /dev/null >> $filename
+			STARPU_NCUDA=1 STARPU_CALIBRATE=1 STARPU_SCHED="$sched" $ROOTDIR/examples/mult/sgemm $OPTIONS 2> /dev/null >> $filename
 			tail -1 $filename
 		done
 	done

+ 2 - 2
tests/perf-models/bench_sgemm.sh

@@ -41,8 +41,8 @@ rm -f $cpu_output
 rm -f $gpu_output
 
 export STARPU_WORKERS_CPUID="2"
-export CALIBRATE=1
-export SCHED="dm"
+export STARPU_CALIBRATE=1
+export STARPU_SCHED="dm"
 
 # benchmark GotoBLAS
 for size in $sizelist;

+ 1 - 1
tests/perf-models/error-model.sh

@@ -59,7 +59,7 @@ do
 
 	echo "ITER $iter -> I $i NBLOCKS $nblocks"
 
-	CALIBRATE=1 SCHED="dm" ../../examples/heat/heat -nblocks $nblocks -nthick 34 -ntheta $ntheta -pin 2> output.log.err > output.log
+	STARPU_CALIBRATE=1 STARPU_SCHED="dm" ../../examples/heat/heat -nblocks $nblocks -nthick 34 -ntheta $ntheta -pin 2> output.log.err > output.log
 	gflops=`grep "Synthetic GFlops :" output.log.err| sed -e "s/Synthetic GFlops ://"`
 
 	sumgflops[$i]=$(echo "${sumgflops[$i]} + $gflops"|bc -l)

+ 6 - 6
tests/regression/regression-test.sh

@@ -50,23 +50,23 @@ cd $DIR
 init;
 
 echo "heat.dm.8k.no.pin.v2"
-timing=`SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 2> log`
+timing=`STARPU_SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 2> log`
 save_cov "heat.dm.8k.no.pin.v2";
 
 echo "heat.prio.8k"
-timing=`SCHED="prio" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> log`
+timing=`STARPU_SCHED="prio" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -v2 -pin 2> log`
 save_cov "heat.prio.8k";
 
 echo "heat.dm.8k.v2"
-timing=`SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
+timing=`STARPU_SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
 save_cov "heat.dm.8k.v2";
 
 echo "heat.ws.8k.v2"
-timing=`SCHED="ws" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
+timing=`STARPU_SCHED="ws" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
 save_cov "heat.ws.8k.v2";
 
 echo "heat.greedy.8k.v2"
-timing=`SCHED="greedy" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
+timing=`STARPU_SCHED="greedy" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 2> log`
 save_cov "heat.greedy.8k.v2";
 
 echo "heat.dm.8k.cg"
@@ -74,7 +74,7 @@ timing=`$ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v2 -
 save_cov "heat.dm.8k.cg";
 
 echo "heat.dm.8k.v3"
-timing=`SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v3 2> log`
+timing=`STARPU_SCHED="dm" $ROOTDIR/examples/heat/heat -ntheta 66 -nthick 130 -nblocks 8 -pin -v3 2> log`
 save_cov "heat.dm.8k.v3";
 
 echo "incrementer"