浏览代码

Check the STARPU_SINGLE_COMBINED_WORKER environment variable in case the user didn't call starpu_conf_init().

Nicolas Collin 14 年之前
父节点
当前提交
c55b747918
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      src/sched_policies/detect_combined_workers.c

+ 1 - 2
src/sched_policies/detect_combined_workers.c

@@ -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