s/STARPU_WORKERS_GPUID/STARPU_WORKERS_CUDAID/g - Let's get ready for OpenCL driver

ChangeLog

@@ -23,7 +23,7 @@ The asynchronous heterogeneous multi-accelerator release
     - Model data transfer overhead
     - One model is created for each accelerator
   * Support for CUDA's driver API is deprecated
-  * The STARPU_WORKERS_GPUID and STARPU_WORKERS_CPUID env. variables make it possible to
+  * The STARPU_WORKERS_CUDAID and STARPU_WORKERS_CPUID env. variables make it possible to
     specify where to bind the workers
   * Use the hwloc library to detect the actual number of cores
 

doc/starpu.texi

@@ -237,7 +237,7 @@ TODO, explicit configuration (passed to starpu_init) overrides env variables.
 * STARPU_NCUDA     :: Number of CUDA workers
 * STARPU_NGORDON   :: Number of SPU workers (Cell)
 * STARPU_WORKERS_CPUID  :: Bind workers to specific CPUs
-* STARPU_WORKERS_GPUID  :: Select specific CUDA devices
+* STARPU_WORKERS_CUDAID  :: Select specific CUDA devices
 @end menu
 
 @node STARPU_NCPUS
@@ -277,8 +277,8 @@ TODO
 
 @end table
 
-@node STARPU_WORKERS_GPUID
-@subsection @code{STARPU_WORKERS_GPUID} -- Select specific CUDA devices
+@node STARPU_WORKERS_CUDAID
+@subsection @code{STARPU_WORKERS_CUDAID} -- Select specific CUDA devices
 @table @asis
 
 @item @emph{Description}:

src/core/topology.c

@@ -66,16 +66,16 @@ static void _starpu_initialize_workers_gpuid(struct starpu_machine_config_s *con
 			config->user_conf->workers_gpuid,
 			STARPU_NMAXWORKERS*sizeof(unsigned));
 	}
-	else if ((strval = getenv("STARPU_WORKERS_GPUID")))
+	else if ((strval = getenv("STARPU_WORKERS_CUDAID")))
 	{
-		/* STARPU_WORKERS_GPUID certainly contains less entries than
+		/* STARPU_WORKERS_CUDAID certainly contains less entries than
 		 * STARPU_NMAXWORKERS, so we reuse its entries in a round robin
 		 * fashion: "1 2" is equivalent to "1 2 1 2 1 2 .... 1 2". */
 		unsigned wrap = 0;
 		unsigned number_of_entries = 0;
 
 		char *endptr;
-		/* we use the content of the STARPU_WORKERS_GPUID env. variable */
+		/* we use the content of the STARPU_WORKERS_CUDAID env. variable */
 		for (i = 0; i < STARPU_NMAXWORKERS; i++)
 		{
 			if (!wrap) {
@@ -335,7 +335,7 @@ static void _starpu_initialize_workers_bindid(struct starpu_machine_config_s *co
 		unsigned number_of_entries = 0;
 
 		char *endptr;
-		/* we use the content of the STARPU_WORKERS_GPUID env. variable */
+		/* we use the content of the STARPU_WORKERS_CUDAID env. variable */
 		for (i = 0; i < STARPU_NMAXWORKERS; i++)
 		{
 			if (!wrap) {

tests/cholesky/sched-one-gpu.sh

@@ -20,7 +20,7 @@ maxiter=5
 ROOTDIR=../../
 TIMINGDIR=$PWD/timing/
 
-export STARPU_WORKERS_GPUID="1"
+export STARPU_WORKERS_CUDAID="1"
 
 trace_sched()
 {