Browse Source

Do not enable one thread per stream by default

Samuel Thibault 8 years ago
parent
commit
3797363602
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/core/topology.c
  2. 1 1
      src/core/workers.c
  3. 1 1
      src/drivers/cuda/driver_cuda.c

+ 2 - 2
src/core/topology.c

@@ -91,7 +91,7 @@ _starpu_get_worker_from_driver(struct starpu_driver *d)
 #ifdef STARPU_USE_CUDA
 	if (d->type == STARPU_CUDA_WORKER)
 	{
-		unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 1);
+		unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 0);
 		if(th_per_stream == 0)
 			return &cuda_worker_set[d->id.cuda_id];
 
@@ -1055,7 +1055,7 @@ _starpu_init_machine_config(struct _starpu_machine_config *config, int no_mp_con
 	_starpu_initialize_workers_cuda_gpuid(config);
 
 	/* allow having one worker per stream */
-	unsigned th_per_stream = starpu_get_env_number_default("STARPU_WORKER_PER_STREAM", 1);
+	unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 0);
 
 	unsigned cudagpu;
 	for (cudagpu = 0; cudagpu < topology->ncudagpus; cudagpu++)

+ 1 - 1
src/core/workers.c

@@ -628,7 +628,7 @@ static void _starpu_launch_drivers(struct _starpu_machine_config *pconfig)
 #endif
 	STARPU_AYU_INIT();
 
-	unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 1);
+	unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 0);
 
 	for (worker = 0; worker < nworkers; worker++)
 	{

+ 1 - 1
src/drivers/cuda/driver_cuda.c

@@ -680,7 +680,7 @@ int _starpu_cuda_driver_init(struct _starpu_worker_set *worker_set)
 	STARPU_PTHREAD_COND_SIGNAL(&worker0->ready_cond);
 	STARPU_PTHREAD_MUTEX_UNLOCK(&worker0->mutex);
 
-	unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 1);
+	unsigned th_per_stream = starpu_get_env_number_default("STARPU_ONE_THREAD_PER_STREAM", 0);
 
 	if(th_per_stream == 0)
 	{