Andra Hugo 13 年之前
父節點
當前提交
4b8fa36a22
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      configure.ac
  2. 1 1
      src/core/workers.c
  3. 1 1
      src/sched_policies/heft.c

+ 1 - 1
configure.ac

@@ -223,7 +223,7 @@ AC_ARG_ENABLE([sched_ctx_hypervisor],
 
 if test "x$enable_sched_ctx_hypervisor" = "xyes"; then
    AC_DEFINE(STARPU_USE_SCHED_CTX_HYPERVISOR, [1], [enable sched_ctx_hypervisor lib])
-   PKG_CHECK_MODULES([SCHED_CTX_HYPERVISOR], [libsched_ctx_hypervisor], [], build_sched_ctx_hypervisor="yes")
+#   PKG_CHECK_MODULES([SCHED_CTX_HYPERVISOR], [libsched_ctx_hypervisor], [], build_sched_ctx_hypervisor="yes")
    STARPU_SCHED_CTX_HYPERVISOR="-lsched_ctx_hypervisor"
    AC_SUBST(STARPU_SCHED_CTX_HYPERVISOR)
    build_sched_ctx_hypervisor="yes"

+ 1 - 1
src/core/workers.c

@@ -790,7 +790,7 @@ struct _starpu_worker *_starpu_get_worker_struct(unsigned id)
 
 struct _starpu_sched_ctx *_starpu_get_sched_ctx_struct(unsigned id)
 {
-        STARPU_ASSERT(id >= 0 && id <= STARPU_NMAX_SCHED_CTXS);
+        STARPU_ASSERT(id <= STARPU_NMAX_SCHED_CTXS);
 	return &config.sched_ctxs[id];
 }
 

+ 1 - 1
src/sched_policies/heft.c

@@ -309,7 +309,7 @@ static void compute_all_performance_predictions(struct starpu_task *task,
 			/* Sometimes workers didn't take the tasks as early as we expected */
 			pthread_mutex_t *sched_mutex;
 			pthread_cond_t *sched_cond;
-			starpu_worker_get_sched_condition(sched_ctx_id, workerid, &sched_mutex, &sched_cond);
+			starpu_worker_get_sched_condition(sched_ctx_id, worker, &sched_mutex, &sched_cond);
 			_STARPU_PTHREAD_MUTEX_LOCK(&sched_mutex[worker]);
 			exp_start[worker] = STARPU_MAX(exp_start[worker], starpu_timing_now());
 			exp_end[worker_ctx][nimpl] = exp_start[worker] + exp_len[worker];