|
@@ -171,12 +171,11 @@ void _starpu_sched_find_worker_combinations(struct starpu_machine_topology_s *to
|
|
|
{
|
|
|
struct starpu_machine_config_s *config = _starpu_get_machine_config();
|
|
|
|
|
|
- if (config->user_conf && config->user_conf->single_combined_worker)
|
|
|
+ if ((config->user_conf && config->user_conf->single_combined_worker) || starpu_get_env_number("STARPU_SINGLE_COMBINED_WORKER"))
|
|
|
combine_all_cpu_workers(topology);
|
|
|
else {
|
|
|
#ifdef STARPU_HAVE_HWLOC
|
|
|
find_combinations_with_hwloc(topology);
|
|
|
- //find_combinations_without_hwloc(topology);
|
|
|
#else
|
|
|
find_combinations_without_hwloc(topology);
|
|
|
#endif
|